Check if URL is registered when running in non-admin and run accordingly

NzbDrone.App.Test/MonitoringProviderTest.cs

@@ -4,6 +4,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.Model;
+using NzbDrone.Common.Processes;
 using NzbDrone.Host;
 using NzbDrone.Test.Common;
 

NzbDrone.Common.Test/ProcessProviderTests.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Model;
+using NzbDrone.Common.Processes;
 using NzbDrone.Test.Common;
 using NzbDrone.Test.Dummy;
 

NzbDrone.Common/NzbDrone.Common.csproj

@@ -98,6 +98,7 @@
     <Compile Include="Messaging\IEvent.cs" />
     <Compile Include="Messaging\IMessage.cs" />
     <Compile Include="PathEqualityComparer.cs" />
+    <Compile Include="Processes\ProcessOutput.cs" />
     <Compile Include="Serializer\IntConverter.cs" />
     <Compile Include="Services.cs" />
     <Compile Include="TPL\LimitedConcurrencyLevelTaskScheduler.cs" />
@@ -122,7 +123,7 @@
     <Compile Include="DiskProvider.cs" />
     <Compile Include="EnvironmentInfo\AppFolderInfo.cs" />
     <Compile Include="Model\ProcessInfo.cs" />
-    <Compile Include="ProcessProvider.cs" />
+    <Compile Include="Processes\ProcessProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\SharedAssemblyInfo.cs" />
     <Compile Include="ServiceProvider.cs" />

NzbDrone.Common/Processes/ProcessOutput.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace NzbDrone.Common.Processes
+{
+    public class ProcessOutput
+    {
+        public List<String> Standard { get; set; }
+        public List<String> Error { get; set; }
+
+        public ProcessOutput()
+        {
+            Standard = new List<string>();
+            Error = new List<string>();
+        }
+    }
+}

NzbDrone.Common/Processes/ProcessProvider.cs

@@ -9,7 +9,7 @@ using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Model;
 
-namespace NzbDrone.Common
+namespace NzbDrone.Common.Processes
 {
     public interface IProcessProvider
     {
@@ -23,6 +23,7 @@ namespace NzbDrone.Common
         ProcessPriorityClass GetCurrentProcessPriority();
         Process Start(string path, string args = null, Action<string> onOutputDataReceived = null, Action<string> onErrorDataReceived = null);
         Process SpawnNewProcess(string path, string args = null);
+        ProcessOutput StartAndCapture(string path, string args = null);
     }
 
     public class ProcessProvider : IProcessProvider
@@ -88,11 +89,8 @@ namespace NzbDrone.Common
             process.Start();
         }
 
-
-
         public Process Start(string path, string args = null, Action<string> onOutputDataReceived = null, Action<string> onErrorDataReceived = null)
         {
-
             if (OsInfo.IsMono && path.EndsWith(".exe", StringComparison.InvariantCultureIgnoreCase))
             {
                 args = path + " " + args;
@@ -147,7 +145,6 @@ namespace NzbDrone.Common
             process.BeginErrorReadLine();
             process.BeginOutputReadLine();
 
-
             return process;
         }
 
@@ -172,6 +169,16 @@ namespace NzbDrone.Common
             return process;
         }
 
+        public ProcessOutput StartAndCapture(string path, string args = null)
+        {
+            var output = new ProcessOutput();
+            var process = Start(path, args, s => output.Standard.Add(s), error => output.Error.Add(error));
+
+            WaitForExit(process);
+
+            return output;
+        }
+
         public void WaitForExit(Process process)
         {
             Logger.Trace("Waiting for process {0} to exit.", process.ProcessName);
@@ -225,7 +232,6 @@ namespace NzbDrone.Common
             return null;
         }
 
-
         private static string GetExeFileName(Process process)
         {
             if (process.MainModule.FileName != "mono.exe")

NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs

@@ -6,6 +6,7 @@ using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Model;
+using NzbDrone.Common.Processes;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Update;
 using NzbDrone.Core.Update.Commands;

NzbDrone.Core/Update/InstallUpdateService.cs

@@ -3,6 +3,7 @@ using System.IO;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Update.Commands;
 using NzbDrone.Core.Instrumentation;

NzbDrone.Host/AccessControl/UrlAclAdapter.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Linq;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Host.AccessControl
@@ -9,11 +11,15 @@ namespace NzbDrone.Host.AccessControl
     public interface IUrlAclAdapter
     {
         void RefreshRegistration();
+        bool IsRegistered();
         string UrlAcl { get; }
+        string LocalUrlAcl { get; }
     }
 
     public class UrlAclAdapter : IUrlAclAdapter
     {
+        private const string URL_ACL = "http://{0}:{1}/";
+
         private readonly IProcessProvider _processProvider;
         private readonly IConfigFileProvider _configFileProvider;
         private readonly Logger _logger;
@@ -25,11 +31,29 @@ namespace NzbDrone.Host.AccessControl
             _logger = logger;
         }
 
+        public bool IsRegistered()
+        {
+            var arguments = String.Format("http show urlacl {0}", UrlAcl);
+            var output = RunNetsh(arguments);
+
+            if (output == null || !output.Standard.Any()) return false;
+
+            return output.Standard.Any(line => line.Contains(UrlAcl));
+        }
+
         public string UrlAcl
         {
             get
             {
-                return "http://*:" + _configFileProvider.Port + "/";
+                return String.Format(URL_ACL, "*", _configFileProvider.Port);
+            }
+        }
+
+        public string LocalUrlAcl
+        {
+            get
+            {
+                return String.Format(URL_ACL, "localhost", _configFileProvider.Port);
             }
         }
 
@@ -47,17 +71,20 @@ namespace NzbDrone.Host.AccessControl
             RunNetsh(arguments);
         }
 
