OneIdentity · MiriamMcMahon · Jun 30, 2021 · Jun 30, 2021
diff --git a/build.ps1 b/build.ps1
@@ -143,9 +143,10 @@ if (!(Test-Path $CAKE_EXE)) {
 [System.Net.ServicePointManager]::SecurityProtocol = $previousSecurityProtocol
 
 
+$scpt="${PSScriptRoot}/${Script}"
 
 # Build Cake arguments
-$cakeArguments = @("$Script");
+$cakeArguments = @("$scpt");
 if ($Target) { $cakeArguments += "--target=$Target" }
 if ($Configuration) { $cakeArguments += "--configuration=$Configuration" }
 if ($Version) { $cakeArguments += "--version=$Version" }
@@ -157,6 +158,6 @@ if ($Pre) { $cakeArguments += "--pre=true" }
 $cakeArguments += $ScriptArgs
 
 # Start Cake
-Write-Host "Running build script..."
+Write-Host "Running build script for Scalus..."
 &$CAKE_EXE $cakeArguments
 exit $LASTEXITCODE
diff --git a/polaris.yml b/polaris.yml
@@ -8,9 +8,9 @@ project:
 capture:
   build:
     cleanCommands:
-    - shell: [powershell, ./build.ps1, "-Target clean"]
+    - shell: [powershell, "${project.projectDir}/build.ps1", "-Target clean"]
     buildCommands:
-    - shell: [powershell, ./build.ps1]
+    - shell: [powershell, "${project.projectDir}/build.ps1"]
   fileSystem:
     ears:
       extensions: [ear]

diff --git a/scripts/Win/Product.wxs b/scripts/Win/Product.wxs
@@ -3,14 +3,15 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" UpgradeCode="$(var.ProductUpgradeCode)"
 		Name="scalus" Version="$(var.Version)" Manufacturer="One Identity" Language="1033">
-		<Package InstallerVersion="$(var.Minimum_Version)" Compressed="yes" Comments="Windows Installer Package" InstallScope="perMachine" />
+		<Package InstallerVersion="$(var.Minimum_Version)" Compressed="yes" Comments="Windows Installer Package" InstallScope="perMachine"/>
 		<Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
 
 		<Upgrade Id="$(var.ProductUpgradeCode)">
-			<UpgradeVersion Minimum="$(var.Version)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
-			<UpgradeVersion Minimum="0.0.0" Maximum="$(var.Version)" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
+			<UpgradeVersion Minimum="$(var.Version)" IncludeMinimum="no" OnlyDetect="no" Property="NEWERVERSIONDETECTED"/>
+			<UpgradeVersion Minimum="0.0.0.0" Maximum="$(var.Version)" IncludeMinimum="yes" IncludeMaximum="yes" Property="OLDERVERSIONBEINGUPGRADED"/>
 		</Upgrade>
 		<Condition Message="A newer version of this software is already installed.">NOT NEWERVERSIONDETECTED</Condition>
+    <MajorUpgrade AllowSameVersionUpgrades="yes" AllowDowngrades="no" DowngradeErrorMessage="A newer version of [ProductName] is already installed. If you are sure you want to downgrade, remove the existing installation via Programs and Features." Schedule="afterInstallFinalize"/>
 
 		<WixVariable Id="WixUILicenseRtf" Value="$(var.tmpdir)\license.rtf" />
 
@@ -65,15 +66,11 @@
 		<Property Id="WixShellExecReadFile" Value="[#AppFile5]" />
 		<CustomAction Id="LaunchFile" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
 
-
-		<InstallExecuteSequence>
-			<RemoveExistingProducts After="InstallValidate"/>
-		</InstallExecuteSequence>
-
 		<Feature Id="DefaultFeature" Level="1">
 			<ComponentRef Id="ApplicationFiles"/>
 			<ComponentRef Id="ExampleFiles"/>
 			<ComponentRef Id="ApplicationShortcuts"/>
 		</Feature>
+
 	</Product>
 </Wix>
diff --git a/src/CommandLineHandler.cs b/src/CommandLineHandler.cs
@@ -23,21 +23,22 @@ public CommandLineHandler(IEnumerable<IVerb> verbs)
 
         public IApplication Build(string[] args, Func<object, IApplication> appResolver)
         {
-            var parser = new CommandLine.Parser(with => {
+            using (var parser = new CommandLine.Parser(with => {
                 with.HelpWriter = null;
-            });
-
-            var verbTypes = Verbs.Select(x => x.GetType()).OrderBy(x => x.GetCustomAttribute<VerbAttribute>().Name).ToArray(); 
-            var parserResult = parser.ParseArguments(args, verbTypes);
+            })) 
+            {
+                var verbTypes = Verbs.Select(x => x.GetType()).OrderBy(x => x?.GetCustomAttribute<VerbAttribute>()?.Name)?.ToArray(); 
+                var parserResult = parser.ParseArguments(args, verbTypes);
 
-            IApplication application = null;
-            parserResult
-                .WithParsed(x => 
-                    { 
-                        application = appResolver(x);
-                    })
-                .WithNotParsed(x => HandleErrors(parserResult, x));
-            return application;
+                IApplication application = null;
+                parserResult
+                    .WithParsed(x => 
+                        { 
+                            application = appResolver(x);
+                        })
+                    .WithNotParsed(x => HandleErrors(parserResult, x));
+                return application;
+            }
         }
 
         static void HandleErrors<T>(ParserResult<T> parserResult, IEnumerable<Error> errs)
@@ -48,7 +49,7 @@ static void HandleErrors<T>(ParserResult<T> parserResult, IEnumerable<Error> err
             // Handle version 
             if (errs.IsVersion())
             {
-                Console.WriteLine($"{header}\r\n{copyright}\r\nVersion: {Assembly.GetEntryAssembly().GetName().Version}\r\n");
+                Console.WriteLine($"{header}\r\n{copyright}\r\nVersion: {Assembly.GetEntryAssembly()?.GetName()?.Version}\r\n");
                 return;
             }
 

diff --git a/src/Dto/ApplicationConfig.cs b/src/Dto/ApplicationConfig.cs
@@ -59,9 +59,9 @@ public void Validate(List<string> errors)
             {
                 errors.Add($"An Exec must be configured for application:{Name}({Id})");
             }
-            if (string.IsNullOrEmpty(Protocol))
+            if (!ProtocolMapping.ValidateProtocol(Protocol, out string err))
             {
-                errors.Add($"A protocol must be configured for application:{Name}({Id})");
+                errors.Add(err);
             }
             if (string.IsNullOrEmpty(Name))
             {

diff --git a/src/Dto/ProtocolMapping.cs b/src/Dto/ProtocolMapping.cs
@@ -1,13 +1,30 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 
 namespace scalus.Dto
 {
     public class ProtocolMapping
     {
+        public static bool ValidateProtocol(string val, out string err)
+        {
+            err=null;
+            if (string.IsNullOrEmpty(val))
+            {
+                err =("Protocol name must be configured");
+                return false;
+            }
+            if (Regex.IsMatch(val, "^[a-zA-Z][a-zA-Z0-9-+.]+$"))
+            {
+                return true;
+            }
+            err =($"Protocol name contains invalid chars:{val}");
+            return false;
+        }
+
         [JsonRequired]
-        public string Protocol { get; set; }
+        public string Protocol { get;set; }
         public string AppId { get; set; }
 
         private static readonly Dictionary<string, string> _dtoPropertyDescription = new Dictionary<string, string>
@@ -20,9 +37,9 @@ public class ProtocolMapping
 
         public void Validate(List<string> errors)
         {
-            if (string.IsNullOrEmpty(Protocol))
+            if (!ValidateProtocol(Protocol, out string err))
             {
-                errors.Add("Protocol name must be configured");
+                errors.Add(err);
             }
         }
     }

diff --git a/src/IScalusConfiguration.cs b/src/IScalusConfiguration.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace scalus
 {
@@ -22,7 +23,7 @@ interface IScalusConfiguration
     public interface IScalusApiConfiguration
     {
         ScalusConfig GetConfiguration();
-        ScalusConfig SaveConfiguration(ScalusConfig configuration);
+        List<string> SaveConfiguration(ScalusConfig configuration);
         List<string> ValidationErrors { get; }
     }
 

diff --git a/src/Info/Application.cs b/src/Info/Application.cs
@@ -53,37 +53,39 @@ private void ShowConfig()
 ");
             Console.WriteLine("     {0,-10} {1,-10} {2,-20} {3}", "Protocol", "Registered", "Description", "Configured Command");
             Console.WriteLine("     ------------------------------------------------------------------------------------------------");
-            if (config?.Protocols?.Count > 0)
+            if (config == null || config.Protocols == null || config.Protocols.Count == 0)
+                return;
+
+            foreach (var one in config.Protocols)
             {
-                foreach (var one in config.Protocols)
+                if (one == null)
+                    continue;
+                Console.Write("     {0,-10} ", one.Protocol);
+                ApplicationConfig appConfig = null;
+                if (config.Applications?.Count > 0)
                 {
-                    Console.Write("     {0,-10} ", one.Protocol);
-                    ApplicationConfig appConfig = null;
-                    if (config?.Applications?.Count > 0)
-                    {
-                        foreach (var a in from a in config.Applications
-                            where a.Id == one.AppId
+                    foreach (var a in from a in config.Applications
+                        where a.Id == one.AppId
                             select a)
-                        {
-                            appConfig = a;
-                            break;
-                        }
-                    }
-
-                    if (appConfig != null)
                     {
-                        Console.Write("{0,-10} {1,-20} ({2} {3})",
-                            Registration.IsRegistered(one.Protocol) ? "yes" : "no", appConfig.Description,
-                            appConfig.Exec, string.Join(' ', appConfig.Args));
-                    }
-                    else
-                    {
-                        Console.Write("{0,-10} {1,-20}", Registration.IsRegistered(one.Protocol) ? "yes" : "no",
-                            "Not configured");
+                        appConfig = a;
+                        break;
                     }
+                }
 
-                    Console.WriteLine();
+                if (appConfig != null)
+                {
+                    Console.Write("{0,-10} {1,-20} ({2} {3})",
+                        Registration.IsRegistered(one.Protocol) ? "yes" : "no", appConfig.Description,
+                        appConfig.Exec, string.Join(' ', appConfig.Args));
                 }
+                else
+                {
+                    Console.Write("{0,-10} {1,-20}", Registration.IsRegistered(one.Protocol) ? "yes" : "no",
+                            "Not configured");
+                }
+
+                Console.WriteLine();
             }
         }
 

diff --git a/src/Launch/Application.cs b/src/Launch/Application.cs
@@ -70,7 +70,7 @@ private void HandleLaunchError(Exception ex, string url)
 
   ApplicationId: {application?.Id ?? "<none>"}
   Command:       {application?.Exec ?? "<none>"}
-  Args:          {(application.Args != null ? string.Join(" ", application.Args) : "<none>")}
+  Args:          {(application?.Args != null ? string.Join(" ", application?.Args) : "<none>")}
 
   Config File:   {scalusJsonPath}  
 

diff --git a/src/Platform/OsServicesBase.cs b/src/Platform/OsServicesBase.cs
@@ -52,7 +52,7 @@ public Process Execute(string command, IEnumerable<string> args)
             }
             Log.Logger.Information($"Running process:{command} with args:{string.Join(' ', args)}");
             var process = Process.Start(startupInfo);
-            Log.Logger.Information($"Started process, id:{process.Id}, exited:{process.HasExited}");
+            Log.Logger.Information($"Started process, id:{process?.Id}, exited:{process?.HasExited}");
             return process;
         }
         //execute a command, wait for it to end, return the exit code and retrieve the stdout & stderr
@@ -124,13 +124,19 @@ public void OpenText(string message)
                 File.WriteAllText(tempFile, message);
                 var l = File.ReadAllText(tempFile);
                 var process = OpenDefault(tempFile);
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                if (process == null)
                 {
-                    process.WaitForExit();
-                }
-                else
-                {
-                    Task.Delay(10* 1000).Wait();
+                    Log.Error($"Failed to report warning:{message}");
+                } 
+                else {
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        process.WaitForExit();
+                    }
+                    else
+                    {
+                        Task.Delay(10* 1000).Wait();
+                    }
                 }
             }
             catch (System.Exception ex)

diff --git a/src/Program.cs b/src/Program.cs
@@ -32,8 +32,8 @@ static int Main(string[] args)
                 var application = parser.Build(args, x =>
                 {
                     var type = x.GetType();
-                    var verb = type.GetCustomAttribute<VerbAttribute>().Name;
-                    return lifetimeScope.ResolveNamed<IApplication>(verb, new TypedParameter(type, x));
+                    var verb = type?.GetCustomAttribute<VerbAttribute>()?.Name;
+                    return verb == null ? null : lifetimeScope.ResolveNamed<IApplication>(verb, new TypedParameter(type, x));
                 });
 
                 // If application is null, then they ran help or version commands, just return

diff --git a/src/ProtocolHandler.cs b/src/ProtocolHandler.cs
@@ -83,6 +83,11 @@ public void Run(bool preview = false)
                     return;
                 }
                 var process = OsServices.Execute(cmd, args);
