Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/AB13489-no-error-when-exceeding-maxAllowedContentLength

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js

Author: bergmania

LICENSE.md

@@ -1,6 +1,6 @@
 # The MIT License (MIT) #
 
-Copyright (c) 2013-present Umbraco
+Copyright (c) 2005-present Umbraco
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

build/templates/UmbracoProject/.template.config/dotnetcli.host.json

@@ -28,6 +28,14 @@
         "ConnectionString":{
             "longName": "connection-string",
             "shortName": ""
+        },
+        "NoNodesViewPath":{
+            "longName": "no-nodes-view-path",
+            "shortName": ""
+        },
+        "UseHttpsRedirect": {
+            "longName": "use-https-redirect",
+            "shortName": ""
         }
     },
     "usageExamples": [

build/templates/UmbracoProject/.template.config/ide.host.json

@@ -55,6 +55,20 @@
                 "text": "Optional: Database connection string when using Unattended install"
             },
             "isVisible": "true"
+        },
+        {
+            "id": "NoNodesViewPath",
+            "name": {
+                "text": "Optional: Path to a custom view presented with the Umbraco installation contains no published content"
+            },
+            "isVisible": "true"
+        },
+        {
+            "id": "UseHttpsRedirect",
+            "name": {
+                "text": "Optional: Adds code to Startup.cs to redirect HTTP to HTTPS and enables the UseHttps setting."
+            },
+            "isVisible": "true"
         }
     ]
 }

build/templates/UmbracoProject/.template.config/template.json

@@ -249,9 +249,56 @@
                 ]
               }
         },
+        "NoNodesViewPath":{
+            "type": "parameter",
+            "datatype":"text",
+            "description": "Path to a custom view presented with the Umbraco installation contains no published content",
+            "defaultValue": ""
+        },
+        "NoNodesViewPathReplaced":{
+            "type": "generated",
+            "generator": "regex",
+            "dataType": "string",
+            "replaces": "NO_NODES_VIEW_PATH_FROM_TEMPLATE",
+            "parameters": {
+                "source": "NoNodesViewPath",
+                "steps": [
+                    {
+                        "regex": "\\\\",
+                        "replacement": "\\\\"
+                    },
+                    {
+                        "regex": "\\\"",
+                        "replacement": "\\\""
+                    },
+                    {
+                        "regex": "\\\n",
+                        "replacement": "\\\n"
+                    },
+                    {
+                        "regex": "\\\t",
+                        "replacement": "\\\t"
+                    }
+                ]
+              }
+        },
+        "HasConnectionString":{
+            "type": "computed",
+            "value": "(ConnectionString != \"\")"
+        },
+        "HasNoNodesViewPath":{
+            "type": "computed",
+            "value": "(NoNodesViewPath != \"\")"
+        },
         "UsingUnattenedInstall":{
             "type": "computed",
             "value": "(FriendlyName != \"\" && Email != \"\" && Password != \"\" && ConnectionString != \"\")"
+        },
+        "UseHttpsRedirect":{
+            "type": "parameter",
+            "datatype":"bool",
+            "defaultValue": "false",
+            "description": "Adds code to Startup.cs to redirect HTTP to HTTPS and enables the UseHttps setting (Default: false)"
         }
     }
 }

build/templates/UmbracoProject/appsettings.Development.json

@@ -17,9 +17,11 @@
       }
     ]
   },
+  //#if (HasConnectionString)
   "ConnectionStrings": {
     "umbracoDbDSN": "CONNECTION_FROM_TEMPLATE"
   },
