Merge remote-tracking branch 'origin/v9/9.1' into v9/dev

# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props

Author: bergmania

.gitignore

@@ -84,6 +84,7 @@ src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/*
 src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/*
 src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/*
 src/Umbraco.Web.UI/wwwroot/Media/*
+src/Umbraco.Web.UI/Smidge/
 
 # Tests
 cypress.env.json

src/JsonSchema/AppSettings.cs

@@ -82,6 +82,7 @@ public class CmsDefinition
                 public BasicAuthSettings BasicAuth { get; set; }
 
                 public PackageMigrationSettings PackageMigration { get; set; }
+                public LegacyPasswordMigrationSettings LegacyPasswordMigration { get; set; }
             }
 
             /// <summary>

src/Umbraco.Core/Configuration/EntryAssemblyMetadata.cs

@@ -0,0 +1,24 @@
+using System.Reflection;
+
+namespace Umbraco.Cms.Core.Configuration
+{
+    internal class EntryAssemblyMetadata : IEntryAssemblyMetadata
+    {
+        public EntryAssemblyMetadata()
+        {
+            var entryAssembly = Assembly.GetEntryAssembly();
+
+            Name = entryAssembly
+                ?.GetName()
+                ?.Name ?? string.Empty;
+
+            InformationalVersion = entryAssembly
+                ?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
+                ?.InformationalVersion ?? string.Empty;
+        }
+
+        public string Name { get; }
+
+        public string InformationalVersion { get; }
+    }
+}

src/Umbraco.Core/Configuration/IEntryAssemblyMetadata.cs

@@ -0,0 +1,18 @@
+namespace Umbraco.Cms.Core.Configuration
+{
+    /// <summary>
+    /// Provides metadata about the entry assembly.
+    /// </summary>
+    public interface IEntryAssemblyMetadata
+    {
+        /// <summary>
+        /// Gets the Name of entry assembly.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the InformationalVersion string for entry assembly.
+        /// </summary>
+        public string InformationalVersion { get; }
+    }
+}

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

@@ -0,0 +1,30 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System.ComponentModel;
+
+namespace Umbraco.Cms.Core.Configuration.Models
+{
+    /// <summary>
+    /// Typed configuration options for legacy machine key settings used for migration of members from a v8 solution.
+    /// </summary>
+    [UmbracoOptions(Constants.Configuration.ConfigLegacyPasswordMigration)]
+    public class LegacyPasswordMigrationSettings
+    {
+        private const string StaticDecryptionKey = "";
+
+        /// <summary>
+        /// Gets the decryption algorithm.
+        /// </summary>
+        /// <remarks>
+        /// Currently only AES is supported. This should include all machine keys generated by Umbraco.
+        /// </remarks>
+        public string MachineKeyDecryption => "AES";
+
+        /// <summary>
+        /// Gets or sets the decryption hex-formatted string key found in legacy web.config machineKey configuration-element.
+        /// </summary>
+        [DefaultValue(StaticDecryptionKey)]
+        public string MachineKeyDecryptionKey { get; set; } = StaticDecryptionKey;
+    }
+}

src/Umbraco.Core/Constants-Configuration.cs

@@ -26,6 +26,7 @@ public static class Configuration
             public const string ConfigHostingDebug = ConfigHostingPrefix + "Debug";
             public const string ConfigCustomErrorsMode = ConfigCustomErrorsPrefix + "Mode";
             public const string ConfigActiveDirectory = ConfigPrefix + "ActiveDirectory";
+            public const string ConfigLegacyPasswordMigration = ConfigPrefix + "LegacyPasswordMigration";
             public const string ConfigContent = ConfigPrefix + "Content";
             public const string ConfigCoreDebug = ConfigCorePrefix + "Debug";
             public const string ConfigExceptionFilter = ConfigPrefix + "ExceptionFilter";

src/Umbraco.Core/Constants-HttpContextItemsKeys.cs

@@ -0,0 +1,19 @@
+namespace Umbraco.Cms.Core
+{
+    public static partial class Constants
+    {
+        public static class HttpContext
+        {
+            /// <summary>
+            /// Defines keys for items stored in HttpContext.Items
+            /// </summary>
+            public static class Items
+            {
+                /// <summary>
+                /// Key for current requests body deserialized as JObject.
+                /// </summary>
+                public const string RequestBodyAsJObject = "RequestBodyAsJObject";
+            }
+        }
+    }
+}

src/Umbraco.Core/Constants-Security.cs

@@ -66,6 +66,7 @@ public static class Security
             public const string AspNetCoreV2PasswordHashAlgorithmName = "PBKDF2.ASPNETCORE.V2";
             public const string AspNetUmbraco8PasswordHashAlgorithmName = "HMACSHA256";
             public const string AspNetUmbraco4PasswordHashAlgorithmName = "HMACSHA1";
+            public const string UnknownPasswordConfigJson = "{\"hashAlgorithm\":\"Unknown\"}";
         }
     }
 }

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs

@@ -73,6 +73,7 @@ public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
                 .AddUmbracoOptions<RichTextEditorSettings>()
                 .AddUmbracoOptions<BasicAuthSettings>()
                 .AddUmbracoOptions<RuntimeMinificationSettings>()
+                .AddUmbracoOptions<LegacyPasswordMigrationSettings>()
                 .AddUmbracoOptions<PackageMigrationSettings>();
 
             return builder;

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs

@@ -163,6 +163,7 @@ private void AddCoreServices()
             Services.AddUnique(factory => factory.GetRequiredService<AppCaches>().RequestCache);
             Services.AddUnique<IProfilingLogger, ProfilingLogger>();
             Services.AddUnique<IUmbracoVersion, UmbracoVersion>();
+            Services.AddUnique<IEntryAssemblyMetadata, EntryAssemblyMetadata>();
 
             this.AddAllCoreCollectionBuilders();
             this.AddNotificationHandler<UmbracoApplicationStartingNotification, EssentialDirectoryCreator>();