Merge pull request #787 from Orckestra/dev

C1 CMS v6.11

.github/workflows/main.yml

@@ -0,0 +1,33 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+
+# Controls when the action will run. 
+on:
+ issues:
+    types:
+      [opened]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: danhellem/github-actions-issue-to-work-item@master
+        env:
+          ado_token: "2fkdmowxykpxbjdesotpjddpvzodif5rd5vdsfrpxxsgrhuwmyiq"
+          github_token: "df9367d03c44f7cbae7cf24cbc20766fc165d4df"
+          ado_organization: "orckestra001"
+          ado_project: "OrckestraCommerce"
+          ado_area_path: "OrckestraCommerce"
+          ado_iteration_path: "OrckestraCommerce"
+          ado_wit: "Issue"
+          ado_new_state: "New"
+          ado_active_state: "Active"
+          ado_close_state: "Closed"
+          ado_bypassrules: true

Composite.Workflows/C1Console/Tools/SetTimeZoneWorkflow.cs

@@ -46,9 +46,13 @@ public SetTimeZoneWorkflow()
 
         private void initializeCodeActivity_InitializeBindings_ExecuteCode(object sender, EventArgs e)
         {
+            string label;
             var tzs = TimeZoneInfo.GetSystemTimeZones().ToDictionary(systemTimeZone => systemTimeZone.Id, systemTimeZone => 
-            StringResourceSystemFacade.GetString("Composite.Plugins.TimezoneDisplayNames",
-                "TimezoneDisplayName." + systemTimeZone.Id));
+                StringResourceSystemFacade.TryGetString("Composite.Plugins.TimezoneDisplayNames",
+                    "TimezoneDisplayName." + systemTimeZone.Id, out label)
+                ? label
+                : systemTimeZone.DisplayName);
+
             var bindings = new Dictionary<string, object>
             {
                 {"TimeZones", tzs},

Composite.Workflows/Composite.Workflows.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Composite</RootNamespace>
     <AssemblyName>Composite.Workflows</AssemblyName>
     <ProjectTypeGuids>{14822709-B5A1-4724-98CA-57A101D1B079};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
@@ -1373,8 +1373,8 @@
     </PropertyGroup>
     <Exec Condition="Exists('$(SolutionDir)\.git')" Command="git -C $(ProjectDir) rev-parse --abbrev-ref HEAD&gt; &quot;$(GitBranchFile)&quot;" />
     <Exec Condition="Exists('$(SolutionDir)\.git')" Command="git -C $(ProjectDir) rev-parse HEAD&gt; &quot;$(GitCommitHashFile)&quot;" />
-    <Exec Condition="!Exists('$(SolutionDir)\.git')" Command="@echo unknown branch > &quot;$(GitBranchFile)&quot;" />
-    <Exec Condition="!Exists('$(SolutionDir)\.git')" Command="@echo unknown commit > &quot;$(GitCommitHashFile)&quot;" />
+    <Exec Condition="!Exists('$(SolutionDir)\.git')" Command="@echo unknown branch &gt; &quot;$(GitBranchFile)&quot;" />
+    <Exec Condition="!Exists('$(SolutionDir)\.git')" Command="@echo unknown commit &gt; &quot;$(GitCommitHashFile)&quot;" />
     <PropertyGroup>
       <GitBranch>$([System.IO.File]::ReadAllText("$(GitBranchFile)").Trim())</GitBranch>
       <GitCommitHash>$([System.IO.File]::ReadAllText("$(GitCommitHashFile)").Trim())</GitCommitHash>

Composite/AspNet/SiteMapHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -188,7 +188,7 @@ private void WriteSiteMapList(XmlWriter writer, IEnumerable<CmsPageSiteMapNode>
                 }
                 else
                 {
-                    hostnameUrl = "http://" + binding.Hostname;
+                    hostnameUrl = $"{(binding.EnforceHttps ? "https" : "http")}://{binding.Hostname}";
                 }
 
                 writer.WriteString(hostnameUrl + "{0}/{1}{2}/sitemap.xml".FormatWith(

Composite/AspNet/WebObjectActivator.cs

@@ -0,0 +1,37 @@
+using System;
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Composite.AspNet
+{
+    internal class WebObjectActivator : IServiceProvider
+    {
+        private readonly IServiceProvider _inner;
+
+        public WebObjectActivator(IServiceProvider inner)
+        {
+            _inner = inner;
+        }
+
+        public object GetService(Type serviceType)
+        {
+            var service = _inner.GetService(serviceType);
+
+            // Multiple types from System.Web.dll have internal constructors
+            // Ignoring those types to have a better debugging experience
+            if (service == null
+                && serviceType.Assembly != typeof(System.Web.IHttpModule).Assembly)
+            {
+                try
+                {
+                    service = ActivatorUtilities.CreateInstance(_inner, serviceType);
+                }
+                catch (InvalidOperationException)
+                {
+                }
+            }
+
+            return service ?? Activator.CreateInstance(serviceType, true);
+        }
+    }
+}

Composite/Composite.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>Composite</AssemblyName>
     <ProjectTypeGuids>{14822709-B5A1-4724-98CA-57A101D1B079};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
@@ -210,6 +210,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AspNet\WebObjectActivator.cs" />
     <Compile Include="AspNet\CmsPagesSiteMapPlugin.cs" />
     <Compile Include="AspNet\CmsPageSiteMapProvider.cs" />
     <Compile Include="AspNet\ICmsSiteMapNode.cs" />
@@ -249,6 +250,7 @@
     <Compile Include="C1Console\RichContent\ContainerClasses\ContainerClassManager.cs" />
     <Compile Include="C1Console\RichContent\ContainerClasses\EqualOrAntonymComparer.cs" />
     <Compile Include="Core\EmptyDisposable.cs" />
+    <Compile Include="Core\HashingHelper.cs" />
     <Compile Include="Core\Implementation\StatelessDataConnectionImplementation.cs" />
     <Compile Include="Core\Instrumentation\DisposableResourceTracer.cs" />
     <Compile Include="AspNet\Caching\DonutCacheEntry.cs" />
@@ -257,6 +259,9 @@
     <Compile Include="Core\Serialization\CompositeJsonSerializer.cs" />
     <Compile Include="Core\Serialization\CompositeSerializationBinder.cs" />
     <Compile Include="Core\Types\CSharpCodeProviderFactory.cs" />
+    <Compile Include="Core\WebClient\Media\DefaultImageFileFormatProvider.cs" />
+    <Compile Include="Core\WebClient\Media\IImageFileFormatProvider.cs" />
+    <Compile Include="Core\WebClient\Media\ImageFormatProviders.cs" />
     <Compile Include="Core\WebClient\PageStructureRpc.cs" />
     <Compile Include="Core\WebClient\Renderings\Page\PagePreviewContext.cs" />
     <Compile Include="Core\WebClient\Renderings\Page\IPageContentFilter.cs" />

Composite/Core/Configuration/BuildinPlugins/GlobalSettingsProvider/BuildinGlobalSettingsProvider.cs

@@ -141,5 +141,7 @@ public string SerializedWorkflowsDirectory
         public bool InheritGlobalReadPermissionOnHiddenPerspectives => false;
 
         public bool OmitAspNetWebFormsSupport => false;
+
+        public bool ProtectResizedImagesWithHash => false;
     }
 }

Composite/Core/Configuration/Foundation/PluginFacades/GlobalSettingsProviderPluginFacade.cs

@@ -328,6 +328,8 @@ public static bool PrettifyRenderFunctionExceptions
 
         public static bool OmitAspNetWebFormsSupport => UseReaderLock(p => p.OmitAspNetWebFormsSupport);
 
+        public static bool ProtectResizedImagesWithHash => UseReaderLock(p => p.ProtectResizedImagesWithHash);
+
         private static void Flush()
         {
             _resourceLocker.ResetInitialization();

Composite/Core/Configuration/GlobalSettingsFacade.cs

@@ -257,6 +257,11 @@ public static bool InheritGlobalReadPermissionOnHiddenPerspectives
         /// </summary>
         public static bool OmitAspNetWebFormsSupport => _globalSettingsFacade.OmitAspNetWebFormsSupport;
 
+        /// <summary>
+        /// When <value>true</value>, image URLs with resizing options will have a hash appended to ensure that the URLs are generated by the website.
+        /// </summary>
+        public static bool ProtectResizedImagesWithHash => _globalSettingsFacade.ProtectResizedImagesWithHash;
+
         // Overload
         /// <exclude />
         public static CachingSettings GetNamedCaching(string name)

Composite/Core/Configuration/GlobalSettingsFacadeImpl.cs

@@ -168,5 +168,7 @@ public void RemoveNonProbableAssemblyName(string assemblyNamePatern)
             GlobalSettingsProviderPluginFacade.InheritGlobalReadPermissionOnHiddenPerspectives;
 
         public bool OmitAspNetWebFormsSupport => GlobalSettingsProviderPluginFacade.OmitAspNetWebFormsSupport;
+
+        public bool ProtectResizedImagesWithHash => GlobalSettingsProviderPluginFacade.ProtectResizedImagesWithHash;
     }
 }