+                if (process == null)
+                {
+                    Serilog.Log.Error("Failed to create process for cmd:{cmd}");
+                    throw new Exception($"Failed to create process for cmd:{cmd}");
+                }
                 Serilog.Log.Debug("Post execute starting.");
 
                 Parser.PostExecute(process);

diff --git a/src/Registration.cs b/src/Registration.cs
@@ -22,6 +22,12 @@ IOsServices osServices
 
         public bool IsRegistered(string protocol, bool useSudo = false)
         {
+            if (!ProtocolMapping.ValidateProtocol(protocol, out string err))
+            {
+                Serilog.Log.Error($"Invalid protocol:{protocol}");
+                UserInteraction.Message($"{protocol}: The protocol is invalid.");
+                return false;
+            }
             var registered = true;
             foreach (var registrar in Registrars)
             {
@@ -37,10 +43,16 @@ public bool IsRegistered(string protocol, bool useSudo = false)
         public bool Register(IEnumerable<string> protocols, bool force, bool rootMode = false, bool useSudo=false)
         {
             var retval = false;
-
             foreach (var protocol in protocols)
             {
                 retval = true;
+                if (!ProtocolMapping.ValidateProtocol(protocol, out string err))
+                {
+                    retval = false;
+                    Serilog.Log.Error($"{err}");
+                    UserInteraction.Message($"{protocol}: {err}");
+                    continue;
+                }
 
                 foreach (var registrar in Registrars)
                 {
@@ -89,6 +101,13 @@ public bool UnRegister(IEnumerable<string> protocols, bool rootMode = false, boo
         {
             foreach (var protocol in protocols)
             {
+                if (!ProtocolMapping.ValidateProtocol(protocol, out string err))
+                {
+                    Serilog.Log.Error($"{err}");
+                    UserInteraction.Message($"{protocol}: {err}");
+                    continue;
+                }
+
                 foreach (var registrar in Registrars)
                 {
                     if (rootMode)

diff --git a/src/ScalusConfiguration.cs b/src/ScalusConfiguration.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using scalus.Util;
+using System.Threading.Tasks;
 
 namespace scalus
 {
@@ -105,7 +106,7 @@ public ScalusApiConfiguration(string json)
         {
         }
 
-        public ScalusConfig SaveConfiguration(ScalusConfig configuration)
+        public List<string> SaveConfiguration(ScalusConfig configuration)
         {
             ValidationErrors = new List<string>();
 
@@ -125,7 +126,7 @@ public ScalusConfig SaveConfiguration(ScalusConfig configuration)
                 Serilog.Log.Error($"*** Validation errors: {string.Join(", ", ValidationErrors)}");
             }
 
-            return Config;
+            return ValidationErrors;
         }