Merge branch 'v9/dev' into v9/feature/language-keys-cleanup

Author: elit0451

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/UmbracoPackage/.template.config/template.json

@@ -24,7 +24,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.0.0-rc003",
+            "defaultValue": "9.0.0-rc004",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

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

@@ -32,6 +32,10 @@
         "NoNodesViewPath":{
             "longName": "no-nodes-view-path",
             "shortName": ""
+        },
+        "UseHttpsRedirect": {
+            "longName": "use-https-redirect",
+            "shortName": ""
         }
     },
     "usageExamples": [

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

@@ -62,6 +62,13 @@
                 "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

@@ -57,7 +57,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.0.0-rc003",
+            "defaultValue": "9.0.0-rc004",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },
@@ -293,6 +293,12 @@
         "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.json

@@ -15,9 +15,16 @@
   },
   "Umbraco": {
     "CMS": {
-      //#if (HasNoNodesViewPath)
+      //#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": {

src/Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Version>9.0.0</Version>
     <AssemblyVersion>9.0.0</AssemblyVersion>
-    <InformationalVersion>9.0.0-rc003</InformationalVersion>
+    <InformationalVersion>9.0.0-rc004</InformationalVersion>
     <FileVersion>9.0.0</FileVersion>
     <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>

src/Umbraco.Core/Configuration/ConfigConnectionString.cs

@@ -5,69 +5,88 @@ namespace Umbraco.Cms.Core.Configuration
 {
     public class ConfigConnectionString
     {
+        public string Name { get; }
+
+        public string ConnectionString { get; }
+
+        public string ProviderName { get; }
+
         public ConfigConnectionString(string name, string connectionString, string providerName = null)
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
-            ConnectionString = connectionString;
-
-            ProviderName = string.IsNullOrEmpty(providerName) ? ParseProvider(connectionString) : providerName;
+            ConnectionString = ParseConnectionString(connectionString, ref providerName);
+            ProviderName = providerName;
         }
 
-        public string ConnectionString { get; }
-        public string ProviderName { get; }
-        public string Name { get; }
-
-        private static bool IsSqlCe(DbConnectionStringBuilder builder) => (builder.TryGetValue("Data Source", out var ds)
-                                                                           || builder.TryGetValue("DataSource", out ds)) &&
-                                                                          ds is string dataSource &&
-                                                                          dataSource.EndsWith(".sdf");
+        private static string ParseConnectionString(string connectionString, ref string providerName)
+        {
+            if (string.IsNullOrEmpty(connectionString))
+            {
+                return connectionString;
+            }
 
-        private static bool IsSqlServer(DbConnectionStringBuilder builder) =>
-            !string.IsNullOrEmpty(GetServer(builder)) &&
-            ((builder.TryGetValue("Database", out var db) && db is string database &&
-              !string.IsNullOrEmpty(database)) ||
-             (builder.TryGetValue("AttachDbFileName", out var a) && a is string attachDbFileName &&
-              !string.IsNullOrEmpty(attachDbFileName)) ||
-             (builder.TryGetValue("Initial Catalog", out var i) && i is string initialCatalog &&
-              !string.IsNullOrEmpty(initialCatalog)));
+            var builder = new DbConnectionStringBuilder
+            {
+                ConnectionString = connectionString
+            };
 
-        private static string GetServer(DbConnectionStringBuilder builder)
-        {
-            if(builder.TryGetValue("Server", out var s) && s is string server)
+            // Replace data directory placeholder
+            const string attachDbFileNameKey = "AttachDbFileName";
+            const string dataDirectoryPlaceholder = "|DataDirectory|";
+            if (builder.TryGetValue(attachDbFileNameKey, out var attachDbFileNameValue) &&
+                attachDbFileNameValue is string attachDbFileName &&
+                attachDbFileName.Contains(dataDirectoryPlaceholder))
             {
-                return server;
+                var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
+                if (!string.IsNullOrEmpty(dataDirectory))
+                {
+                    builder[attachDbFileNameKey] = attachDbFileName.Replace(dataDirectoryPlaceholder, dataDirectory);
+
+                    // Mutate the existing connection string (note: the builder also lowercases the properties)
+                    connectionString = builder.ToString();
+                }
             }
 
-            if ((builder.TryGetValue("Data Source", out var ds)
-                 || builder.TryGetValue("DataSource", out ds)) && ds is string dataSource)
+            // Also parse provider name now we already have a builder
+            if (string.IsNullOrEmpty(providerName))
             {
-                return dataSource;
+                providerName = ParseProviderName(builder);
             }
 
-            return "";
+            return connectionString;
         }
 
-        private static string ParseProvider(string connectionString)
+        /// <summary>
+        /// Parses the connection string to get the provider name.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        /// <returns>
+        /// The provider name or <c>null</c> is the connection string is empty.
+        /// </returns>
+        public static string ParseProviderName(string connectionString)
         {
             if (string.IsNullOrEmpty(connectionString))
             {
                 return null;
             }
 
-            var builder = new DbConnectionStringBuilder {ConnectionString = connectionString};
-            if (IsSqlCe(builder))
+            var builder = new DbConnectionStringBuilder
             {
-                return Constants.DbProviderNames.SqlCe;
-            }
+                ConnectionString = connectionString
+            };
 
+            return ParseProviderName(builder);
+        }
 
-            if (IsSqlServer(builder))
+        private static string ParseProviderName(DbConnectionStringBuilder builder)
+        {
+            if ((builder.TryGetValue("Data Source", out var dataSource) || builder.TryGetValue("DataSource", out dataSource)) &&
+                dataSource?.ToString().EndsWith(".sdf", StringComparison.OrdinalIgnoreCase) == true)
             {
-                return Constants.DbProviderNames.SqlServer;
+                return Constants.DbProviderNames.SqlCe;
             }
 
-            throw new ArgumentException("Cannot determine provider name from connection string",
-                nameof(connectionString));
+            return Constants.DbProviderNames.SqlServer;
         }
     }
 }

src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs

@@ -26,6 +26,6 @@ private string umbracoDbDSN
         /// <summary>
         /// Gets or sets a value for the Umbraco database connection string..
         /// </summary>
-        public ConfigConnectionString UmbracoConnectionString { get; set; }
+        public ConfigConnectionString UmbracoConnectionString { get; set; } = new ConfigConnectionString(Constants.System.UmbracoConnectionName, null);
     }
 }

src/Umbraco.Core/Configuration/Models/RuntimeSettings.cs

@@ -15,7 +15,7 @@ public class RuntimeSettings
         public int? MaxQueryStringLength { get; set; }
 
         /// <summary>
-        /// Gets or sets a value for the maximum request length.
+        /// Gets or sets a value for the maximum request length in kb.
         /// </summary>
         public int? MaxRequestLength { get; set; }
     }