Composite/Core/Configuration/IGlobalSettingsFacade.cs

@@ -45,5 +45,6 @@ internal interface IGlobalSettingsFacade
         TimeZoneInfo TimeZone { get; }
         bool InheritGlobalReadPermissionOnHiddenPerspectives { get; }
         bool OmitAspNetWebFormsSupport { get; }
+        bool ProtectResizedImagesWithHash { get; }
     }
 }

Composite/Core/Configuration/Plugins/GlobalSettingsProvider/IGlobalSettingsProvider.cs

@@ -89,5 +89,7 @@ internal interface IGlobalSettingsProvider
         bool InheritGlobalReadPermissionOnHiddenPerspectives { get; }
 
         bool OmitAspNetWebFormsSupport { get; }
+
+        bool ProtectResizedImagesWithHash { get; }
     }
 }

Composite/Core/HashingHelper.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Composite.Core
+{
+    internal static class HashingHelper
+    {
+        [ThreadStatic]
+        private static MD5 _md5;
+
+        /// <summary>
+        /// Gets a cached instance of an MD5 algorithm
+        /// </summary>
+        private static MD5 MD5
+        {
+            get
+            {
+                var value = _md5;
+                if (value == null)
+                {
+                    _md5 = value = MD5.Create();
+                }
+
+                return value;
+            }
+        }
+
+        public static Guid ComputeMD5Hash(string str, Encoding textEncoding)
+        {
+            var bytes = textEncoding.GetBytes(str);
+            var hash = MD5.ComputeHash(bytes);
+            return new Guid(hash);
+        }
+
+    }
+}

