Skip to content

fix(privacy): redact hardware addresses in CLI #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LyCecilion merged 1 commit into from
Jul 11, 2026
Merged

fix(privacy): redact hardware addresses in CLI #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions xidio/xidio.CLI/ConsoleDiagnosticReporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private static void PrintPrimaryInterfaceDetails(PrimaryInterfaceInfo primaryInt
detailsTable.AddRow("已连接", FormatBool(primaryInterface.IsConnected));
detailsTable.AddRow("状态", FormatOperationalStatus(primaryInterface.OperationalStatus));
detailsTable.AddRow("接口类型", Escape(primaryInterface.NetworkInterfaceType.ToString()));
detailsTable.AddRow("MAC 地址", Escape(primaryInterface.MacAddress ?? "<unavailable>"));
detailsTable.AddRow("MAC 地址", Escape(FormatHardwareAddress(primaryInterface.MacAddress)));
detailsTable.AddRow("链路速度", Escape(FormatLinkSpeed(primaryInterface.LinkSpeedBitsPerSecond)));
detailsTable.AddRow("MTU", Escape(primaryInterface.Mtu is null
? "<unavailable>"
Expand All @@ -287,7 +287,7 @@ private static void PrintPrimaryInterfaceDetails(PrimaryInterfaceInfo primaryInt
if (primaryInterface.WirelessConnection is not null)
{
detailsTable.AddRow("SSID", Escape(primaryInterface.WirelessConnection.Ssid));
detailsTable.AddRow("BSSID", Escape(primaryInterface.WirelessConnection.Bssid));
detailsTable.AddRow("BSSID", Escape(FormatHardwareAddress(primaryInterface.WirelessConnection.Bssid)));
detailsTable.AddRow("RSSI", Escape(primaryInterface.WirelessConnection.RssiDbm is null
? "<unavailable>"
: $"{primaryInterface.WirelessConnection.RssiDbm} dBm"));
Expand Down Expand Up @@ -371,7 +371,7 @@ private static void PrintNeighborSummary(IReadOnlyList<NetworkNeighborInfo> neig
neighborTable.AddRow(
Escape(FormatAddressFamily(neighbor.AddressFamily)),
Escape(neighbor.IpAddress),
Escape(string.IsNullOrWhiteSpace(neighbor.LinkLayerAddress) ? "<none>" : neighbor.LinkLayerAddress),
Escape(FormatHardwareAddress(neighbor.LinkLayerAddress, "<none>")),
Escape(neighbor.State));
}

Expand Down Expand Up @@ -637,6 +637,19 @@ private static string FormatWirelessRates(WirelessConnectionInfo wireless)
return $"Rx {rx}, Tx {tx}";
}

private static string FormatHardwareAddress(string? address, string unavailable = "<unavailable>")
{
if (string.IsNullOrWhiteSpace(address))
return unavailable;

var separator = address.Contains(':') ? ':' : '-';
var parts = address.Split(separator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);

return parts.Length == 6 && parts.All(part => part.Length == 2)
? string.Join(separator, parts.Take(3).Concat(["XX", "XX", "XX"]))
: "<redacted>";
}

private static string FormatDnsResult(DnsProbeResult result)
{
var source = string.IsNullOrWhiteSpace(result.DnsServer) ? "system" : result.DnsServer;
Expand Down
Loading