hide IP from console by default

Author: pandinocoder

Framework/Intersect.Framework.Core/Config/LoggingOptions.cs

@@ -13,6 +13,13 @@ public partial class LoggingOptions
     public static readonly LoggingLevelSwitch LoggingLevelSwitch = new(LevelConvert.ToSerilogLevel(DefaultLogLevel));
 
     private LogLevel _level = DefaultLogLevel;
+    private bool _showSensitiveData;
+
+    public bool ShowSensitiveData
+    {
+        get => _showSensitiveData;
+        set => _showSensitiveData = value;
+    }
 
     [JsonConverter(typeof(SafeStringEnumConverter))]
     public LogLevel Level

Framework/Intersect.Framework/Net/IPAddressExtensions.cs

@@ -40,6 +40,27 @@ public static class IPAddressExtensions
         },
     };
 
+    public static NetworkTypes GetNetworkType(this IPAddress address)
+    {
+        if (address.IsLoopback())
+        {
+            return NetworkTypes.Loopback;
+        }
+
+        if (address.IsPrivate())
+        {
+            return NetworkTypes.PrivateNetwork;
+        }
+
+        // ReSharper disable once ConvertIfStatementToReturnStatement
+        if (address.IsSubnet())
+        {
+            return NetworkTypes.Subnet;
+        }
+
+        return NetworkTypes.Public;
+    }
+
     public static bool IsLoopback(this IPAddress address) => MatchesNetworkTypes(address, NetworkTypes.Loopback);
 
     public static bool IsPrivate(this IPAddress address) => MatchesNetworkTypes(address, NetworkTypes.PrivateNetwork);

Intersect.Server/Core/FullServerContext.cs

@@ -1,6 +1,8 @@
 using System.Diagnostics;
+using System.Net;
 using System.Resources;
 using Intersect.Core;
+using Intersect.Framework.Net;
 using Intersect.Plugins.Interfaces;
 using Intersect.Rsa;
 using Intersect.Server.Core.Services;
@@ -104,8 +106,6 @@ protected override void InternalStartNetworking()
 #endif
 
         CheckNetwork();
-
-        Console.WriteLine();
     }
 
         #region Networking
@@ -189,7 +189,7 @@ private bool CheckPort()
                 return false;
             }
 
-            var portCheckResult = PortChecker.CanYouSeeMe(Options.Instance.ServerPort, out var externalIp);
+            var portCheckResult = PortChecker.CanYouSeeMe(Options.Instance.ServerPort, out var externalIP);
 
             if (!Strings.Portchecking.PortCheckerResults.TryGetValue(portCheckResult, out var portCheckResultMessage))
             {
@@ -198,11 +198,25 @@ private bool CheckPort()
 
             ApplicationContext.Context.Value?.Logger.LogInformation(portCheckResultMessage.ToString(Strings.Portchecking.DocumentationUrl));
 
-            if (!string.IsNullOrEmpty(externalIp))
+            if (!string.IsNullOrEmpty(externalIP))
             {
+                var hideIP = !(Options.Instance?.Logging.ShowSensitiveData ?? false);
+                string shownExternalIP = hideIP ? "********" : externalIP;
+                if (IPAddress.TryParse(externalIP, out var parsedExternalIP))
+                {
+                    var networkType = parsedExternalIP.GetNetworkType();
+                    if (networkType != NetworkTypes.Public)
+                    {
+                        shownExternalIP = externalIP;
+                    }
+
+                    shownExternalIP = $"{shownExternalIP} ({parsedExternalIP.AddressFamily}, {networkType})";
+                }
+
+                Console.WriteLine();
                 Console.WriteLine(Strings.Portchecking.ConnectionInfo);
-                Console.WriteLine(Strings.Portchecking.PublicIp, externalIp);
-                Console.WriteLine(Strings.Portchecking.PublicPort, Options.Instance.ServerPort);
+                Console.WriteLine(Strings.Portchecking.PublicIp, shownExternalIP);
+                Console.WriteLine(Strings.Portchecking.PublicPort, Options.Instance!.ServerPort);
             }
 
             if (portCheckResult == PortCheckResult.Inaccessible)