Merging fixes to master (#14)

* Reorganized project, started implementing user config * Removed obselete code * Restored interface, created config utility, extracted some common operations and updated readme. * Updated template config for examples * Added config loader and converter for consumption in app * Refactored code, added config/logic for custom IP list * Refactored config classes, fixed bug with subnet mask * Updated readme for new property * Added window sizing specifically for Windows systems * Updated issue with interface selection * Fixing linux bug * Fixing issues with Linux scanning
0xrgg · Feb 26, 2023 · 0e642ba · 0e642ba
1 parent 9c49462
commit 0e642ba
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/Common/Config/Config.cs b/Common/Config/Config.cs
@@ -28,10 +28,13 @@ public class Config
         public static IEnumerable<string> CUSTOM_IP_ADDRESSES { get; set; }
 
         public static List<ConfigSetting> ConfigSettings { get; set; }
+        public static bool WIN_HOST_OS { get; set; }
 
         public static void BuildConfig()
         {
-            if (System.Runtime.InteropServices.RuntimeInformation.OSDescription.Contains("Windows"))
+            WIN_HOST_OS = GetOS();
+
+            if (WIN_HOST_OS)
             {
                 // Windows only
                 Console.SetWindowSize(120, 30);
@@ -63,6 +66,14 @@ public static void BuildConfig()
             ConfigSettings.Clear();
         }
 
+        public static bool GetOS()
+        {
+            if (System.Runtime.InteropServices.RuntimeInformation.OSDescription.Contains("Windows"))
+                return true;
+
+            return false;
+        }
+
         public static void LoadMACList()
         {
             MAC_LIST = CommonOperations.LoadListFromFile(Config.MAC_LIST_PATH);

diff --git a/Netscan/ArpScan.cs b/Netscan/ArpScan.cs
@@ -35,7 +35,7 @@ private static Host LookupMAC(string ipString, Host result)
         {
             PhysicalAddress mac = Arp.Lookup(IPAddress.Parse(ipString));
 
-            if (mac is not null)
+            if (mac is not null && mac.ToString() is not "000000000000")
             {
                 var paddedMAC = PadMACString(mac?.ToString());
 

diff --git a/Radar.cs b/Radar.cs
@@ -94,7 +94,7 @@ public bool ValidateInput(string input, int interfaceCount)
         {
             if (int.TryParse(input, out var parsedInput))
             {
-                if (parsedInput < interfaceCount)
+                if (parsedInput - 1 < interfaceCount && parsedInput - 1 > -1)
                     return true;
 
                 return false;

diff --git a/Services/NetworkScanner.cs b/Services/NetworkScanner.cs
@@ -127,7 +127,7 @@ public IEnumerable<Host> ScanNetwork(IPAddress ipAddress, string subnetMask)
 
             stopWatch.Stop();
 
-            var elapsedTime = FormatStopwatch(stopWatch);
+            var elapsedTime = FormatStopwatch();
 
             CommonConsole.WriteToConsole($"Found {ActiveHosts.Count()} hosts...", ConsoleColor.Yellow);
             CommonConsole.WriteToConsole($"Scan completed in: {elapsedTime}", ConsoleColor.Green);
@@ -242,17 +242,18 @@ public bool PingHost(IPAddress targetIp)
 
             host = ArpScan.Scan(targetIp.ToString());
 
-            if (host.IP is not null)
+            if (host.MAC is not null)
             {
                 CommonConsole.WriteToConsole($"Found host: {host.IP}", ConsoleColor.Green);
                 host.HostName = QueryDNS(host).HostName ?? "Unknown";
                 ActiveHosts.Add(host);
+                return true;
             }
 
-            return true;
+            return false;
         }
 
-        private string FormatStopwatch(Stopwatch stopwatch)
+        private string FormatStopwatch()
         {
             TimeSpan ts = stopWatch.Elapsed;