Composite/Core/PackageSystem/PackageFragmentInstallers/DllPackageFragmentInstaller.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -23,7 +23,7 @@ public sealed class DllPackageFragmentInstaller : BasePackageFragmentInstaller
     {
         private List<FileToCopy> _filesToCopy;
 
-        private static readonly string LogTitle = typeof (DllPackageFragmentInstaller).Name;
+        private static readonly string LogTitle = nameof(DllPackageFragmentInstaller);
 
         /// <exclude />
         public override IEnumerable<PackageFragmentValidationResult> Validate()
@@ -197,10 +197,11 @@ public override IEnumerable<XElement> Install()
                 this.InstallerContext.ZipFileSystem.WriteFileToDisk(fileToCopy.SourceFilename, tempFileName);
 
                 // Checking for dll version here:
-                var sourceAssemblyName = AssemblyName.GetAssemblyName(tempFileName);
+                var sourceAssemblyName = GetAssemblyNameWithErrorText(tempFileName, () => $"Source file name: '{fileToCopy.SourceFilename}'");
+
                 var sourceAssemblyVersion = sourceAssemblyName.Version;
                 var sourceFileVersion = GetDllFileVersion(tempFileName);
-                
+
                 string targetDirectory = Path.GetDirectoryName(fileToCopy.TargetFilePath);
                 if (!Directory.Exists(targetDirectory))
                 {
@@ -213,10 +214,11 @@ public override IEnumerable<XElement> Install()
 
                 if (C1File.Exists(fileToCopy.TargetFilePath) && fileToCopy.Overwrite)
                 {
-                    var existingAssemblyVersion = AssemblyName.GetAssemblyName(fileToCopy.TargetFilePath).Version;
+                    var existingAssemblyName = GetAssemblyNameWithErrorText(fileToCopy.TargetFilePath, () => $"TargetFilePath: '{fileToCopy.TargetFilePath}' ");
+                    var existingAssemblyVersion = existingAssemblyName.Version;
                     var existingFileVersion = GetDllFileVersion(fileToCopy.TargetFilePath);
 
-                    if (existingAssemblyVersion == sourceAssemblyVersion 
+                    if (existingAssemblyVersion == sourceAssemblyVersion
                         && existingFileVersion >= sourceFileVersion)
                     {
                         Log.LogInformation(LogTitle,
@@ -254,12 +256,11 @@ public override IEnumerable<XElement> Install()
                     Log.LogInformation(LogTitle, "Overwriting existing file '{0}' version '{2}', new version is '{1}'",
                         fileToCopy.TargetRelativeFilePath, sourceFileVersion, existingFileVersion);
                 }
-                
+
                 if (addAssemblyBinding)
                 {
                     asmBindingsToAdd.Add(sourceAssemblyName);
                 }
-
 
                 File.Delete(fileToCopy.TargetFilePath);
                 File.Move(tempFileName, fileToCopy.TargetFilePath);
@@ -281,6 +282,18 @@ public override IEnumerable<XElement> Install()
             yield return new XElement("Files", fileElements);
         }
 
+        private AssemblyName GetAssemblyNameWithErrorText(string filePath, Func<string> getErrorText)
+        {
+            try
+            {
+                return AssemblyName.GetAssemblyName(filePath);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Failed to read AssemblyName from a DLL. " + getErrorText(), ex);
+            }
+        }
+
         private Version GetDllFileVersion(string dllFilePath)
         {
             var fileVersionInfo = FileVersionInfo.GetVersionInfo(dllFilePath);
@@ -416,8 +429,8 @@ private string GetPublicKeyToken(AssemblyName assemblyName)
             {
                 byte[] publicKeyTokenBytes = assemblyName.GetPublicKeyToken();
 
-                return publicKeyTokenBytes == null || publicKeyTokenBytes.Length == 0 
-                    ? "null" 
+                return publicKeyTokenBytes == null || publicKeyTokenBytes.Length == 0
+                    ? "null"
                     : string.Join("", publicKeyTokenBytes.Select(b => $"{b:x2}"));
             }
 
@@ -474,6 +487,6 @@ public string OldVersion
                 }
             }
         }
-    
+
     }
 }

Composite/Core/Routing/MediaUrls.cs

@@ -1,7 +1,6 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Specialized;
-using System.Management;
 using System.Web;
 using Composite.Core.Extensions;
 using Composite.Core.WebClient;
@@ -268,9 +267,6 @@ private static string BuildPublicUrl(MediaUrlData mediaUrlData)
                 urlProvider = _defaultMediaUrlProvider.Value;
             }
 
-
-
-
             if (mediaUrlData.QueryParameters.Count > 0)
             {
                 string mediaUrl;