+  //#endif
   "Umbraco": {
     "CMS": {
       "Content": {

build/templates/UmbracoProject/appsettings.json

@@ -15,6 +15,18 @@
   },
   "Umbraco": {
     "CMS": {
+      //#if (HasNoNodesViewPath || UseHttpsRedirect)
+      "Global": {
+        //#if (!HasNoNodesViewPath && UseHttpsRedirect)
+        "UseHttps": true
+        //#elseif (UseHttpsRedirect)
+        "UseHttps": true,
+        //#endif
+        //#if (HasNoNodesViewPath)
+        "NoNodesViewPath": "NO_NODES_VIEW_PATH_FROM_TEMPLATE"
+        //#endif
+      },
+      //#endif
       "Hosting": {
         "Debug": false
       }

src/Umbraco.Core/HealthChecks/Checks/Security/HttpsCheck.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
@@ -17,7 +17,7 @@
 namespace Umbraco.Cms.Core.HealthChecks.Checks.Security
 {
     /// <summary>
-    /// Health checks for the recommended production setup regarding https.
+    /// Health checks for the recommended production setup regarding HTTPS.
     /// </summary>
     [HealthCheck(
         "EB66BB3B-1BCD-4314-9531-9DA2C1D6D9A7",
@@ -26,17 +26,26 @@ namespace Umbraco.Cms.Core.HealthChecks.Checks.Security
         Group = "Security")]
     public class HttpsCheck : HealthCheck
     {
+        private const int NumberOfDaysForExpiryWarning = 14;
+        private const string HttpPropertyKeyCertificateDaysToExpiry = "CertificateDaysToExpiry";
+
         private readonly ILocalizedTextService _textService;
         private readonly IOptionsMonitor<GlobalSettings> _globalSettings;
         private readonly IHostingEnvironment _hostingEnvironment;
 
         private static HttpClient s_httpClient;
-        private static HttpClientHandler s_httpClientHandler;
-        private static int s_certificateDaysToExpiry;
+
+        private static HttpClient HttpClient => s_httpClient ??= new HttpClient(new HttpClientHandler()
+        {
+            ServerCertificateCustomValidationCallback = ServerCertificateCustomValidation
+        });
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="HttpsCheck"/> class.
+        /// Initializes a new instance of the <see cref="HttpsCheck" /> class.
         /// </summary>
+        /// <param name="textService">The text service.</param>
+        /// <param name="globalSettings">The global settings.</param>
+        /// <param name="hostingEnvironment">The hosting environment.</param>
         public HttpsCheck(
             ILocalizedTextService textService,
             IOptionsMonitor<GlobalSettings> globalSettings,
@@ -47,33 +56,22 @@ public HttpsCheck(
             _hostingEnvironment = hostingEnvironment;
         }
 
-        private static HttpClient HttpClient => s_httpClient ??= new HttpClient(HttpClientHandler);
-
-        private static HttpClientHandler HttpClientHandler => s_httpClientHandler ??= new HttpClientHandler()
-        {
-            ServerCertificateCustomValidationCallback = ServerCertificateCustomValidation
-        };
-
-        /// <summary>
-        /// Get the status for this health check
-        /// </summary>
+        /// <inheritdoc />
         public override async Task<IEnumerable<HealthCheckStatus>> GetStatus() =>
             await Task.WhenAll(
                 CheckIfCurrentSchemeIsHttps(),
                 CheckHttpsConfigurationSetting(),
                 CheckForValidCertificate());
 
-        /// <summary>
-        /// Executes the action and returns it's status
-        /// </summary>
+        /// <inheritdoc />
         public override HealthCheckStatus ExecuteAction(HealthCheckAction action)
             => throw new InvalidOperationException("HttpsCheck action requested is either not executable or does not exist");
 
         private static bool ServerCertificateCustomValidation(HttpRequestMessage requestMessage, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslErrors)
         {
-            if (!(certificate is null) && s_certificateDaysToExpiry == default)
+            if (certificate is not null)
             {
-                s_certificateDaysToExpiry = (int)Math.Floor((certificate.NotAfter - DateTime.Now).TotalDays);
+                requestMessage.Properties[HttpPropertyKeyCertificateDaysToExpiry] = (int)Math.Floor((certificate.NotAfter - DateTime.Now).TotalDays);
             }
 
             return sslErrors == SslPolicyErrors.None;
@@ -84,30 +82,37 @@ private async Task<HealthCheckStatus> CheckForValidCertificate()
             string message;
             StatusResultType result;
 
-            // Attempt to access the site over HTTPS to see if it HTTPS is supported
-            // and a valid certificate has been configured
-            var url = _hostingEnvironment.ApplicationMainUrl.ToString().Replace("http:", "https:");
+            // Attempt to access the site over HTTPS to see if it HTTPS is supported and a valid certificate has been configured
+            var urlBuilder = new UriBuilder(_hostingEnvironment.ApplicationMainUrl)
+            {
+                Scheme = Uri.UriSchemeHttps
+            };
+            var url = urlBuilder.Uri;
 
             var request = new HttpRequestMessage(HttpMethod.Head, url);
 
             try
             {
                 using HttpResponseMessage response = await HttpClient.SendAsync(request);
+
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
-                    // Got a valid response, check now for if certificate expiring within 14 days
-                    // Hat-tip: https://stackoverflow.com/a/15343898/489433
-                    const int numberOfDaysForExpiryWarning = 14;
+                    // Got a valid response, check now if the certificate is expiring within the specified amount of days
+                    int daysToExpiry = 0;
+                    if (request.Properties.TryGetValue(HttpPropertyKeyCertificateDaysToExpiry, out var certificateDaysToExpiry))
+                    {
+                        daysToExpiry = (int)certificateDaysToExpiry;
+                    }
 
-                    if (s_certificateDaysToExpiry <= 0)
+                    if (daysToExpiry <= 0)
                     {
                         result = StatusResultType.Error;
                         message = _textService.Localize("healthcheck","httpsCheckExpiredCertificate");
                     }
-                    else if (s_certificateDaysToExpiry < numberOfDaysForExpiryWarning)
+                    else if (daysToExpiry < NumberOfDaysForExpiryWarning)
                     {
                         result = StatusResultType.Warning;
-                        message = _textService.Localize("healthcheck","httpsCheckExpiringCertificate", new[] { s_certificateDaysToExpiry.ToString() });
+                        message = _textService.Localize("healthcheck","httpsCheckExpiringCertificate", new[] { daysToExpiry.ToString() });
                     }
                     else
                     {
@@ -118,21 +123,20 @@ private async Task<HealthCheckStatus> CheckForValidCertificate()
                 else
                 {
                     result = StatusResultType.Error;
-                    message = _textService.Localize("healthcheck","healthCheckInvalidUrl", new[] { url, response.ReasonPhrase });
+                    message = _textService.Localize("healthcheck","healthCheckInvalidUrl", new[] { url.AbsoluteUri, response.ReasonPhrase });
                 }
             }
             catch (Exception ex)
             {
-                var exception = ex as WebException;
-                if (exception != null)
+                if (ex is WebException exception)
                 {
                     message = exception.Status == WebExceptionStatus.TrustFailure
-                        ? _textService.Localize("healthcheck","httpsCheckInvalidCertificate", new[] { exception.Message })
-                        : _textService.Localize("healthcheck","healthCheckInvalidUrl", new[] { url, exception.Message });
+                        ? _textService.Localize("healthcheck", "httpsCheckInvalidCertificate", new[] { exception.Message })
+                        : _textService.Localize("healthcheck", "healthCheckInvalidUrl", new[] { url.AbsoluteUri, exception.Message });
                 }
                 else
                 {
-                    message = _textService.Localize("healthcheck","healthCheckInvalidUrl", new[] { url, ex.Message });
+                    message = _textService.Localize("healthcheck", "healthCheckInvalidUrl", new[] { url.AbsoluteUri, ex.Message });
                 }
 
                 result = StatusResultType.Error;
@@ -150,7 +154,7 @@ private async Task<HealthCheckStatus> CheckForValidCertificate()
         private Task<HealthCheckStatus> CheckIfCurrentSchemeIsHttps()
         {
             Uri uri = _hostingEnvironment.ApplicationMainUrl;
-            var success = uri.Scheme == "https";
+            var success = uri.Scheme == Uri.UriSchemeHttps;
 
             return Task.FromResult(new HealthCheckStatus(_textService.Localize("healthcheck","httpsCheckIsCurrentSchemeHttps", new[] { success ? string.Empty : "not" }))
             {
@@ -166,16 +170,14 @@ private Task<HealthCheckStatus> CheckHttpsConfigurationSetting()
 
             string resultMessage;
             StatusResultType resultType;
-            if (uri.Scheme != "https")
+            if (uri.Scheme != Uri.UriSchemeHttps)
             {
                 resultMessage = _textService.Localize("healthcheck","httpsCheckConfigurationRectifyNotPossible");
                 resultType = StatusResultType.Info;
             }
             else
             {
-                resultMessage = _textService.Localize(
-                    "healthcheck","httpsCheckConfigurationCheckResult",
-                    new[] { httpsSettingEnabled.ToString(), httpsSettingEnabled ? string.Empty : "not" });
+                resultMessage = _textService.Localize("healthcheck","httpsCheckConfigurationCheckResult", new[] { httpsSettingEnabled.ToString(), httpsSettingEnabled ? string.Empty : "not" });
                 resultType = httpsSettingEnabled ? StatusResultType.Success : StatusResultType.Error;
             }
 

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/urlpicker.ts

@@ -0,0 +1,72 @@
+/// <reference types="Cypress" />
+import {
+    DocumentTypeBuilder,
+    ContentBuilder,
+    AliasHelper
+} from 'umbraco-cypress-testhelpers';
+
+context('Url Picker', () => {
+
+    beforeEach(() => {
+        cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'), false);
+      });
+
+    it('Test Url Picker', () => {
+
+        const urlPickerDocTypeName = 'Url Picker Test';
+        const pickerDocTypeAlias = AliasHelper.toAlias(urlPickerDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(urlPickerDocTypeName);
+        cy.deleteAllContent();
+        const pickerDocType = new DocumentTypeBuilder()
+            .withName(urlPickerDocTypeName)
+            .withAlias(pickerDocTypeAlias)
+            .withAllowAsRoot(true)
+            .withDefaultTemplate(pickerDocTypeAlias)
+            .addGroup()
+                .withName('ContentPickerGroup')
+                .addUrlPickerProperty()
+                    .withAlias('picker')
+                .done()
+            .done()
+            .build();
+
+        cy.saveDocumentType(pickerDocType);
+        cy.editTemplate(urlPickerDocTypeName, '@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<UrlPickerTest>' +
+        '\n@{' +
+        '\n    Layout = null;' +
+        '\n}' +
+        '\n@foreach(var link in @Model.Picker)' +
+        '\n{' +
+        '\n    <a href="@link.Url">@link.Name</a>' +
+        '\n}');
+        // Create content with url picker
+        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
+        cy.get('[data-element="action-create"]').click();
+        cy.get('[data-element="action-create-' + pickerDocTypeAlias + '"] > .umb-action-link').click();
+        // Fill out content
+        cy.umbracoEditorHeaderName('UrlPickerContent');
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.umbracoSuccessNotification().should('be.visible');
+        cy.get('.umb-node-preview-add').click();
+        // Should really try and find a better way to do this, but umbracoTreeItem tries to click the content pane in the background
+        cy.get('#treePicker li:first', {timeout: 6000}).click();
+        cy.get('.umb-editor-footer-content__right-side > [button-style="success"] > .umb-button > .btn > .umb-button__content').click();
+        cy.get('.umb-node-preview__name').should('be.visible');
+        //Save and publish
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.umbracoSuccessNotification().should('be.visible');
+        //Waiting to ensure we have saved properly before leaving
+        cy.reload();
+        //Assert
+        cy.get('.umb-notifications__notifications > .alert-error').should('not.exist');
+        //Editing template with some content
+
+        //Testing if the edits match the expected results
+        const expected = '<a href="/">UrlPickerContent</a>';
+        cy.umbracoVerifyRenderedViewContent('/', expected, true).should('be.true');
+        //clean
+        cy.umbracoEnsureDocumentTypeNameNotExists(urlPickerDocTypeName);
+        cy.umbracoEnsureTemplateNameNotExists(urlPickerDocTypeName);
+
+    });
+});