Merge branch 'master' of github.com:cantarus/PolyDeploy into development

Author: anierzad

DeployClient/Program.cs

@@ -228,6 +228,11 @@ static async Task Main(string[] args)
                 // Finished install.
                 WriteLine(string.Format("Finished installation in {0} ms.", (DateTime.Now - installStartTime).TotalMilliseconds));
                 ReadLine();
+
+                int succeeded = ParseResults(results).succeeded;
+                bool allSucceeded = succeeded == results.Count;
+                ExitCode exitCode = allSucceeded ? ExitCode.Success : ExitCode.InstallFailure;
+                Environment.Exit((int)exitCode);
             }
             catch (Exception ex)
             {
@@ -268,6 +273,12 @@ private static void GetSettings(string[] args)
         }
 
         private static string BuildUpdateString(SortedList<string, dynamic> results)
+        {
+            var (attempted, succeeded, _) = ParseResults(results);
+            return string.Format("\t{0}/{1} module archives processed, {2}/{0} succeeded.", attempted, results.Count, succeeded);
+        }
+
+        private static (int attempted, int succeeded, int failed) ParseResults(SortedList<string, dynamic> results)
         {
             // Get counts.
             int attempted = 0;
@@ -293,7 +304,7 @@ private static string BuildUpdateString(SortedList<string, dynamic> results)
                 }
             }
 
-            return string.Format("\t{0}/{1} module archives processed, {2}/{0} succeeded.", attempted, results.Count, succeeded);
+            return (attempted, succeeded, failed);
         }
 
         private static void WriteException(Exception ex, int maxDepth = 10, int depth = 0)

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;