Remove URL reservation

Author: bording

src/ServiceControl.Config/Framework/Modules/InstallerModule.cs

@@ -66,7 +66,6 @@ internal async Task<ReportCard> Add(ServiceControlInstallableBase details, IProg
             try
             {
                 progress.Report(5, 9, "Registering URL ACLs...");
-                instanceInstaller.RegisterUrlAcl();
                 progress.Report(6, 9, "Instance setup in progress, this could take several minutes...");
                 instanceInstaller.SetupInstance();
             }
@@ -87,10 +86,6 @@ internal async Task<ReportCard> Add(ServiceControlInstallableBase details, IProg
                     instanceInstaller.ReportCard.Warnings.Add($"New instance did not startup - please check configuration for {instance.Name}");
                 }
             }
-            else
-            {
-                instanceInstaller.RemoveUrlAcl();
-            }
 
             instanceInstaller.ReportCard.SetStatus();
             return instanceInstaller.ReportCard;
@@ -193,7 +188,7 @@ internal async Task<ReportCard> Update(ServiceControlBaseService instance, bool
         internal ReportCard Delete(string instanceName, bool removeDB, bool removeLogs, IProgress<ProgressDetails> progress = null)
         {
             progress ??= new Progress<ProgressDetails>();
-            progress.Report(0, 7, "Stopping instance...");
+            progress.Report(0, 6, "Stopping instance...");
             var instance = InstanceFinder.FindServiceControlInstance(instanceName);
             instance.ReportCard = new ReportCard();
 
@@ -208,27 +203,24 @@ internal ReportCard Delete(string instanceName, bool removeDB, bool removeLogs,
 
             instance.BackupAppConfig();
 
-            progress.Report(1, 7, "Disabling startup...");
+            progress.Report(1, 6, "Disabling startup...");
             instance.Service.SetStartupMode("Disabled");
 
-            progress.Report(2, 7, "Deleting service...");
+            progress.Report(2, 6, "Deleting service...");
             instance.Service.Delete();
 
-            progress.Report(3, 7, "Removing URL ACL...");
-            instance.RemoveUrlAcl();
-
-            progress.Report(4, 7, "Deleting install...");
+            progress.Report(3, 6, "Deleting install...");
             instance.RemoveBinFolder();
 
             if (removeLogs)
             {
-                progress.Report(5, 7, "Deleting logs...");
+                progress.Report(4, 6, "Deleting logs...");
                 instance.RemoveLogsFolder();
             }
 
             if (removeDB)
             {
-                progress.Report(6, 7, "Deleting database...");
+                progress.Report(5, 6, "Deleting database...");
                 instance.RemoveDataBaseFolder();
             }
 
@@ -268,8 +260,6 @@ internal async Task<ReportCard> Add(MonitoringNewInstance details, IProgress<Pro
 
             try
             {
-                progress.Report(5, 9, "Registering URL ACLs...");
-                instanceInstaller.RegisterUrlAcl();
                 progress.Report(6, 9, "Creating queues...");
                 instanceInstaller.SetupInstance();
             }
@@ -290,10 +280,6 @@ internal async Task<ReportCard> Add(MonitoringNewInstance details, IProgress<Pro
                     instanceInstaller.ReportCard.Warnings.Add($"New instance did not startup - please check configuration for {instance.Name}");
                 }
             }
-            else
-            {
-                instanceInstaller.RemoveUrlAcl();
-            }
 
             instanceInstaller.ReportCard.SetStatus();
             return instanceInstaller.ReportCard;
@@ -386,7 +372,7 @@ internal async Task<ReportCard> Update(MonitoringInstance instance, bool startSe
         internal ReportCard Delete(string instanceName, bool removeLogs, IProgress<ProgressDetails> progress = null)
         {
             progress ??= new Progress<ProgressDetails>();
-            progress.Report(0, 7, "Stopping instance...");
+            progress.Report(0, 5, "Stopping instance...");
             var instance = InstanceFinder.FindMonitoringInstance(instanceName);
             instance.ReportCard = new ReportCard();
 
@@ -401,21 +387,18 @@ internal ReportCard Delete(string instanceName, bool removeLogs, IProgress<Progr
 
             instance.BackupAppConfig();
 
-            progress.Report(1, 7, "Disabling startup...");
+            progress.Report(1, 5, "Disabling startup...");
             instance.Service.SetStartupMode("Disabled");
 
-            progress.Report(2, 7, "Deleting service...");
+            progress.Report(2, 5, "Deleting service...");
             instance.Service.Delete();
 
-            progress.Report(3, 7, "Removing URL ACL...");
-            instance.RemoveUrlAcl();
-
-            progress.Report(4, 7, "Deleting install...");
+            progress.Report(3, 5, "Deleting install...");
             instance.RemoveBinFolder();
 
             if (removeLogs)
             {
-                progress.Report(5, 7, "Deleting logs...");
+                progress.Report(4, 5, "Deleting logs...");
                 instance.RemoveLogsFolder();
             }
 

src/ServiceControl.Management.PowerShell/Cmdlets/UrlAcls/AddUrlAcl.cs

@@ -1,44 +1,17 @@
 namespace ServiceControl.Management.PowerShell
 {
-    using System;
-    using System.Collections.Generic;
     using System.Management.Automation;
-    using System.Security.Principal;
-    using ServiceControlInstaller.Engine.UrlAcl;
 
     [Cmdlet(VerbsCommon.Add, "UrlAcl")]
     public class AddUrlAcl : PSCmdlet
     {
         [ValidateNotNullOrEmpty]
         [Parameter(Mandatory = true, Position = 0, HelpMessage = "The URL to add to the URLACL list. This should always in a trailing /")]
-
         public string Url { get; set; }
 
-        protected override void BeginProcessing()
-        {
-            Account.TestIfAdmin();
-        }
-
         protected override void ProcessRecord()
         {
-            var sidList = new List<SecurityIdentifier>();
-
-            foreach (var user in Users)
-            {
-                try
-                {
-                    var account = new NTAccount(user);
-                    var sid = (SecurityIdentifier)account.Translate(typeof(SecurityIdentifier));
-                    sidList.Add(sid);
-                }
-                catch (Exception ex)
-                {
-                    WriteError(new ErrorRecord(ex, "Failed to parse account name", ErrorCategory.InvalidData, user));
-                    return;
-                }
-            }
-
-            UrlReservation.Create(new UrlReservation(Url, sidList.ToArray()));
+            WriteWarning("ServiceControl no longer requires URL reservations, so this command no longer functions. Use the 'netsh http add urlacl' command instead.");
         }
 
         [ValidateNotNullOrEmpty]

src/ServiceControl.Management.PowerShell/Cmdlets/UrlAcls/GetUrlAcls.cs

@@ -1,14 +1,13 @@
 namespace ServiceControl.Management.PowerShell
 {
     using System.Management.Automation;
-    using ServiceControlInstaller.Engine.UrlAcl;
 
     [Cmdlet(VerbsCommon.Get, "UrlAcls")]
     public class GetUrlAcls : PSCmdlet
     {
         protected override void ProcessRecord()
         {
-            WriteObject(UrlReservation.GetAll(), true);
+            WriteWarning("ServiceControl no longer requires URL reservations, so this command no longer functions. Use the 'netsh http show urlacl' command instead.");
         }
     }
 }

src/ServiceControl.Management.PowerShell/Cmdlets/UrlAcls/RemoveUrlAcl.cs

@@ -1,26 +1,13 @@
 namespace ServiceControl.Management.PowerShell
 {
     using System.Management.Automation;
-    using ServiceControlInstaller.Engine.UrlAcl;
 
     [Cmdlet(VerbsCommon.Remove, "UrlAcl")]
     public class RemoveUrlAcl : PSCmdlet
     {
-        [ValidateNotNull]
-        [Parameter(Mandatory = true, ValueFromPipeline = true, Position = 0, HelpMessage = "Specify the URLACL to remove")]
-        public UrlReservation[] UrlAcl { get; set; }
-
-        protected override void BeginProcessing()
-        {
-            Account.TestIfAdmin();
-        }
-
         protected override void ProcessRecord()
         {
-            foreach (var entry in UrlAcl)
-            {
-                UrlReservation.Delete(entry);
-            }
+            WriteWarning("ServiceControl no longer requires URL reservations, so this command no longer functions. Use the 'netsh http delete urlacl' command instead.");
         }
     }
 }