-        private void RunNetsh(string arguments)
+        private ProcessOutput RunNetsh(string arguments)
         {
             try
             {
-                var process = _processProvider.Start("netsh.exe", arguments);
-                process.WaitForExit(5000);
+                var output = _processProvider.StartAndCapture("netsh.exe", arguments);
+
+                return output;
             }
             catch (Exception ex)
             {
                 _logger.WarnException("Error executing netsh with arguments: " + arguments, ex);
             }
+
+            return null;
         }
     }
 }

NzbDrone.Host/ApplicationServer.cs

@@ -3,6 +3,7 @@ using System.ServiceProcess;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Host.Owin;
 

NzbDrone.Host/Owin/OwinHostController.cs

@@ -38,19 +38,14 @@ namespace NzbDrone.Host.Owin
         public void StartServer()
         {
             IgnoreCertErrorPolicy.Register();
+            var urlAcl = DetermineUrlAcl();
 
-            if (OsInfo.IsWindows && _runtimeInfo.IsAdmin)
-            {
-                _urlAclAdapter.RefreshRegistration();
-                _firewallAdapter.MakeAccessible();
-            }
-
-            var options = new StartOptions(_urlAclAdapter.UrlAcl)
+            var options = new StartOptions(urlAcl)
                 {
                     ServerFactory = "Microsoft.Owin.Host.HttpListener"
                 };
 
-            _logger.Info("starting server on {0}", _urlAclAdapter.UrlAcl);
+            _logger.Info("starting server on {0}", urlAcl);
 
             try
             {
@@ -100,5 +95,26 @@ namespace NzbDrone.Host.Owin
             _logger.Info("Host has stopped");
         }
 
+        private string DetermineUrlAcl()
+        {
+            if (OsInfo.IsWindows && _runtimeInfo.IsAdmin)
+            {
+                if (_runtimeInfo.IsAdmin)
+                {
+                    _urlAclAdapter.RefreshRegistration();
+                    _firewallAdapter.MakeAccessible();
+                }
+
+                else
+                {
+                    if (!_urlAclAdapter.IsRegistered())
+                    {
+                        return _urlAclAdapter.LocalUrlAcl;
+                    }
+                }
+            }
+
+            return _urlAclAdapter.UrlAcl;
+        }
     }
 }

NzbDrone.Host/PriorityMonitor.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Threading;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Common.Processes;
 
 namespace NzbDrone.Host
 {

NzbDrone.Integration.Test/NzbDroneRunner.cs

@@ -5,6 +5,7 @@ using System.Threading;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using RestSharp;
 
 namespace NzbDrone.Integration.Test

NzbDrone.Update.Test/ProgramFixture.cs

@@ -3,6 +3,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.Model;
+using NzbDrone.Common.Processes;
 using NzbDrone.Test.Common;
 using NzbDrone.Update.UpdateEngine;
 

NzbDrone.Update.Test/StartNzbDroneService.cs

@@ -3,6 +3,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using NzbDrone.Test.Common;
 using NzbDrone.Update.UpdateEngine;
 using IServiceProvider = NzbDrone.Common.IServiceProvider;

NzbDrone.Update/UpdateApp.cs

@@ -5,6 +5,7 @@ using NzbDrone.Common;
 using NzbDrone.Common.Composition;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation;
+using NzbDrone.Common.Processes;
 using NzbDrone.Common.Security;
 using NzbDrone.Update.UpdateEngine;
 

NzbDrone.Update/UpdateEngine/DetectApplicationType.cs

@@ -1,4 +1,5 @@
 using NzbDrone.Common;
+using NzbDrone.Common.Processes;
 
 namespace NzbDrone.Update.UpdateEngine
 {

NzbDrone.Update/UpdateEngine/StartNzbDrone.cs

@@ -3,6 +3,7 @@ using System.IO;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using IServiceProvider = NzbDrone.Common.IServiceProvider;
 
 namespace NzbDrone.Update.UpdateEngine

NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs

@@ -1,6 +1,7 @@
 using System;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Common.Processes;
 using IServiceProvider = NzbDrone.Common.IServiceProvider;
 
 namespace NzbDrone.Update.UpdateEngine

NzbDrone/SysTray/SysTrayApp.cs

@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Windows.Forms;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using NzbDrone.Host.Owin;
 
 namespace NzbDrone.SysTray