#292,#297

Author: sjkp

LetsEncrypt-SiteExtension/Controllers/HomeController.cs

@@ -49,6 +49,18 @@ public async Task<ActionResult> Index(AuthenticationModel model)
                             ModelState.AddModelError("ServicePlanResourceGroupName", string.Format("The Service Plan Resource Group registered on the Web App in Azure in the ServerFarmId property '{0}' does not match the value you entered here {1}", azureServerFarmResourceGroup, model.ServicePlanResourceGroupName));
                             return View(model);
                         }
+                        var appServicePlan = client.AppServicePlans.Get(model.ServicePlanResourceGroupName, site.ServerFarmName());
+                        if (appServicePlan.Sku.Tier.Equals("Free") || appServicePlan.Sku.Tier.Equals("Shared"))
+                        {
+                            ModelState.AddModelError("ServicePlanResourceGroupName", $"The Service Plan is using the {appServicePlan.Sku.Tier} which doesn't support SSL certificates");
+                            return View(model);
+                        }
+                        var path = new PathProvider(model);
+                        if (model.RunFromPackage && !await path.IsVirtualDirectorySetup() && !model.UpdateAppSettings)
+                        {
+                            ModelState.AddModelError("UpdateAppSettings", string.Format("The site is using Run From Package. You need to to allow the site-extension to update app settings to setup the virtual directory."));
+                            return View(model);
+                        }
                         var webappsettings = client.WebApps.ListSiteOrSlotAppSettings(model.ResourceGroupName, model.WebAppName, model.SiteSlotName);
                         if (model.UpdateAppSettings)
                         {
@@ -76,7 +88,7 @@ public async Task<ActionResult> Index(AuthenticationModel model)
 
                             client.WebApps.UpdateSiteOrSlotAppSettings(model.ResourceGroupName, model.WebAppName, model.SiteSlotName, webappsettings);
                             ConfigurationManager.RefreshSection("appSettings");
-                            var path = new PathProvider(model);
+                            
                             await path.ChallengeDirectory(true);
                         }
                         else

LetsEncrypt-SiteExtension/Models/AuthenticationModel.cs

@@ -46,7 +46,7 @@ public bool UseIPBasedSSL
             get; set;
         }
 
-        [Display(Name = "Update Application Settings and Virtual Application (if needed)")]
+        [Display(Name = "Update Application Settings and Virtual Directory (if needed)")]
         public bool UpdateAppSettings
         {
             get;set;

LetsEncrypt-SiteExtension/Views/Home/Index.cshtml

@@ -114,7 +114,7 @@
     @if (Model.RunFromPackage && string.IsNullOrEmpty(Environment.GetEnvironmentVariable(LetsEncrypt.Azure.Core.Models.AppSettingsAuthConfig.webRootPath)))
     {
     <div class="alert alert-warning" role="alert">
-        <p>Web Site was deployed using "Run From Package", the site extension will have to configure a virtual application to ensure the challenge file can be browsable at http://your-site/.well-known/acme-challenge. </p>
+        <p>Web Site was deployed using "Run From Package", the site extension will have to configure a virtual directory to ensure the challenge file can be browsable at http://your-site/.well-known/acme-challenge. </p>
 
         <p>If you already host content under /.well-known then you should not continue, instead you should follow the manual setup procedure at <a href="https://github.com/sjkp/letsencrypt-siteextension/wiki/Run-From-Package">https://github.com/sjkp/letsencrypt-siteextension/wiki/Run-From-Package</a></p>
     </div>

LetsEncrypt.SiteExtension.Core/Services/PathProvider.cs

@@ -63,9 +63,14 @@ private async Task EnsureVirtualDirectorySetup()
             {
                 var siteConfig = client.WebApps.GetSiteConfigurationOrSlot(azureEnvironment.ResourceGroupName, azureEnvironment.WebAppName, azureEnvironment.SiteSlotName);
 
-                if (IsVirtualDirectorySetup(siteConfig))
+                if (!IsVirtualDirectorySetup(siteConfig))
                 {
-                    siteConfig.VirtualApplications.First().VirtualDirectories.Add(new VirtualDirectory()
+                    var app = siteConfig.VirtualApplications.First();
+                    if (app.VirtualDirectories == null)
+                    {
+                        app.VirtualDirectories = new List<VirtualDirectory>();
+                    }
+                    app.VirtualDirectories.Add(new VirtualDirectory()
                     {
                         PhysicalPath = wellKnownPhysicalPath,
                         VirtualPath = "/.well-known",
@@ -89,7 +94,7 @@ public async Task<bool> IsVirtualDirectorySetup()
         private bool IsVirtualDirectorySetup(SiteConfigResource siteConfig)
         {
             var isSetupAsAppliction = siteConfig.VirtualApplications.Any(s => s.PhysicalPath.StartsWith(wellKnownPhysicalPath));
-            var isSetupAsDirectory = siteConfig.VirtualApplications.Any(s => s.VirtualDirectories.Any(d => d.PhysicalPath.StartsWith(wellKnownPhysicalPath)));
+            var isSetupAsDirectory = siteConfig.VirtualApplications.Any(s => s.VirtualDirectories?.Any(d => d.PhysicalPath.StartsWith(wellKnownPhysicalPath)) ?? false);
 
             return isSetupAsAppliction || isSetupAsDirectory;
         }

LetsEncrypt.SiteExtension.Core/WebSiteManagementExtensions.cs

@@ -21,5 +21,15 @@ public static string ServerResourceGroupFromServerFarmId(string serverFarmId)
             var m = r.Match(serverFarmId);            
             return m.Groups[1].Value;
         }
+
+        public static string ServerFarmName(this Site site)
+        {
+            return ServerFarmNameFromServerFarmId(site.ServerFarmId);
+        }
+
+        public static string ServerFarmNameFromServerFarmId(string serverFarmId)
+        {
+            return serverFarmId.Split(new[] { '/' }).Last();
+        }
     }
 }

LetsEncrypt.SiteExtension.Test/WebSiteManagementClientExtensionsTest.cs

@@ -20,5 +20,14 @@ public void ServerFarmResourceGroup()
 
             Assert.AreEqual("LetsEncrypt-SiteExtension", res);
         }
+
+        [TestMethod]
+        public void ServerFarmName()
+        {
+            var serverFarmId = "/subscriptions/3f09c367-93e0-4b61-bbe5-dcb5c686bf8a/resourceGroups/LetsEncrypt-SiteExtension/providers/Microsoft.Web/serverfarms/sjkp.testplan";
+            var res = WebSiteManagementClientExtensions.ServerFarmNameFromServerFarmId(serverFarmId);
+
+            Assert.AreEqual("sjkp.testplan", res);
+        }
     }
 }