Merge pull request #38 from bdukes/whitelist-port

Make IsWhitelisted check more robust
DNNCommunity · Sep 7, 2018 · 3f33ae5 · 3f33ae5
2 parents 85cc273 + 1a319eb
commit 3f33ae5
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/PolyDeploy/Components/IPSpecManager.cs b/PolyDeploy/Components/IPSpecManager.cs
@@ -2,6 +2,7 @@
 using Cantarus.Modules.PolyDeploy.Components.DataAccess.Models;
 using System;
 using System.Collections.Generic;
+using System.Net;
 
 namespace Cantarus.Modules.PolyDeploy.Components
 {
@@ -51,6 +52,20 @@ public static IPSpec GetById(int id)
          */
         public static bool IsWhitelisted(string address)
         {
+            if (!IPAddress.TryParse(address, out _))
+            {
+                // see if address is an IP plus port, e.g. "1.1.1.1:58290"
+                if (Uri.TryCreate(Uri.UriSchemeHttps + Uri.SchemeDelimiter + address, UriKind.Absolute, out Uri uri))
+                {
+                    if (uri.HostNameType != UriHostNameType.IPv4 && uri.HostNameType != UriHostNameType.IPv6)
+                    {
+                        return false;
+                    }
+
+                    address = uri.Host;
+                }
+            }
+
             IPSpec ipSpec = IPSpecDC.FindByAddress(address);
 
             return ipSpec != null;