From 42375a6b3f43bdc258dd414306386cf9a5e18e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pauli=20=C3=98ster=C3=B8?= <pauli@burningice.dk>
Date: Wed, 10 Apr 2019 13:32:18 -0200
Subject: [PATCH 01/36] Update .Net Framework to 4.7.2

---
 Composite.Workflows/Composite.Workflows.csproj | 2 +-
 Composite/Composite.csproj                     | 2 +-
 Website/DebugBuild.Web.config                  | 2 +-
 Website/ReleaseBuild.Web.config                | 2 +-
 Website/WebSite.csproj                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Composite.Workflows/Composite.Workflows.csproj b/Composite.Workflows/Composite.Workflows.csproj
index a8f8223d6c..a9da8b4933 100644
--- a/Composite.Workflows/Composite.Workflows.csproj
+++ b/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.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index 794277cddf..e7db0494f0 100644
--- a/Composite/Composite.csproj
+++ b/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.7.2</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
diff --git a/Website/DebugBuild.Web.config b/Website/DebugBuild.Web.config
index cc15d41f19..4512a906ab 100644
--- a/Website/DebugBuild.Web.config
+++ b/Website/DebugBuild.Web.config
@@ -29,7 +29,7 @@
     <httpHandlers>
       <add verb="GET" path="sitemap.xml" type="Composite.AspNet.SiteMapHandler, Composite" />
     </httpHandlers>
-    <httpRuntime fcnMode="Single" targetFramework="4.7.1" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
+    <httpRuntime fcnMode="Single" targetFramework="4.7.2" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
     <pages clientIDMode="AutoID">
       <controls>
         <add tagPrefix="c1" namespace="Composite.Plugins.PageTemplates.MasterPages.Controls.Rendering" assembly="Composite" />
diff --git a/Website/ReleaseBuild.Web.config b/Website/ReleaseBuild.Web.config
index c271a9b782..3d6b736258 100644
--- a/Website/ReleaseBuild.Web.config
+++ b/Website/ReleaseBuild.Web.config
@@ -29,7 +29,7 @@
     <httpHandlers>
       <add verb="GET" path="sitemap.xml" type="Composite.AspNet.SiteMapHandler, Composite" />
     </httpHandlers>
-    <httpRuntime fcnMode="Single" targetFramework="4.7.1" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
+    <httpRuntime fcnMode="Single" targetFramework="4.7.2" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
     <pages clientIDMode="AutoID">
       <controls>
         <add tagPrefix="c1" namespace="Composite.Plugins.PageTemplates.MasterPages.Controls.Rendering" assembly="Composite" />
diff --git a/Website/WebSite.csproj b/Website/WebSite.csproj
index 2667746362..58236bcbda 100644
--- a/Website/WebSite.csproj
+++ b/Website/WebSite.csproj
@@ -11,7 +11,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Composite</RootNamespace>
     <AssemblyName>Composite.Website</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>

From 43525985b2e2d94caf2038f14fce17747c7e6895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pauli=20=C3=98ster=C3=B8?= <pauli@burningice.dk>
Date: Wed, 10 Apr 2019 13:32:47 -0200
Subject: [PATCH 02/36] Automatically configure WebObjectActivator

---
 Composite/AspNet/WebObjectActivator.cs        | 34 +++++++++++++++++++
 Composite/Composite.csproj                    |  1 +
 .../ApplicationLevelEventHandlers.cs          |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 Composite/AspNet/WebObjectActivator.cs

diff --git a/Composite/AspNet/WebObjectActivator.cs b/Composite/AspNet/WebObjectActivator.cs
new file mode 100644
index 0000000000..f8f32431fa
--- /dev/null
+++ b/Composite/AspNet/WebObjectActivator.cs
@@ -0,0 +1,34 @@
+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);
+            if (service == null)
+            {
+                try
+                {
+                    service = ActivatorUtilities.CreateInstance(_inner, serviceType);
+                }
+                catch (InvalidOperationException)
+                {
+                    service = Activator.CreateInstance(serviceType, true);
+                }
+            }
+
+            return service;
+        }
+    }
+}
diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index e7db0494f0..20f2f00d4e 100644
--- a/Composite/Composite.csproj
+++ b/Composite/Composite.csproj
@@ -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" />
diff --git a/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs b/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs
index 081dcdf881..f6ce6f52b4 100644
--- a/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs
+++ b/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs
@@ -351,6 +351,7 @@ public static void ApplicationStartInitialize(bool displayDebugInfo = false)
 
                 ServiceLocator.BuildServiceProvider();
                 ServiceLocator.CreateRequestServicesScope(HttpContext.Current);
+                HttpRuntime.WebObjectActivator = new WebObjectActivator(ServiceLocator.ServiceProvider);
 
                 ApplicationStartupFacade.FireBeforeSystemInitialize(ServiceLocator.ServiceProvider);
             }

From 4db4a89258b27e2a671523c0eb5141face0834e1 Mon Sep 17 00:00:00 2001
From: David Abitbol <dabitbol@gmail.com>
Date: Fri, 29 Jan 2021 11:20:33 -0500
Subject: [PATCH 03/36] Create main.yml

---
 .github/workflows/main.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..e71f72250e
--- /dev/null
+++ b/.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: "ockestra001"
+          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

From 5910700d39e1de05ce851f06c9a13628988795f5 Mon Sep 17 00:00:00 2001
From: David Abitbol <dabitbol@gmail.com>
Date: Fri, 29 Jan 2021 11:24:59 -0500
Subject: [PATCH 04/36] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e71f72250e..1c8f192aba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
         env:
           ado_token: "2fkdmowxykpxbjdesotpjddpvzodif5rd5vdsfrpxxsgrhuwmyiq"
           github_token: "df9367d03c44f7cbae7cf24cbc20766fc165d4df"
-          ado_organization: "ockestra001"
+          ado_organization: "orckestra001"
           ado_project: "OrckestraCommerce"
           ado_area_path: "OrckestraCommerce"
           ado_iteration_path: "OrckestraCommerce"

From 6f01a471b8a3c7fb291779bedb1b42327f1250dc Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Wed, 16 Jun 2021 11:53:54 +0200
Subject: [PATCH 05/36] FileLogger - fixing an unnecessary blocking when an
 instance isn't capable of opening a log file

---
 .../FileLogTraceListener/FileLogger.cs               | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs b/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs
index debff4ec2f..5229366b19 100644
--- a/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs
+++ b/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs
@@ -1,4 +1,4 @@
-//#define UseLockFiles
+//#define UseLockFiles
 
 using System;
 using System.Collections.Generic;
@@ -22,6 +22,9 @@ namespace Composite.Plugins.Logging.LogTraceListeners.FileLogTraceListener
     /// </summary>
     internal class FileLogger : IDisposable
     {
+        private const int MaxLogFiles = 10;
+        private bool _initializationFailed;
+
 #if UseLockFiles
         private static readonly TimeSpan LockFileUpdateFrequency = TimeSpan.FromSeconds(20);
         private static readonly TimeSpan OldLockFilesPreservationTime = TimeSpan.FromSeconds(60);
@@ -115,6 +118,8 @@ public DateTime StartupTime
 
         public void WriteEntry(LogEntry entry)
         {
+            if (_initializationFailed) return;
+
             string logLine = entry.ToString();
 
             byte[] bytes = Encoding.UTF8.GetBytes(logLine + "\n");
@@ -133,6 +138,7 @@ public void WriteEntry(LogEntry entry)
                 }
 
                 EnsureInitialize();
+                if (_initializationFailed) return;
 
                 FileConnection.NewEntries.Add(entry);
 
@@ -326,7 +332,7 @@ private void EnsureInitialize()
 
                 string fileNamePrefix = creationDate.ToString("yyyyMMdd");
 
-                for (int i = 0; i < 10; i++)
+                for (int i = 0; i < MaxLogFiles; i++)
                 {
                     var fileName = fileNamePrefix + (i > 0 ? "_" + i : string.Empty) + ".txt";
                     string filePath = Path.Combine(_logDirectoryPath, fileName);
@@ -377,7 +383,7 @@ private void EnsureInitialize()
                     return;
                 }
 
-                throw new InvalidOperationException("Failed to open/create a log file");
+                _initializationFailed = true;
             }
 
         }

From 0b11fd4734485fd5c83b20c7d03df5196d28c674 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Fri, 18 Jun 2021 13:45:44 +0200
Subject: [PATCH 06/36] SiteMapHandler should take EnforceHttps property of an
 HTTP binding into account

---
 Composite/AspNet/SiteMapHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Composite/AspNet/SiteMapHandler.cs b/Composite/AspNet/SiteMapHandler.cs
index 435fd4b55d..f3d22b5ffb 100644
--- a/Composite/AspNet/SiteMapHandler.cs
+++ b/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(

From c0d320e6bcb9774df98a984da8b222454e1ede5d Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 9 Aug 2021 11:35:44 +0200
Subject: [PATCH 07/36] XHTML indexing - making sure the content of a <style>
 tag is ignored

---
 Composite/Search/Crawling/XhtmlCrawlingHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Composite/Search/Crawling/XhtmlCrawlingHelper.cs b/Composite/Search/Crawling/XhtmlCrawlingHelper.cs
index b13d1a3540..31fbeab9ec 100644
--- a/Composite/Search/Crawling/XhtmlCrawlingHelper.cs
+++ b/Composite/Search/Crawling/XhtmlCrawlingHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -105,7 +105,7 @@ private void ProcessElement(XElement element)
                 return;
             }
 
-            if (element.Name.LocalName == "script" || element.Name.LocalName == "noscript")
+            if (element.Name.LocalName == "script" || element.Name.LocalName == "noscript" || element.Name.LocalName == "style")
             {
                 return;
             }

From 53922597f262ec75dc4ef978464896f33d88e173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pauli=20=C3=98ster=C3=B8?= <pauli@burningice.dk>
Date: Mon, 6 Sep 2021 23:19:26 +0200
Subject: [PATCH 08/36] Fix missing check for _showPublicationStatusSelector
 when using a Custom form, since the code, without further checks, forcebly
 adds the fields PublishDate and UnpublishDate to bindings even though they
 might already be there.

---
 .../Data/DynamicTypes/DataTypeDescriptorFormsHelper.cs     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Composite/Data/DynamicTypes/DataTypeDescriptorFormsHelper.cs b/Composite/Data/DynamicTypes/DataTypeDescriptorFormsHelper.cs
index f5dac54791..ab446f717a 100644
--- a/Composite/Data/DynamicTypes/DataTypeDescriptorFormsHelper.cs
+++ b/Composite/Data/DynamicTypes/DataTypeDescriptorFormsHelper.cs
@@ -15,6 +15,7 @@
 using Composite.Data.ProcessControlled;
 using Composite.Data.ProcessControlled.ProcessControllers.GenericPublishProcessController;
 using Composite.Data.PublishScheduling;
+using Composite.Data.Types;
 using Composite.Data.Validation;
 using Composite.Data.Validation.ClientValidationRules;
 using Composite.Functions;
@@ -785,10 +786,10 @@ private void GenerateForm()
             }
             else
             {
-                if (_dataTypeDescriptor.SuperInterfaces.Contains(typeof(IPublishControlled)))
+                if (_showPublicationStatusSelector && _dataTypeDescriptor.SuperInterfaces.Contains(typeof(IPublishControlled)))
                 {
-                    fieldNameToBindingNameMapper.Add("PublishDate", "PublishDate");
-                    fieldNameToBindingNameMapper.Add("UnpublishDate", "UnpublishDate");
+                    fieldNameToBindingNameMapper.Add(nameof(IPublishSchedule.PublishDate), nameof(IPublishSchedule.PublishDate));
+                    fieldNameToBindingNameMapper.Add(nameof(IUnpublishSchedule.UnpublishDate), nameof(IUnpublishSchedule.UnpublishDate));
                 }
 
                 Func<XElement, IEnumerable<XAttribute>> getBindingsFunc =

From c48eef8d8e34d47665704dc72224426bc78f6ac3 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 13 Sep 2021 14:57:22 +0200
Subject: [PATCH 09/36] Targeting .NET Framework 4.8

---
 Composite.Workflows/Composite.Workflows.csproj | 6 +++---
 Composite/Composite.csproj                     | 2 +-
 Website/DebugBuild.Web.config                  | 2 +-
 Website/ReleaseBuild.Web.config                | 2 +-
 Website/WebSite.csproj                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Composite.Workflows/Composite.Workflows.csproj b/Composite.Workflows/Composite.Workflows.csproj
index a9da8b4933..22bf14035a 100644
--- a/Composite.Workflows/Composite.Workflows.csproj
+++ b/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.2</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>
diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index e0e9e77afd..e87364eb79 100644
--- a/Composite/Composite.csproj
+++ b/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.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
diff --git a/Website/DebugBuild.Web.config b/Website/DebugBuild.Web.config
index 4512a906ab..ba6144ea7c 100644
--- a/Website/DebugBuild.Web.config
+++ b/Website/DebugBuild.Web.config
@@ -29,7 +29,7 @@
     <httpHandlers>
       <add verb="GET" path="sitemap.xml" type="Composite.AspNet.SiteMapHandler, Composite" />
     </httpHandlers>
-    <httpRuntime fcnMode="Single" targetFramework="4.7.2" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
+    <httpRuntime fcnMode="Single" targetFramework="4.8" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
     <pages clientIDMode="AutoID">
       <controls>
         <add tagPrefix="c1" namespace="Composite.Plugins.PageTemplates.MasterPages.Controls.Rendering" assembly="Composite" />
diff --git a/Website/ReleaseBuild.Web.config b/Website/ReleaseBuild.Web.config
index 3d6b736258..1de84a9366 100644
--- a/Website/ReleaseBuild.Web.config
+++ b/Website/ReleaseBuild.Web.config
@@ -29,7 +29,7 @@
     <httpHandlers>
       <add verb="GET" path="sitemap.xml" type="Composite.AspNet.SiteMapHandler, Composite" />
     </httpHandlers>
-    <httpRuntime fcnMode="Single" targetFramework="4.7.2" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
+    <httpRuntime fcnMode="Single" targetFramework="4.8" maxRequestLength="20480" relaxedUrlToFileSystemMapping="true" requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
     <pages clientIDMode="AutoID">
       <controls>
         <add tagPrefix="c1" namespace="Composite.Plugins.PageTemplates.MasterPages.Controls.Rendering" assembly="Composite" />
diff --git a/Website/WebSite.csproj b/Website/WebSite.csproj
index 1b070d4838..37e236130d 100644
--- a/Website/WebSite.csproj
+++ b/Website/WebSite.csproj
@@ -11,7 +11,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Composite</RootNamespace>
     <AssemblyName>Composite.Website</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>

From 7a7a6fa8dd4df1493af252cd83859c924c3176f4 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Wed, 15 Sep 2021 18:00:57 +0200
Subject: [PATCH 10/36] Refactoring

---
 .../Core/WebClient/Media/ImageResizer.cs      | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/Composite/Core/WebClient/Media/ImageResizer.cs b/Composite/Core/WebClient/Media/ImageResizer.cs
index ad7a79c254..14eb2624e1 100644
--- a/Composite/Core/WebClient/Media/ImageResizer.cs
+++ b/Composite/Core/WebClient/Media/ImageResizer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -62,8 +62,6 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
 
             string imageKey = file.CompositePath;
 
-            bool isNativeProvider = file is FileSystemFileBase;
-
             string imageSizeCacheKey = "ShowMedia.ashx image size " + imageKey;
             Size? imageSize = HttpRuntime.Cache.Get(imageSizeCacheKey) as Size?;
 
@@ -87,7 +85,11 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
                     imageSize = calculatedSize;
 
                     // We can provider cache dependency only for the native media provider
-                    var cacheDependency = isNativeProvider ? new CacheDependency((file as FileSystemFileBase).SystemPath) : null;
+                    CacheDependency cacheDependency = null;
+                    if (file is FileSystemFileBase fileSystemFile)
+                    {
+                        cacheDependency = new CacheDependency(fileSystemFile.SystemPath);
+                    }
 
                     HttpRuntime.Cache.Add(imageSizeCacheKey, imageSize, cacheDependency, DateTime.MaxValue, CacheExpirationTimeSpan, CacheItemPriority.Normal, null);
                 }
@@ -108,7 +110,7 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
                 string centerCroppedString = centerCrop ? "c" : string.Empty;
 
                 string fileExtension = _ImageFormat2Extension[targetImageFormat];
-                string resizedImageFileName = string.Format("{0}x{1}_{2}{3}_{4}.{5}", newWidth, newHeight, filePathHash, centerCroppedString, resizingOptions.Quality, fileExtension);
+                string resizedImageFileName = $"{newWidth}x{newHeight}_{filePathHash}{centerCroppedString}_{resizingOptions.Quality}.{fileExtension}";
 
                 string imageFullPath = Path.Combine(_resizedImagesDirectoryPath, resizedImageFileName);
 
@@ -132,15 +134,8 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
             }
             finally
             {
-                if (bitmap != null)
-                {
-                    bitmap.Dispose();
-                }
-
-                if (fileStream != null)
-                {
-                    fileStream.Dispose();
-                }
+                bitmap?.Dispose();
+                fileStream?.Dispose();
             }
         }
 
@@ -160,13 +155,13 @@ private static bool CalculateSize(int width, int height, ResizingOptions resizin
 
             centerCrop = false;
 
-            // If both height and width are defined - we have "scalling"
+            // If both height and width are defined - we have "scaling"
             if (resizingOptions.Height != null && resizingOptions.Width != null)
             {
                 newHeight = (int)resizingOptions.Height;
                 newWidth = (int)resizingOptions.Width;
 
-                // we do not allow scalling to a size, bigger than original one
+                // we do not allow scaling to a size, bigger than original one
                 if (newHeight > height)
                 {
                     newHeight = height;
@@ -226,7 +221,7 @@ private static bool CalculateSize(int width, int height, ResizingOptions resizin
             newWidth = width;
             newHeight = height;
 
-            // If image doesn't fit to bondaries "maxWidth X maxHeight", downsizing it
+            // If image doesn't fit to boundaries "maxWidth X maxHeight", downsizing it
             int? maxWidth = resizingOptions.Width;
             if (resizingOptions.MaxWidth != null && (maxWidth == null || resizingOptions.MaxWidth < maxWidth))
             {
@@ -262,9 +257,9 @@ private static void ResizeImage(Bitmap image, string outputFilePath, int newWidt
             {
                 if (imageFormat.Guid == ImageFormat.Jpeg.Guid)
                 {
-                    EncoderParameters parameters = new EncoderParameters(1);
+                    var parameters = new EncoderParameters(1);
 
-                    // Setting image quality, the deafult value is 75
+                    // Setting image quality, the default value is 75
                     parameters.Param[0] = new EncoderParameter(
                         System.Drawing.Imaging.Encoder.Quality, quality);
 
@@ -371,16 +366,15 @@ private static bool ImageFormatIsSupported(ImageFormat imageFormat)
         public class SupportedImageFormats
         {
             /// <exclude />
-            public static ImageFormat JPG { get { return ImageFormat.Jpeg; } }
+            public static ImageFormat JPG => ImageFormat.Jpeg;
             /// <exclude />
-            public static ImageFormat PNG { get { return ImageFormat.Png; } }
+            public static ImageFormat PNG => ImageFormat.Png;
             /// <exclude />
-            public static ImageFormat TIFF { get { return ImageFormat.Tiff; } }
+            public static ImageFormat TIFF => ImageFormat.Tiff;
             /// <exclude />
-            public static ImageFormat GIF { get { return ImageFormat.Gif; } }
+            public static ImageFormat GIF => ImageFormat.Gif;
             /// <exclude />
-            public static ImageFormat BMP { get { return ImageFormat.Bmp; } }
-
+            public static ImageFormat BMP => ImageFormat.Bmp;
         }
     }
 }

From 869321b11ae37eda4b012ef83e87d35e4cf523e6 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Thu, 16 Sep 2021 15:00:03 +0200
Subject: [PATCH 11/36] Rewriting ImageResizer to accept "media type" instead
 of ImageFormat

---
 .../Core/WebClient/Media/ImageResizer.cs      | 73 +++++++++++--------
 Website/Renderers/ShowMedia.ashx              | 71 ++++++++----------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/Composite/Core/WebClient/Media/ImageResizer.cs b/Composite/Core/WebClient/Media/ImageResizer.cs
index 14eb2624e1..0cc22d0fb3 100644
--- a/Composite/Core/WebClient/Media/ImageResizer.cs
+++ b/Composite/Core/WebClient/Media/ImageResizer.cs
@@ -14,20 +14,31 @@
 namespace Composite.Core.WebClient.Media
 {
     ///<summary>
-    ///Class that performs image resizing
+    /// Class that performs image resizing
     ///</summary>
     /// <exclude />
     [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
     public static class ImageResizer
     {
         private const string ResizedImagesCacheDirectory = "~/App_Data/Composite/Cache/Resized images";
-        private static Dictionary<ImageFormat, string> _ImageFormat2Extension = new Dictionary<ImageFormat, string>
-        {  
-            {ImageFormat.Png, "png"},
-            {ImageFormat.Gif, "gif"}, 
-            {ImageFormat.Jpeg, "jpg"}, 
-            {ImageFormat.Bmp, "bmp"}, 
-            {ImageFormat.Tiff, "tiff"}
+        private class MediaTypeInfo
+        {
+            public MediaTypeInfo(string extension, ImageFormat imageFormat)
+            {
+                Extension = extension;
+                ImageFormat = imageFormat;
+            }
+            public string Extension { get; }
+            public ImageFormat ImageFormat { get; }
+        }
+
+        private static Dictionary<string, MediaTypeInfo> MediaTypeInfoMap = new Dictionary<string, MediaTypeInfo>
+        {
+            {MimeTypeInfo.Jpeg, new MediaTypeInfo("jpg", ImageFormat.Jpeg)},
+            {MimeTypeInfo.Png, new MediaTypeInfo("png", ImageFormat.Png)},
+            {MimeTypeInfo.Gif, new MediaTypeInfo("gif", ImageFormat.Gif)},
+            {MimeTypeInfo.Tiff, new MediaTypeInfo("tiff", ImageFormat.Tiff)},
+            {MimeTypeInfo.Bmp, new MediaTypeInfo("bmp", ImageFormat.Bmp)}
         };
 
         private static ImageCodecInfo JpegCodecInfo = ImageCodecInfo.GetImageEncoders().FirstOrDefault(codec => codec.FormatID == ImageFormat.Jpeg.Guid);
@@ -43,12 +54,12 @@ public static class ImageResizer
         /// <param name="httpServerUtility">An instance of <see cref="System.Web.HttpServerUtility" />.</param>
         /// <param name="file">The media file.</param>
         /// <param name="resizingOptions">The resizing options.</param>
-        /// <param name="targetImageFormat">The target image format.</param>
+        /// <param name="targetMediaType">The media type for the resized image.</param>
         /// <returns>A full file path to a resized image; null if there's no need to resize the image</returns>
-        public static string GetResizedImage(HttpServerUtility httpServerUtility, IMediaFile file, ResizingOptions resizingOptions, ImageFormat targetImageFormat)
+        public static string GetResizedImage(HttpServerUtility httpServerUtility, IMediaFile file, ResizingOptions resizingOptions, string targetMediaType)
         {
             Verify.ArgumentNotNull(file, "file");
-            Verify.That(ImageFormatIsSupported(targetImageFormat), "Unsupported image format '{0}'", targetImageFormat);
+            Verify.That(TargetMediaTypeSupported(targetMediaType), "Unsupported media type '{0}'", targetMediaType);
 
             if (_resizedImagesDirectoryPath == null)
             {
@@ -62,7 +73,7 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
 
             string imageKey = file.CompositePath;
 
-            string imageSizeCacheKey = "ShowMedia.ashx image size " + imageKey;
+            string imageSizeCacheKey = nameof(ImageResizer) + imageKey;
             Size? imageSize = HttpRuntime.Cache.Get(imageSizeCacheKey) as Size?;
 
             Bitmap bitmap = null;
@@ -109,7 +120,9 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
 
                 string centerCroppedString = centerCrop ? "c" : string.Empty;
 
-                string fileExtension = _ImageFormat2Extension[targetImageFormat];
+                var mediaTypeInfo = MediaTypeInfoMap[targetMediaType];
+
+                string fileExtension = mediaTypeInfo.Extension;
                 string resizedImageFileName = $"{newWidth}x{newHeight}_{filePathHash}{centerCroppedString}_{resizingOptions.Quality}.{fileExtension}";
 
                 string imageFullPath = Path.Combine(_resizedImagesDirectoryPath, resizedImageFileName);
@@ -122,7 +135,7 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
                         bitmap = new Bitmap(fileStream);
                     }
 
-                    ResizeImage(bitmap, imageFullPath, newWidth, newHeight, centerCrop, targetImageFormat, resizingOptions.Quality);
+                    ResizeImage(bitmap, imageFullPath, newWidth, newHeight, centerCrop, mediaTypeInfo.ImageFormat, resizingOptions.Quality);
 
                     if (file.LastWriteTime.HasValue)
                     {
@@ -355,26 +368,26 @@ private static void DrawWithoutBlending(Graphics graphic, Bitmap bitmap, float x
                 (int)Math.Ceiling(height - delta));
         }
 
-
-
-        private static bool ImageFormatIsSupported(ImageFormat imageFormat)
+        /// <summary>
+        /// Returns a value indicating whether an image of a given media type can be resized.
+        /// </summary>
+        /// <param name="mediaType">A media type.</param>
+        public static bool SourceMediaTypeSupported(string mediaType)
         {
-            return _ImageFormat2Extension.ContainsKey(imageFormat);
+            if (mediaType == null) throw new ArgumentNullException(nameof(mediaType));
+
+            return MediaTypeInfoMap.ContainsKey(mediaType);
         }
 
-        /// <exclude />
-        public class SupportedImageFormats
+        /// <summary>
+        /// Returns a value indicating whether resized imaged can be saved in the specified media type.
+        /// </summary>
+        /// <param name="mediaType">A media type.</param>
+        public static bool TargetMediaTypeSupported(string mediaType)
         {
-            /// <exclude />
-            public static ImageFormat JPG => ImageFormat.Jpeg;
-            /// <exclude />
-            public static ImageFormat PNG => ImageFormat.Png;
-            /// <exclude />
-            public static ImageFormat TIFF => ImageFormat.Tiff;
-            /// <exclude />
-            public static ImageFormat GIF => ImageFormat.Gif;
-            /// <exclude />
-            public static ImageFormat BMP => ImageFormat.Bmp;
+            if (mediaType == null) throw new ArgumentNullException(nameof(mediaType));
+
+            return MediaTypeInfoMap.ContainsKey(mediaType);
         }
     }
 }
diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 8014a415b7..8be5581ef6 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Drawing.Imaging;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -181,8 +180,6 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             return;
         }
 
-        context.Response.ContentType = GetMimeType(file);
-
         string encodedFileName = file.FileName.Replace("\"", "_");
         if (context.Request.Browser != null && context.Request.Browser.IsBrowser("ie"))
         {
@@ -220,16 +217,20 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         {
             FileOrStream source;
 
-            if (file.MimeType == "image/jpeg" || file.MimeType == "image/gif" || file.MimeType == "image/png"
-                || file.MimeType == "image/bmp" || file.MimeType == "image/tiff")
+            string mimeType = GetMimeType(file);
+            string outputMimeType;
+            if (ImageResizer.SourceMediaTypeSupported(mimeType))
             {
-                source = ProcessImageResizing(context, file);
+                source = ProcessImageResizing(context, file, mimeType, out outputMimeType);
             }
             else
             {
                 source = new FileOrStream(file);
+                outputMimeType = mimeType;
             }
 
+            context.Response.ContentType = outputMimeType;
+
             long? length = null;
             bool canSeek;
 
@@ -428,7 +429,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
                 if (beginOffset == null)
                 {
-                    Verify.That(endOffset <= streamLength, "The segment is bigger than the lenght of the file");
+                    Verify.That(endOffset <= streamLength, "The segment is bigger than the length of the file");
 
                     result.Add(new Range(streamLength - endOffset.Value, endOffset.Value));
                     continue;
@@ -519,57 +520,43 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
 
 
-    public bool IsReusable
+    public bool IsReusable { get { return true; } }
+
+    private static string GetResizedImageMimeType(string mimeType)
     {
-        get
+        if (mimeType == MimeTypeInfo.Jpeg
+            || mimeType == MimeTypeInfo.Png
+            || mimeType == MimeTypeInfo.Tiff
+            || mimeType == MimeTypeInfo.Bmp)
         {
-            return false;
+            return mimeType;
         }
+
+        if (mimeType == MimeTypeInfo.Gif)
+        {
+            // Returning image in PNG format because build-in GIF encoder produces images of a bad quality
+            return MimeTypeInfo.Png;
+        }
+
+        // Converting resized images to jpeg by default
+        return MimeTypeInfo.Jpeg;
     }
 
-    private static FileOrStream ProcessImageResizing(HttpContext context, IMediaFile file)
+    private static FileOrStream ProcessImageResizing(HttpContext context, IMediaFile file, string mimeType, out string resultMimeType)
     {
         var resizingOptions = ResizingOptions.Parse(context.Request.QueryString);
 
         if (resizingOptions == null || resizingOptions.IsEmpty)
         {
+            resultMimeType = mimeType;
             return new FileOrStream(file);
         }
 
-        //Determine the content type, and save
-        //what image type we have for later use
-
-        ImageFormat imgType;
-        if (file.MimeType == "image/jpeg")
-        {
-            imgType = ImageResizer.SupportedImageFormats.JPG;
-        }
-        else if (file.MimeType == "image/gif")
-        {
-            // Returning image in PNG format because build-in GIF encoder produces images of a bad quality
-            imgType = ImageResizer.SupportedImageFormats.PNG;
-        }
-        else if (file.MimeType == "image/png")
-        {
-            imgType = ImageResizer.SupportedImageFormats.PNG;
-        }
-        else if (file.MimeType == "image/tiff")
-        {
-            imgType = ImageResizer.SupportedImageFormats.TIFF;
-        }
-        else if (file.MimeType == "image/bmp")
-        {
-            imgType = ImageResizer.SupportedImageFormats.BMP;
-        }
-        else
-        {
-            // Converting resized images to jpeg by default
-            imgType = ImageFormat.Jpeg;
-        }
+        resultMimeType = GetResizedImageMimeType(mimeType);
 
         try
         {
-            string resizedImageFilePath = ImageResizer.GetResizedImage(context.Server, file, resizingOptions, imgType);
+            string resizedImageFilePath = ImageResizer.GetResizedImage(context.Server, file, resizingOptions, resultMimeType);
 
             return resizedImageFilePath != null
                 ? new FileOrStream(resizedImageFilePath)

From e56c77b2bde7a8f6621412b283539af40de42c89 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Thu, 16 Sep 2021 17:14:18 +0200
Subject: [PATCH 12/36] Adding an ability to specify a desired media type for a
 resized image through URL parameters

---
 .../Core/WebClient/Media/ResizingOptions.cs   | 24 +++++-
 Website/Renderers/ShowMedia.ashx              | 85 ++++++++++---------
 2 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/Composite/Core/WebClient/Media/ResizingOptions.cs b/Composite/Core/WebClient/Media/ResizingOptions.cs
index 6234ec176b..92fadcb288 100644
--- a/Composite/Core/WebClient/Media/ResizingOptions.cs
+++ b/Composite/Core/WebClient/Media/ResizingOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
@@ -23,7 +23,7 @@ public class ResizingOptions
         private int? _qualityOverride;
 
         /// <summary>
-        /// Image heigth
+        /// Image height
         /// </summary>
         public int? Height { get; set; }
 
@@ -75,6 +75,12 @@ public int Quality
         /// </summary>
         public ResizingAction ResizingAction { get; set; }
 
+        /// <summary>
+        /// The preferred media type for the generated resized image.
+        /// If the media type isn't supported, the original image will be returned.
+        /// </summary>
+        public string MediaType { get; set; }
+
         /// <summary>
         /// Indicates whether any options were specified
         /// </summary>
@@ -126,6 +132,8 @@ internal ResizingOptions(string predefinedOptionsName)
                 {
                     ResizingAction = (ResizingAction)Enum.Parse(typeof(ResizingAction), attr.Value, true);
                 }
+
+                MediaType = (string) e.Attribute("mediaType");
             }
         }
 
@@ -185,6 +193,12 @@ private static ResizingOptions FromQueryString(NameValueCollection queryString)
                 result.ResizingAction = ResizingAction.Stretch;
             }
 
+            var mediaType = queryString["mt"];
+            if (!string.IsNullOrEmpty(mediaType))
+            {
+                result.MediaType = mediaType;
+            }
+
             return result;
         }
         private static XElement GetPredefinedResizingOptions()
@@ -253,6 +267,12 @@ public override string ToString()
                 sb.Append("action=").Append(ResizingAction.ToString().ToLowerInvariant());
             }
 
+            if (!string.IsNullOrWhiteSpace(MediaType))
+            {
+                sb.Append(sb.Length == 0 ? String.Empty : "&");
+                sb.Append("mt=").Append(MediaType);
+            }
+
             return sb.ToString();
         }
     }
diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 8be5581ef6..aac9daa9ed 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -26,6 +26,15 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
     private const int CopyBufferSize = 8192;
     private static readonly string MediaUrl_PublicPrefix = UrlUtils.PublicRootPath + "/media/";
 
+    private static readonly string[] MediaTypesBrowserCanView = new[]
+    {
+        MimeTypeInfo.Flash,
+        MimeTypeInfo.Jpeg,
+        MimeTypeInfo.Png,
+        MimeTypeInfo.Gif,
+        MimeTypeInfo.Bmp
+    };
+
     private class Range
     {
         public Range(long offset, long length)
@@ -188,7 +197,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         }
 
         bool download = (string.IsNullOrEmpty(context.Request["download"]) ?
-            IsWebFormatImage(file) == false :
+            !CabBePreviewedInBrowser(file.MimeType) :
             context.Request["download"] != "false");
 
         context.Response.AddHeader("Content-Disposition", "{0};filename=\"{1}\"".FormatWith((download ? "attachment" : "inline"), encodedFileName));
@@ -217,19 +226,20 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         {
             FileOrStream source;
 
-            string mimeType = GetMimeType(file);
-            string outputMimeType;
-            if (ImageResizer.SourceMediaTypeSupported(mimeType))
+            string mediaType = GetMediaType(file);
+            string outputMediaType;
+
+            if (ImageResizer.SourceMediaTypeSupported(mediaType))
             {
-                source = ProcessImageResizing(context, file, mimeType, out outputMimeType);
+                source = ProcessImageResizing(context, file, mediaType, out outputMediaType);
             }
             else
             {
                 source = new FileOrStream(file);
-                outputMimeType = mimeType;
+                outputMediaType = mediaType;
             }
 
-            context.Response.ContentType = outputMimeType;
+            context.Response.ContentType = outputMediaType;
 
             long? length = null;
             bool canSeek;
@@ -491,72 +501,69 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         return null;
     }
 
-    private static string GetMimeType(IMediaFile file)
+    private static string GetMediaType(IMediaFile file)
     {
-        string mimeType = file.MimeType;
+        string mediaType = file.MimeType;
 
-        if (mimeType == MimeTypeInfo.Default)
+        if (mediaType == MimeTypeInfo.Default)
         {
-            mimeType = MimeTypeInfo.GetCanonicalFromExtension(Path.GetExtension(file.FileName.ToLowerInvariant()));
+            mediaType = MimeTypeInfo.GetCanonicalFromExtension(Path.GetExtension(file.FileName.ToLowerInvariant()));
         }
 
-        return mimeType;
+        return mediaType;
     }
 
 
-    private static bool IsWebFormatImage(IMediaFile file)
+    private static bool CabBePreviewedInBrowser(string mediaType)
     {
-        switch (file.MimeType)
-        {
-            case "application/x-shockwave-flash":
-            case "image/png":
-            case "image/gif":
-            case "image/jpeg":
-                return true;
-            default:
-                return false;
-        }
+        return MediaTypesBrowserCanView.Contains(mediaType);
     }
 
 
-
     public bool IsReusable { get { return true; } }
 
-    private static string GetResizedImageMimeType(string mimeType)
+    private static string GetResizedImageMediaType(string mediaType)
     {
-        if (mimeType == MimeTypeInfo.Jpeg
-            || mimeType == MimeTypeInfo.Png
-            || mimeType == MimeTypeInfo.Tiff
-            || mimeType == MimeTypeInfo.Bmp)
+        if (mediaType == MimeTypeInfo.Gif)
         {
-            return mimeType;
+            // Returning image in PNG format because build-in GIF encoder produces images of a bad quality
+            return MimeTypeInfo.Png;
         }
 
-        if (mimeType == MimeTypeInfo.Gif)
+        if (mediaType == MimeTypeInfo.Bmp)
         {
-            // Returning image in PNG format because build-in GIF encoder produces images of a bad quality
-            return MimeTypeInfo.Png;
+            return MimeTypeInfo.Jpeg;
+        }
+
+        if (ImageResizer.TargetMediaTypeSupported(mediaType))
+        {
+            return mediaType;
         }
 
         // Converting resized images to jpeg by default
         return MimeTypeInfo.Jpeg;
     }
 
-    private static FileOrStream ProcessImageResizing(HttpContext context, IMediaFile file, string mimeType, out string resultMimeType)
+    private static FileOrStream ProcessImageResizing(HttpContext context, IMediaFile file, string mediaType, out string resizedImageMediaType)
     {
         var resizingOptions = ResizingOptions.Parse(context.Request.QueryString);
 
-        if (resizingOptions == null || resizingOptions.IsEmpty)
+        var preferredMediaType = resizingOptions.MediaType;
+
+        if (resizingOptions == null || resizingOptions.IsEmpty
+            || (preferredMediaType != null && !ImageResizer.TargetMediaTypeSupported(preferredMediaType)))
         {
-            resultMimeType = mimeType;
+            resizedImageMediaType = mediaType;
             return new FileOrStream(file);
         }
 
-        resultMimeType = GetResizedImageMimeType(mimeType);
+        var targetImageMediaType = GetResizedImageMediaType(preferredMediaType ?? mediaType);
 
         try
         {
-            string resizedImageFilePath = ImageResizer.GetResizedImage(context.Server, file, resizingOptions, resultMimeType);
+            string resizedImageFilePath = ImageResizer.GetResizedImage(context.Server, file, resizingOptions, targetImageMediaType);
+
+            resizedImageMediaType = resizedImageFilePath != null ? targetImageMediaType : mediaType;
 
             return resizedImageFilePath != null
                 ? new FileOrStream(resizedImageFilePath)
@@ -566,6 +573,8 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         {
             Log.LogVerbose("Composite.Media.ImageResize", ex.Message);
         }
+
+        resizedImageMediaType = mediaType;
         return new FileOrStream(file);
     }
 

From e57d6779e477bb01f0ddc6a985940190076a3d6c Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Thu, 16 Sep 2021 17:34:21 +0200
Subject: [PATCH 13/36] ShowMedia.ashx - changing file extension in
 "Content-Disposition" header if media type changes

---
 Website/Renderers/ShowMedia.ashx | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index aac9daa9ed..003796b478 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -182,13 +182,8 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         return false;
     }
 
-    private static void ValidateAndSend(HttpContext context, IMediaFile file)
+    private static void AddContentDispositionHeader(HttpContext context, IMediaFile file, string sourceMediaType, string resultMediaType)
     {
-        if (ExecuteResponseHandlers(context, file))
-        {
-            return;
-        }
-
         string encodedFileName = file.FileName.Replace("\"", "_");
         if (context.Request.Browser != null && context.Request.Browser.IsBrowser("ie"))
         {
@@ -196,12 +191,32 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             encodedFileName = HttpUtility.UrlEncode(encodedFileName).Replace("+", "%20");
         }
 
+        if (sourceMediaType != resultMediaType)
+        {
+            var originalExtension = MimeTypeInfo.GetExtensionFromMimeType(sourceMediaType);
+            var resultExtension = MimeTypeInfo.GetExtensionFromMimeType(resultMediaType);
+
+            if(!string.IsNullOrEmpty(originalExtension) && !string.IsNullOrEmpty(resultExtension) && originalExtension != resultExtension
+                && encodedFileName.EndsWith("." + originalExtension))
+            {
+                encodedFileName = encodedFileName.Substring(0, encodedFileName.Length - originalExtension.Length)
+                                  + resultExtension;
+            }
+        }
+
         bool download = (string.IsNullOrEmpty(context.Request["download"]) ?
             !CabBePreviewedInBrowser(file.MimeType) :
             context.Request["download"] != "false");
 
         context.Response.AddHeader("Content-Disposition", "{0};filename=\"{1}\"".FormatWith((download ? "attachment" : "inline"), encodedFileName));
+    }
 
+    private static void ValidateAndSend(HttpContext context, IMediaFile file)
+    {
+        if (ExecuteResponseHandlers(context, file))
+        {
+            return;
+        }
 
         bool checkIfModifiedSince = false;
 
@@ -241,6 +256,8 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
             context.Response.ContentType = outputMediaType;
 
+            AddContentDispositionHeader(context, file, mediaType, outputMediaType);
+
             long? length = null;
             bool canSeek;
 

From 285c7e45889328373ff7f93b65b40a2936358033 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Thu, 16 Sep 2021 17:47:32 +0200
Subject: [PATCH 14/36] ShowMedia.ashx - returning "Content-Disposition:
 inline" for browser supported media files

---
 Website/Renderers/ShowMedia.ashx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 003796b478..72b1ee6baa 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -205,7 +205,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         }
 
         bool download = (string.IsNullOrEmpty(context.Request["download"]) ?
-            !CabBePreviewedInBrowser(file.MimeType) :
+            !CabBePreviewedInBrowser(context, file.MimeType) :
             context.Request["download"] != "false");
 
         context.Response.AddHeader("Content-Disposition", "{0};filename=\"{1}\"".FormatWith((download ? "attachment" : "inline"), encodedFileName));
@@ -531,9 +531,9 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
     }
 
 
-    private static bool CabBePreviewedInBrowser(string mediaType)
+    private static bool CabBePreviewedInBrowser(HttpContext context, string mediaType)
     {
-        return MediaTypesBrowserCanView.Contains(mediaType);
+        return MediaTypesBrowserCanView.Contains(mediaType) || context.Request.AcceptTypes.Contains(mediaType);
     }
 
 

From 3fbde3689ef26b695e44a989203a9d372984e88e Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Fri, 17 Sep 2021 17:12:00 +0200
Subject: [PATCH 15/36] Introducing IImageFileFormatProvider interface, that
 allows adding new image formats for image resizing

---
 Composite/Composite.csproj                    |   2 +
 .../Media/DefaultImageFileFormatProvider.cs   |  61 +++++++++
 .../Media/IImageFileFormatProvider.cs         |  41 ++++++
 .../Core/WebClient/Media/ImageResizer.cs      | 122 ++++++++++--------
 Website/Renderers/ShowMedia.ashx              |   4 +-
 5 files changed, 176 insertions(+), 54 deletions(-)
 create mode 100644 Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
 create mode 100644 Composite/Core/WebClient/Media/IImageFileFormatProvider.cs

diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index e87364eb79..eb687eb91c 100644
--- a/Composite/Composite.csproj
+++ b/Composite/Composite.csproj
@@ -258,6 +258,8 @@
     <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\PageStructureRpc.cs" />
     <Compile Include="Core\WebClient\Renderings\Page\PagePreviewContext.cs" />
     <Compile Include="Core\WebClient\Renderings\Page\IPageContentFilter.cs" />
diff --git a/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs b/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
new file mode 100644
index 0000000000..e96263dad2
--- /dev/null
+++ b/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
@@ -0,0 +1,61 @@
+using Composite.Core.IO;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+
+namespace Composite.Core.WebClient.Media
+{
+    internal class DefaultImageFileFormatProvider: IImageFileFormatProvider
+    {
+        private static readonly ImageCodecInfo JpegCodecInfo = ImageCodecInfo.GetImageEncoders().First(codec => codec.FormatID == ImageFormat.Jpeg.Guid);
+
+        private readonly Action<Bitmap, string, int?> _saveAction;
+
+        public DefaultImageFileFormatProvider(string mediaType, string extension, Action<Bitmap, string, int?> saveAction)
+        {
+            MediaType = mediaType;
+            FileExtension = extension;
+            _saveAction = saveAction;
+        }
+
+        public string MediaType { get; }
+
+        public string FileExtension { get; }
+
+        public bool CanSetCompressionQuality { get; private set; }
+
+        public Bitmap LoadImageFromStream(Stream stream) => new Bitmap(stream);
+
+        public void SaveImageToFile(Bitmap image, string outputFilePath, int? qualityPercentage = null)
+        {
+            _saveAction(image, outputFilePath, qualityPercentage);
+        }
+
+        private static Action<Bitmap, string, int?> GetSaveInFormatFunction(ImageFormat imageFormat) =>
+            (resizedImage, outputFilePath, quality) => resizedImage.Save(outputFilePath, imageFormat);
+
+        public static IEnumerable<IImageFileFormatProvider> GetDefaultProviders()
+        {
+            return new List<DefaultImageFileFormatProvider>
+            {
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Jpeg, "jpeg", (resizedImage, outputFilePath, quality) =>
+                {
+                    var parameters = new EncoderParameters(1);
+                    parameters.Param[0] = new EncoderParameter(Encoder.Quality, quality ?? 75);
+
+                    resizedImage.Save(outputFilePath, JpegCodecInfo, parameters);
+                })
+                {
+                    CanSetCompressionQuality = true
+                },
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Png, "png", GetSaveInFormatFunction(ImageFormat.Png)),
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Gif, "gif", GetSaveInFormatFunction(ImageFormat.Gif)),
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Tiff, "tiff", GetSaveInFormatFunction(ImageFormat.Tiff)),
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Bmp, "bmp", GetSaveInFormatFunction(ImageFormat.Bmp))
+            };
+        }
+    }
+}
diff --git a/Composite/Core/WebClient/Media/IImageFileFormatProvider.cs b/Composite/Core/WebClient/Media/IImageFileFormatProvider.cs
new file mode 100644
index 0000000000..1277ff5d71
--- /dev/null
+++ b/Composite/Core/WebClient/Media/IImageFileFormatProvider.cs
@@ -0,0 +1,41 @@
+using System.Drawing;
+using System.IO;
+
+namespace Composite.Core.WebClient.Media
+{
+    /// <summary>
+    /// A provider that enables reading/saving images for a specific image format.
+    /// </summary>
+    public interface IImageFileFormatProvider
+    {
+        /// <summary>
+        /// A media type (aka MIME type) that describes the image format (f.e. "image/jpeg").
+        /// </summary>
+        string MediaType { get; }
+
+        /// <summary>
+        /// A file extension that is associated with the image format.
+        /// </summary>
+        string FileExtension { get; }
+
+        /// <summary>
+        /// Indicates whether the provider allows specifying quality percentage when saving an image.
+        /// </summary>
+        bool CanSetCompressionQuality { get; }
+
+        /// <summary>
+        /// Loads a <see cref="Bitmap"/> out of stream .
+        /// </summary>
+        /// <param name="stream">The input stream.</param>
+        /// <returns></returns>
+        Bitmap LoadImageFromStream(Stream stream);
+
+        /// <summary>
+        /// Saves an image to a file with a given quality.
+        /// </summary>
+        /// <param name="image">The image to be saved.</param>
+        /// <param name="outputFilePath">The full path to a file.</param>
+        /// <param name="qualityPercentage">The desired quality of the image - from 1 to 100.</param>
+        void SaveImageToFile(Bitmap image, string outputFilePath, int? qualityPercentage = null);
+    }
+}
diff --git a/Composite/Core/WebClient/Media/ImageResizer.cs b/Composite/Core/WebClient/Media/ImageResizer.cs
index 0cc22d0fb3..55e22694e4 100644
--- a/Composite/Core/WebClient/Media/ImageResizer.cs
+++ b/Composite/Core/WebClient/Media/ImageResizer.cs
@@ -7,6 +7,8 @@
 using System.Linq;
 using System.Web;
 using System.Web.Caching;
+using System.Web.Hosting;
+using System.Web.Management;
 using Composite.Core.IO;
 using Composite.Data.Plugins.DataProvider.Streams;
 using Composite.Data.Types;
@@ -21,61 +23,82 @@ namespace Composite.Core.WebClient.Media
     public static class ImageResizer
     {
         private const string ResizedImagesCacheDirectory = "~/App_Data/Composite/Cache/Resized images";
-        private class MediaTypeInfo
+
+        private static Dictionary<string, IImageFileFormatProvider> _imageFormatProviders;
+
+        private static Dictionary<string, IImageFileFormatProvider> ImageFormatProviders
         {
-            public MediaTypeInfo(string extension, ImageFormat imageFormat)
+            get
             {
-                Extension = extension;
-                ImageFormat = imageFormat;
-            }
-            public string Extension { get; }
-            public ImageFormat ImageFormat { get; }
-        }
+                if (_imageFormatProviders == null)
+                {
+                    var defaultProviders = DefaultImageFileFormatProvider.GetDefaultProviders().ToList();
+                    var customProviders = ServiceLocator.GetServices<IImageFileFormatProvider>().ToList();
 
-        private static Dictionary<string, MediaTypeInfo> MediaTypeInfoMap = new Dictionary<string, MediaTypeInfo>
-        {
-            {MimeTypeInfo.Jpeg, new MediaTypeInfo("jpg", ImageFormat.Jpeg)},
-            {MimeTypeInfo.Png, new MediaTypeInfo("png", ImageFormat.Png)},
-            {MimeTypeInfo.Gif, new MediaTypeInfo("gif", ImageFormat.Gif)},
-            {MimeTypeInfo.Tiff, new MediaTypeInfo("tiff", ImageFormat.Tiff)},
-            {MimeTypeInfo.Bmp, new MediaTypeInfo("bmp", ImageFormat.Bmp)}
-        };
+                    var result = defaultProviders.ToDictionary(_ => _.MediaType);
+                    foreach (var provider in customProviders)
+                    {
+                        result[provider.MediaType] = provider;
+                    }
 
-        private static ImageCodecInfo JpegCodecInfo = ImageCodecInfo.GetImageEncoders().FirstOrDefault(codec => codec.FormatID == ImageFormat.Jpeg.Guid);
+                    _imageFormatProviders = result;
+                }
+
+                return _imageFormatProviders;
+            }
+        }
 
         private static readonly TimeSpan CacheExpirationTimeSpan = new TimeSpan(1, 0, 0, 0);
 
         private static string _resizedImagesDirectoryPath;
 
+        private static string ResizedImagesDirectoryPath
+        {
+            get
+            {
+                if (_resizedImagesDirectoryPath == null)
+                {
+                    _resizedImagesDirectoryPath = HostingEnvironment.MapPath(ResizedImagesCacheDirectory);
+
+                    if (!C1Directory.Exists(_resizedImagesDirectoryPath))
+                    {
+                        C1Directory.CreateDirectory(_resizedImagesDirectoryPath);
+                    }
+                }
+
+                return _resizedImagesDirectoryPath;
+            }
+        }
 
         /// <summary>
         /// Gets the resized image.
         /// </summary>
-        /// <param name="httpServerUtility">An instance of <see cref="System.Web.HttpServerUtility" />.</param>
         /// <param name="file">The media file.</param>
         /// <param name="resizingOptions">The resizing options.</param>
+        /// <param name="sourceMediaType">The media type of the image.</param>
         /// <param name="targetMediaType">The media type for the resized image.</param>
         /// <returns>A full file path to a resized image; null if there's no need to resize the image</returns>
-        public static string GetResizedImage(HttpServerUtility httpServerUtility, IMediaFile file, ResizingOptions resizingOptions, string targetMediaType)
+        public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOptions,
+                                             string sourceMediaType, string targetMediaType)
         {
-            Verify.ArgumentNotNull(file, "file");
-            Verify.That(TargetMediaTypeSupported(targetMediaType), "Unsupported media type '{0}'", targetMediaType);
+            Verify.ArgumentNotNull(file, nameof(file));
+            Verify.ArgumentNotNullOrEmpty(sourceMediaType, nameof(sourceMediaType));
+            Verify.ArgumentNotNullOrEmpty(targetMediaType, nameof(targetMediaType));
 
-            if (_resizedImagesDirectoryPath == null)
-            {
-                _resizedImagesDirectoryPath = httpServerUtility.MapPath(ResizedImagesCacheDirectory);
+            if (!ImageFormatProviders.TryGetValue(sourceMediaType, out var sourceImageFormatProvider))
+                throw new ArgumentException($"Unsupported media type '{sourceMediaType}'", nameof(sourceMediaType));
+
+            if (!ImageFormatProviders.TryGetValue(targetMediaType, out var imageFileFormatProvider))
+                throw new ArgumentException($"Unsupported media type '{targetMediaType}'", nameof(targetMediaType));
 
-                if (!C1Directory.Exists(_resizedImagesDirectoryPath))
-                {
-                    C1Directory.CreateDirectory(_resizedImagesDirectoryPath);
-                }
-            }
 
             string imageKey = file.CompositePath;
 
             string imageSizeCacheKey = nameof(ImageResizer) + imageKey;
             Size? imageSize = HttpRuntime.Cache.Get(imageSizeCacheKey) as Size?;
 
+            Func<Stream, Bitmap> loadImageFunc = sourceImageFormatProvider.LoadImageFromStream;
+
             Bitmap bitmap = null;
             Stream fileStream = null;
             try
@@ -90,7 +113,7 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
                         fileStream.Dispose();
                         fileStream = file.GetReadStream();
 
-                        bitmap = new Bitmap(fileStream);
+                        bitmap = loadImageFunc(fileStream);
                         calculatedSize = new Size { Width = bitmap.Width, Height = bitmap.Height };
                     }
                     imageSize = calculatedSize;
@@ -105,9 +128,8 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
                     HttpRuntime.Cache.Add(imageSizeCacheKey, imageSize, cacheDependency, DateTime.MaxValue, CacheExpirationTimeSpan, CacheItemPriority.Normal, null);
                 }
 
-                int newWidth, newHeight;
-                bool centerCrop;
-                bool needToResize = CalculateSize(imageSize.Value.Width, imageSize.Value.Height, resizingOptions, out newWidth, out newHeight, out centerCrop);
+                bool needToResize = CalculateSize(imageSize.Value.Width, imageSize.Value.Height, resizingOptions,
+                                                  out int newWidth, out int newHeight, out bool centerCrop);
 
                 needToResize = needToResize || resizingOptions.CustomQuality;
 
@@ -120,22 +142,24 @@ public static string GetResizedImage(HttpServerUtility httpServerUtility, IMedia
 
                 string centerCroppedString = centerCrop ? "c" : string.Empty;
 
-                var mediaTypeInfo = MediaTypeInfoMap[targetMediaType];
+                string fileExtension = imageFileFormatProvider.FileExtension;
+                string qualityCacheKeyPart = imageFileFormatProvider.CanSetCompressionQuality
+                    ? $"_{resizingOptions.Quality}"
+                    : "";
 
-                string fileExtension = mediaTypeInfo.Extension;
-                string resizedImageFileName = $"{newWidth}x{newHeight}_{filePathHash}{centerCroppedString}_{resizingOptions.Quality}.{fileExtension}";
+                string resizedImageFileName = $"{newWidth}x{newHeight}_{filePathHash}{centerCroppedString}{qualityCacheKeyPart}.{fileExtension}";
 
-                string imageFullPath = Path.Combine(_resizedImagesDirectoryPath, resizedImageFileName);
+                string imageFullPath = Path.Combine(ResizedImagesDirectoryPath, resizedImageFileName);
 
                 if (!C1File.Exists(imageFullPath) || C1File.GetLastWriteTime(imageFullPath) != file.LastWriteTime)
                 {
                     if (bitmap == null)
                     {
                         fileStream = file.GetReadStream();
-                        bitmap = new Bitmap(fileStream);
+                        bitmap = loadImageFunc(fileStream);
                     }
 
-                    ResizeImage(bitmap, imageFullPath, newWidth, newHeight, centerCrop, mediaTypeInfo.ImageFormat, resizingOptions.Quality);
+                    ResizeImage(bitmap, imageFullPath, imageFileFormatProvider, newWidth, newHeight, centerCrop, resizingOptions.Quality);
 
                     if (file.LastWriteTime.HasValue)
                     {
@@ -263,24 +287,18 @@ private static bool CalculateSize(int width, int height, ResizingOptions resizin
             return newWidth != width || newHeight != height;
         }
 
-
-        private static void ResizeImage(Bitmap image, string outputFilePath, int newWidth, int newHeight, bool centerCrop, ImageFormat imageFormat, int quality)
+        private static void ResizeImage(Bitmap image, string outputFilePath, IImageFileFormatProvider imageFormatProvider,
+                                        int newWidth, int newHeight, bool centerCrop, int quality)
         {
             using (Bitmap resizedImage = ResizeImage(image, newWidth, newHeight, centerCrop))
             {
-                if (imageFormat.Guid == ImageFormat.Jpeg.Guid)
+                if (imageFormatProvider.CanSetCompressionQuality)
                 {
-                    var parameters = new EncoderParameters(1);
-
-                    // Setting image quality, the default value is 75
-                    parameters.Param[0] = new EncoderParameter(
-                        System.Drawing.Imaging.Encoder.Quality, quality);
-
-                    resizedImage.Save(outputFilePath, JpegCodecInfo, parameters);
+                    imageFormatProvider.SaveImageToFile(resizedImage, outputFilePath, quality);
                 }
                 else
                 {
-                    resizedImage.Save(outputFilePath, imageFormat);
+                    imageFormatProvider.SaveImageToFile(resizedImage, outputFilePath);
                 }
             }
         }
@@ -376,7 +394,7 @@ public static bool SourceMediaTypeSupported(string mediaType)
         {
             if (mediaType == null) throw new ArgumentNullException(nameof(mediaType));
 
-            return MediaTypeInfoMap.ContainsKey(mediaType);
+            return ImageFormatProviders.ContainsKey(mediaType);
         }
 
         /// <summary>
@@ -387,7 +405,7 @@ public static bool TargetMediaTypeSupported(string mediaType)
         {
             if (mediaType == null) throw new ArgumentNullException(nameof(mediaType));
 
-            return MediaTypeInfoMap.ContainsKey(mediaType);
+            return ImageFormatProviders.ContainsKey(mediaType);
         }
     }
 }
diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 72b1ee6baa..fd9df88a20 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -567,7 +567,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
         var preferredMediaType = resizingOptions.MediaType;
 
-        if (resizingOptions == null || resizingOptions.IsEmpty
+        if (resizingOptions.IsEmpty
             || (preferredMediaType != null && !ImageResizer.TargetMediaTypeSupported(preferredMediaType)))
         {
             resizedImageMediaType = mediaType;
@@ -578,7 +578,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
         try
         {
-            string resizedImageFilePath = ImageResizer.GetResizedImage(context.Server, file, resizingOptions, targetImageMediaType);
+            string resizedImageFilePath = ImageResizer.GetResizedImage(file, resizingOptions, mediaType, targetImageMediaType);
 
             resizedImageMediaType = resizedImageFilePath != null ? targetImageMediaType : mediaType;
 

From fa3d1f9c21822fa89d3793897af49d38d18f5124 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 20 Sep 2021 15:26:14 +0200
Subject: [PATCH 16/36] ImageResizer - refactoring

---
 Composite/Composite.csproj                    |  1 +
 .../Media/DefaultImageFileFormatProvider.cs   | 40 +++--------
 .../Media/IImageFileFormatProvider.cs         | 15 +++-
 .../WebClient/Media/ImageFormatProviders.cs   | 39 ++++++++++
 .../Core/WebClient/Media/ImageResizer.cs      | 72 ++++++++-----------
 5 files changed, 94 insertions(+), 73 deletions(-)
 create mode 100644 Composite/Core/WebClient/Media/ImageFormatProviders.cs

diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index eb687eb91c..c6a12cfee9 100644
--- a/Composite/Composite.csproj
+++ b/Composite/Composite.csproj
@@ -260,6 +260,7 @@
     <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" />
diff --git a/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs b/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
index e96263dad2..6d43650f29 100644
--- a/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
+++ b/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
@@ -1,61 +1,39 @@
-using Composite.Core.IO;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Linq;
 
 namespace Composite.Core.WebClient.Media
 {
     internal class DefaultImageFileFormatProvider: IImageFileFormatProvider
     {
-        private static readonly ImageCodecInfo JpegCodecInfo = ImageCodecInfo.GetImageEncoders().First(codec => codec.FormatID == ImageFormat.Jpeg.Guid);
-
         private readonly Action<Bitmap, string, int?> _saveAction;
 
-        public DefaultImageFileFormatProvider(string mediaType, string extension, Action<Bitmap, string, int?> saveAction)
+        public DefaultImageFileFormatProvider(string mediaType, string extension, Action<Bitmap, string, int?> saveAction, bool canSetImageQuality = false)
         {
             MediaType = mediaType;
             FileExtension = extension;
             _saveAction = saveAction;
+            CanSetImageQuality = canSetImageQuality;
         }
 
         public string MediaType { get; }
 
         public string FileExtension { get; }
 
-        public bool CanSetCompressionQuality { get; private set; }
+        public bool CanSetImageQuality { get; }
 
-        public Bitmap LoadImageFromStream(Stream stream) => new Bitmap(stream);
+        public bool CanReadImageSize => true;
 
-        public void SaveImageToFile(Bitmap image, string outputFilePath, int? qualityPercentage = null)
+        public bool TryGetSize(Stream imageStream, out Size size)
         {
-            _saveAction(image, outputFilePath, qualityPercentage);
+            return ImageSizeReader.TryGetSize(imageStream, out size);
         }
 
-        private static Action<Bitmap, string, int?> GetSaveInFormatFunction(ImageFormat imageFormat) =>
-            (resizedImage, outputFilePath, quality) => resizedImage.Save(outputFilePath, imageFormat);
+        public Bitmap LoadImageFromStream(Stream stream) => new Bitmap(stream);
 
-        public static IEnumerable<IImageFileFormatProvider> GetDefaultProviders()
+        public void SaveImageToFile(Bitmap image, string outputFilePath, int? qualityPercentage = null)
         {
-            return new List<DefaultImageFileFormatProvider>
-            {
-                new DefaultImageFileFormatProvider(MimeTypeInfo.Jpeg, "jpeg", (resizedImage, outputFilePath, quality) =>
-                {
-                    var parameters = new EncoderParameters(1);
-                    parameters.Param[0] = new EncoderParameter(Encoder.Quality, quality ?? 75);
-
-                    resizedImage.Save(outputFilePath, JpegCodecInfo, parameters);
-                })
-                {
-                    CanSetCompressionQuality = true
-                },
-                new DefaultImageFileFormatProvider(MimeTypeInfo.Png, "png", GetSaveInFormatFunction(ImageFormat.Png)),
-                new DefaultImageFileFormatProvider(MimeTypeInfo.Gif, "gif", GetSaveInFormatFunction(ImageFormat.Gif)),
-                new DefaultImageFileFormatProvider(MimeTypeInfo.Tiff, "tiff", GetSaveInFormatFunction(ImageFormat.Tiff)),
-                new DefaultImageFileFormatProvider(MimeTypeInfo.Bmp, "bmp", GetSaveInFormatFunction(ImageFormat.Bmp))
-            };
+            _saveAction(image, outputFilePath, qualityPercentage);
         }
     }
 }
diff --git a/Composite/Core/WebClient/Media/IImageFileFormatProvider.cs b/Composite/Core/WebClient/Media/IImageFileFormatProvider.cs
index 1277ff5d71..f4898b77c0 100644
--- a/Composite/Core/WebClient/Media/IImageFileFormatProvider.cs
+++ b/Composite/Core/WebClient/Media/IImageFileFormatProvider.cs
@@ -21,7 +21,20 @@ public interface IImageFileFormatProvider
         /// <summary>
         /// Indicates whether the provider allows specifying quality percentage when saving an image.
         /// </summary>
-        bool CanSetCompressionQuality { get; }
+        bool CanSetImageQuality { get; }
+
+        /// <summary>
+        /// Indicates whether the provider allows reading image dimensions from the beginning of the stream.
+        /// </summary>
+        bool CanReadImageSize { get; }
+
+        /// <summary>
+        /// Tries to read image's size from the file header.
+        /// </summary>
+        /// <param name="imageStream">The input stream with an image.</param>
+        /// <param name="size">The size of the image</param>
+        /// <returns><value>True</value> if the image size was extracted successfully.</returns>
+        bool TryGetSize(Stream imageStream, out Size size);
 
         /// <summary>
         /// Loads a <see cref="Bitmap"/> out of stream .
diff --git a/Composite/Core/WebClient/Media/ImageFormatProviders.cs b/Composite/Core/WebClient/Media/ImageFormatProviders.cs
new file mode 100644
index 0000000000..16ea3c7f3e
--- /dev/null
+++ b/Composite/Core/WebClient/Media/ImageFormatProviders.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using Composite.Core.IO;
+using Microsoft.Extensions.DependencyInjection;
+
+
+namespace Composite.Core.WebClient.Media
+{
+    internal static class ImageFormatProviders
+    {
+        private static readonly ImageCodecInfo JpegCodecInfo = ImageCodecInfo.GetImageEncoders().First(codec => codec.FormatID == ImageFormat.Jpeg.Guid);
+
+        private static Action<Bitmap, string, int?> GetSaveInFormatFunction(ImageFormat imageFormat) =>
+            (resizedImage, outputFilePath, quality) => resizedImage.Save(outputFilePath, imageFormat);
+
+        internal static void AddDefaultImageFileFormatProviders(this IServiceCollection services)
+        {
+            var providers = new List<DefaultImageFileFormatProvider>
+            {
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Jpeg, "jpeg", (resizedImage, outputFilePath, quality) =>
+                {
+                    var parameters = new EncoderParameters(1);
+                    parameters.Param[0] = new EncoderParameter(Encoder.Quality, quality ?? 75);
+
+                    resizedImage.Save(outputFilePath, JpegCodecInfo, parameters);
+                }, canSetImageQuality: true),
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Png, "png", GetSaveInFormatFunction(ImageFormat.Png)),
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Gif, "gif", GetSaveInFormatFunction(ImageFormat.Gif)),
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Tiff, "tiff", GetSaveInFormatFunction(ImageFormat.Tiff)),
+                new DefaultImageFileFormatProvider(MimeTypeInfo.Bmp, "bmp", GetSaveInFormatFunction(ImageFormat.Bmp))
+            };
+
+            providers.ForEach(p => services.AddSingleton<IImageFileFormatProvider>(p));
+        }
+    }
+}
diff --git a/Composite/Core/WebClient/Media/ImageResizer.cs b/Composite/Core/WebClient/Media/ImageResizer.cs
index 55e22694e4..d9bd1e4bf3 100644
--- a/Composite/Core/WebClient/Media/ImageResizer.cs
+++ b/Composite/Core/WebClient/Media/ImageResizer.cs
@@ -8,7 +8,6 @@
 using System.Web;
 using System.Web.Caching;
 using System.Web.Hosting;
-using System.Web.Management;
 using Composite.Core.IO;
 using Composite.Data.Plugins.DataProvider.Streams;
 using Composite.Data.Types;
@@ -30,21 +29,14 @@ private static Dictionary<string, IImageFileFormatProvider> ImageFormatProviders
         {
             get
             {
-                if (_imageFormatProviders == null)
-                {
-                    var defaultProviders = DefaultImageFileFormatProvider.GetDefaultProviders().ToList();
-                    var customProviders = ServiceLocator.GetServices<IImageFileFormatProvider>().ToList();
+                if (_imageFormatProviders != null) return _imageFormatProviders;
 
-                    var result = defaultProviders.ToDictionary(_ => _.MediaType);
-                    foreach (var provider in customProviders)
-                    {
-                        result[provider.MediaType] = provider;
-                    }
+                var customProviders = ServiceLocator.GetServices<IImageFileFormatProvider>().ToList();
 
-                    _imageFormatProviders = result;
-                }
+                var result = new Dictionary<string, IImageFileFormatProvider>();
+                customProviders.ForEach(provider => result[provider.MediaType] = provider);
 
-                return _imageFormatProviders;
+                return _imageFormatProviders = result;
             }
         }
 
@@ -105,18 +97,26 @@ public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOp
             {
                 if (imageSize == null)
                 {
-                    fileStream = file.GetReadStream();
-
-                    Size calculatedSize;
-                    if (!ImageSizeReader.TryGetSize(fileStream, out calculatedSize))
+                    if (sourceImageFormatProvider.CanReadImageSize)
                     {
-                        fileStream.Dispose();
                         fileStream = file.GetReadStream();
+                        if (sourceImageFormatProvider.TryGetSize(fileStream, out var imageSizeFromProvider))
+                        {
+                            imageSize = imageSizeFromProvider;
+                        }
+
+                        fileStream.Close();
+                        fileStream.Dispose();
+                        fileStream = null;
+                    }
 
+                    if (imageSize == null)
+                    {
+                        fileStream = file.GetReadStream();
                         bitmap = loadImageFunc(fileStream);
-                        calculatedSize = new Size { Width = bitmap.Width, Height = bitmap.Height };
+
+                        imageSize = new Size { Width = bitmap.Width, Height = bitmap.Height };
                     }
-                    imageSize = calculatedSize;
 
                     // We can provider cache dependency only for the native media provider
                     CacheDependency cacheDependency = null;
@@ -143,15 +143,15 @@ public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOp
                 string centerCroppedString = centerCrop ? "c" : string.Empty;
 
                 string fileExtension = imageFileFormatProvider.FileExtension;
-                string qualityCacheKeyPart = imageFileFormatProvider.CanSetCompressionQuality
+                string qualityCacheKeyPart = imageFileFormatProvider.CanSetImageQuality
                     ? $"_{resizingOptions.Quality}"
                     : "";
 
                 string resizedImageFileName = $"{newWidth}x{newHeight}_{filePathHash}{centerCroppedString}{qualityCacheKeyPart}.{fileExtension}";
 
-                string imageFullPath = Path.Combine(ResizedImagesDirectoryPath, resizedImageFileName);
+                string resizedImageFullPath = Path.Combine(ResizedImagesDirectoryPath, resizedImageFileName);
 
-                if (!C1File.Exists(imageFullPath) || C1File.GetLastWriteTime(imageFullPath) != file.LastWriteTime)
+                if (!C1File.Exists(resizedImageFullPath) || C1File.GetLastWriteTime(resizedImageFullPath) != file.LastWriteTime)
                 {
                     if (bitmap == null)
                     {
@@ -159,15 +159,20 @@ public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOp
                         bitmap = loadImageFunc(fileStream);
                     }
 
-                    ResizeImage(bitmap, imageFullPath, imageFileFormatProvider, newWidth, newHeight, centerCrop, resizingOptions.Quality);
+                    using (Bitmap resizedImage = ResizeImage(bitmap, newWidth, newHeight, centerCrop))
+                    {
+                        int? imageQuality = imageFileFormatProvider.CanSetImageQuality ? (int?)resizingOptions.Quality : null;
+
+                        imageFileFormatProvider.SaveImageToFile(resizedImage, resizedImageFullPath, imageQuality);
+                    }
 
                     if (file.LastWriteTime.HasValue)
                     {
-                        C1File.SetLastWriteTime(imageFullPath, file.LastWriteTime.Value);
+                        C1File.SetLastWriteTime(resizedImageFullPath, file.LastWriteTime.Value);
                     }
                 }
 
-                return imageFullPath;
+                return resizedImageFullPath;
             }
             finally
             {
@@ -287,21 +292,6 @@ private static bool CalculateSize(int width, int height, ResizingOptions resizin
             return newWidth != width || newHeight != height;
         }
 
-        private static void ResizeImage(Bitmap image, string outputFilePath, IImageFileFormatProvider imageFormatProvider,
-                                        int newWidth, int newHeight, bool centerCrop, int quality)
-        {
-            using (Bitmap resizedImage = ResizeImage(image, newWidth, newHeight, centerCrop))
-            {
-                if (imageFormatProvider.CanSetCompressionQuality)
-                {
-                    imageFormatProvider.SaveImageToFile(resizedImage, outputFilePath, quality);
-                }
-                else
-                {
-                    imageFormatProvider.SaveImageToFile(resizedImage, outputFilePath);
-                }
-            }
-        }
 
         /// <summary>
         /// Resizes an image

From ca85acd684fc7de07cc4d3d6db18d54867fddf44 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 20 Sep 2021 17:33:37 +0200
Subject: [PATCH 17/36] Fixing the previous commit

---
 Composite/Core/WebClient/ApplicationLevelEventHandlers.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs b/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs
index 98a958ea78..6b6e8dceb6 100644
--- a/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs
+++ b/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs
@@ -18,6 +18,7 @@
 using Composite.Core.Routing;
 using Composite.Core.Threading;
 using Composite.Core.Types;
+using Composite.Core.WebClient.Media;
 using Composite.Data.Types;
 using Composite.Functions;
 using Composite.Plugins.Elements.UrlToEntityToken;
@@ -101,6 +102,7 @@ private static void InitializeServices()
             services.AddRoutedData();
             services.AddDataActionTokenResolver();
             services.AddDefaultSearchDocumentSourceProviders();
+            services.AddDefaultImageFileFormatProviders();
 
             InternalUrls.Register(new MediaInternalUrlConverter());
             InternalUrls.Register(new PageInternalUrlConverter());

From 54d37772097ea1a261d46313a7de3dcefea4e660 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 20 Sep 2021 17:34:07 +0200
Subject: [PATCH 18/36] ImageResizer - not using string.GetHashCode() as it
 isn't guaranteed to be preserved between runs

---
 Composite/Core/WebClient/Media/ImageResizer.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Composite/Core/WebClient/Media/ImageResizer.cs b/Composite/Core/WebClient/Media/ImageResizer.cs
index d9bd1e4bf3..c467a154ad 100644
--- a/Composite/Core/WebClient/Media/ImageResizer.cs
+++ b/Composite/Core/WebClient/Media/ImageResizer.cs
@@ -5,6 +5,8 @@
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using System.Web;
 using System.Web.Caching;
 using System.Web.Hosting;
@@ -21,6 +23,8 @@ namespace Composite.Core.WebClient.Media
     [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
     public static class ImageResizer
     {
+        private static readonly MD5 _hashAlgorithm = MD5.Create();
+
         private const string ResizedImagesCacheDirectory = "~/App_Data/Composite/Cache/Resized images";
 
         private static Dictionary<string, IImageFileFormatProvider> _imageFormatProviders;
@@ -138,7 +142,7 @@ public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOp
                     return null;
                 }
 
-                int filePathHash = imageKey.GetHashCode();
+                string mediaFileHash = GetMediaHash(imageKey);
 
                 string centerCroppedString = centerCrop ? "c" : string.Empty;
 
@@ -147,7 +151,7 @@ public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOp
                     ? $"_{resizingOptions.Quality}"
                     : "";
 
-                string resizedImageFileName = $"{newWidth}x{newHeight}_{filePathHash}{centerCroppedString}{qualityCacheKeyPart}.{fileExtension}";
+                string resizedImageFileName = $"{newWidth}x{newHeight}{centerCroppedString}_{mediaFileHash}{qualityCacheKeyPart}.{fileExtension}";
 
                 string resizedImageFullPath = Path.Combine(ResizedImagesDirectoryPath, resizedImageFileName);
 
@@ -181,6 +185,14 @@ public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOp
             }
         }
 
+        private static string GetMediaHash(string mediaKeyPath)
+        {
+            var bytes = Encoding.UTF8.GetBytes(mediaKeyPath);
+            var hash = _hashAlgorithm.ComputeHash(bytes);
+            var guid = new Guid(hash);
+            return UrlUtils.CompressGuid(guid).Substring(10);
+        }
+
         private static bool CalculateSize(int width, int height, ResizingOptions resizingOptions, out int newWidth, out int newHeight, out bool centerCrop)
         {
             // Can be refactored to use System.Drawing.Size class instead of (width & height).

From 68157a200379d12ef3711fa0a5d8c296e1bc115f Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Wed, 22 Sep 2021 14:29:26 +0200
Subject: [PATCH 19/36] Code review fixes

---
 .../WebClient/Media/DefaultImageFileFormatProvider.cs    | 6 +++---
 Composite/Core/WebClient/Media/ImageResizer.cs           | 9 ++++++++-
 Website/Renderers/ShowMedia.ashx                         | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs b/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
index 6d43650f29..127e16018d 100644
--- a/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
+++ b/Composite/Core/WebClient/Media/DefaultImageFileFormatProvider.cs
@@ -10,9 +10,9 @@ internal class DefaultImageFileFormatProvider: IImageFileFormatProvider
 
         public DefaultImageFileFormatProvider(string mediaType, string extension, Action<Bitmap, string, int?> saveAction, bool canSetImageQuality = false)
         {
-            MediaType = mediaType;
-            FileExtension = extension;
-            _saveAction = saveAction;
+            MediaType = mediaType ?? throw new ArgumentNullException(nameof(mediaType));
+            FileExtension = extension ?? throw new ArgumentNullException(nameof(extension));
+            _saveAction = saveAction ?? throw new ArgumentNullException(nameof(saveAction));
             CanSetImageQuality = canSetImageQuality;
         }
 
diff --git a/Composite/Core/WebClient/Media/ImageResizer.cs b/Composite/Core/WebClient/Media/ImageResizer.cs
index c467a154ad..c93cada6f6 100644
--- a/Composite/Core/WebClient/Media/ImageResizer.cs
+++ b/Composite/Core/WebClient/Media/ImageResizer.cs
@@ -38,7 +38,14 @@ private static Dictionary<string, IImageFileFormatProvider> ImageFormatProviders
                 var customProviders = ServiceLocator.GetServices<IImageFileFormatProvider>().ToList();
 
                 var result = new Dictionary<string, IImageFileFormatProvider>();
-                customProviders.ForEach(provider => result[provider.MediaType] = provider);
+                customProviders.ForEach(provider =>
+                {
+                    var mediaType = provider.MediaType;
+                    if (string.IsNullOrWhiteSpace(mediaType))
+                        throw new InvalidOperationException($"Empty MediaType returned by provider {provider.GetType().FullName}");
+
+                    result[mediaType] = provider;
+                });
 
                 return _imageFormatProviders = result;
             }
diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index fd9df88a20..5edaf5c772 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -205,7 +205,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         }
 
         bool download = (string.IsNullOrEmpty(context.Request["download"]) ?
-            !CabBePreviewedInBrowser(context, file.MimeType) :
+            !CanBePreviewedInBrowser(context, file.MimeType) :
             context.Request["download"] != "false");
 
         context.Response.AddHeader("Content-Disposition", "{0};filename=\"{1}\"".FormatWith((download ? "attachment" : "inline"), encodedFileName));
@@ -531,7 +531,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
     }
 
 
-    private static bool CabBePreviewedInBrowser(HttpContext context, string mediaType)
+    private static bool CanBePreviewedInBrowser(HttpContext context, string mediaType)
     {
         return MediaTypesBrowserCanView.Contains(mediaType) || context.Request.AcceptTypes.Contains(mediaType);
     }

From e96fb219f5f660193d6dc3ec4c54e599c74f3832 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 27 Sep 2021 15:58:41 +0200
Subject: [PATCH 20/36] Search document - adding "Boost" property for index
 time boosting.

---
 .../Plugins/Search/Endpoint/ConsoleSearchRpcService.cs    | 2 +-
 Composite/Search/Crawling/SearchDocumentBuilder.cs        | 8 +++++++-
 Composite/Search/SearchDocument.cs                        | 7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Composite/Plugins/Search/Endpoint/ConsoleSearchRpcService.cs b/Composite/Plugins/Search/Endpoint/ConsoleSearchRpcService.cs
index e8f51791f0..fc217b447b 100644
--- a/Composite/Plugins/Search/Endpoint/ConsoleSearchRpcService.cs
+++ b/Composite/Plugins/Search/Endpoint/ConsoleSearchRpcService.cs
@@ -130,7 +130,7 @@ public async Task<ConsoleSearchResult> QueryAsync(ConsoleSearchQuery query)
 
                 var result = await _searchProvider.SearchAsync(searchQuery);
 
-                var items = result.Items.Evaluate();
+                var items = result?.Items?.Evaluate() ?? Array.Empty<SearchResultItem>();
                 if (!items.Any())
                 {
                     return new ConsoleSearchResult
diff --git a/Composite/Search/Crawling/SearchDocumentBuilder.cs b/Composite/Search/Crawling/SearchDocumentBuilder.cs
index 6b82bffb0c..a780f1d27a 100644
--- a/Composite/Search/Crawling/SearchDocumentBuilder.cs
+++ b/Composite/Search/Crawling/SearchDocumentBuilder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -67,6 +67,11 @@ public SearchDocumentBuilder(IEnumerable<ISearchDocumentBuilderExtension> extens
         /// </summary>
         public string Url { get; set; }
 
+        /// <summary>
+        /// A factor by which a search document should be boosted index time.
+        /// </summary>
+        public float Boost { get; set; } = 1;
+
         /// <summary>
         /// Sets the interface type, name of which will be used for populating the "Data Type" column in the search results.
         /// </summary>
@@ -223,6 +228,7 @@ public SearchDocument BuildDocument(
                 ElementBundleName = versionName,
                 FullText = _textParts,
                 Url = Url,
+                Boost = Boost,
                 FieldValues = _fieldValues
                     .ExcludeDuplicateKeys(pair => pair.Key)
                     .ToDictionary(pair => pair.Key, pair => pair.Value),
diff --git a/Composite/Search/SearchDocument.cs b/Composite/Search/SearchDocument.cs
index 328186c733..ac23558fdf 100644
--- a/Composite/Search/SearchDocument.cs
+++ b/Composite/Search/SearchDocument.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Composite.C1Console.Security;
 
 namespace Composite.Search
@@ -97,5 +97,10 @@ public SearchDocument(string source, string id, string label, EntityToken entity
         /// Field values that is preserved in the index and will be used in faceted search.
         /// </summary>
         public IDictionary<string, string[]> FacetFieldValues { get; set; }
+
+        /// <summary>
+        /// A factor by which a search document should be boosted index time.
+        /// </summary>
+        public float Boost { get; set; } = 1;
     }
 }
\ No newline at end of file

From bbb75f8c70c27d7a1ee34b53abb71239cab61c31 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Wed, 29 Sep 2021 13:32:51 +0200
Subject: [PATCH 21/36] Media requests - fixing file extension in the
 "Content-Disposition" response header.

---
 Website/Renderers/ShowMedia.ashx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 5edaf5c772..3aed65c819 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -193,7 +193,15 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
         if (sourceMediaType != resultMediaType)
         {
-            var originalExtension = MimeTypeInfo.GetExtensionFromMimeType(sourceMediaType);
+            string originalExtension = "";
+
+            try
+            {
+                originalExtension = Path.GetExtension(encodedFileName);
+                if (originalExtension.StartsWith(".")) originalExtension = originalExtension.Substring(1);
+            }
+            catch {}
+
             var resultExtension = MimeTypeInfo.GetExtensionFromMimeType(resultMediaType);
 
             if(!string.IsNullOrEmpty(originalExtension) && !string.IsNullOrEmpty(resultExtension) && originalExtension != resultExtension

From 4da760937986b967852e9e6cceb8cc7b61465f41 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Wed, 28 Jul 2021 12:57:17 +0200
Subject: [PATCH 22/36] Adding a configuration option to protect resized image
 URLs with a salted hash

# Conflicts:
#	Website/Renderers/ShowMedia.ashx
---
 .../BuildinGlobalSettingsProvider.cs          |  2 +
 .../GlobalSettingsProviderPluginFacade.cs     |  2 +
 .../Configuration/GlobalSettingsFacade.cs     |  5 ++
 .../Configuration/GlobalSettingsFacadeImpl.cs |  2 +
 .../Configuration/IGlobalSettingsFacade.cs    |  1 +
 .../IGlobalSettingsProvider.cs                |  2 +
 .../Core/WebClient/Media/ResizingOptions.cs   | 46 +++++++++++++++++++
 .../ConfigBasedGlobalSettingsProvider.cs      | 10 ++++
 .../DefaultMediaUrlProvider.cs                | 11 ++++-
 .../Composite/DebugBuild.Composite.config     |  1 +
 .../Composite/ReleaseBuild.Composite.config   |  1 +
 Website/Renderers/ShowMedia.ashx              | 12 +++++
 12 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/Composite/Core/Configuration/BuildinPlugins/GlobalSettingsProvider/BuildinGlobalSettingsProvider.cs b/Composite/Core/Configuration/BuildinPlugins/GlobalSettingsProvider/BuildinGlobalSettingsProvider.cs
index 3207ada8ef..a8c0d5647a 100644
--- a/Composite/Core/Configuration/BuildinPlugins/GlobalSettingsProvider/BuildinGlobalSettingsProvider.cs
+++ b/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;
     }
 }
diff --git a/Composite/Core/Configuration/Foundation/PluginFacades/GlobalSettingsProviderPluginFacade.cs b/Composite/Core/Configuration/Foundation/PluginFacades/GlobalSettingsProviderPluginFacade.cs
index 26f5d0fe2c..949ce9f504 100644
--- a/Composite/Core/Configuration/Foundation/PluginFacades/GlobalSettingsProviderPluginFacade.cs
+++ b/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();
diff --git a/Composite/Core/Configuration/GlobalSettingsFacade.cs b/Composite/Core/Configuration/GlobalSettingsFacade.cs
index 969c30ab72..dc06aef233 100644
--- a/Composite/Core/Configuration/GlobalSettingsFacade.cs
+++ b/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)
diff --git a/Composite/Core/Configuration/GlobalSettingsFacadeImpl.cs b/Composite/Core/Configuration/GlobalSettingsFacadeImpl.cs
index f2e7884204..829827962c 100644
--- a/Composite/Core/Configuration/GlobalSettingsFacadeImpl.cs
+++ b/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;
     }
 }
\ No newline at end of file
diff --git a/Composite/Core/Configuration/IGlobalSettingsFacade.cs b/Composite/Core/Configuration/IGlobalSettingsFacade.cs
index ecaa4a690c..0c3dbd0f67 100644
--- a/Composite/Core/Configuration/IGlobalSettingsFacade.cs
+++ b/Composite/Core/Configuration/IGlobalSettingsFacade.cs
@@ -45,5 +45,6 @@ internal interface IGlobalSettingsFacade
         TimeZoneInfo TimeZone { get; }
         bool InheritGlobalReadPermissionOnHiddenPerspectives { get; }
         bool OmitAspNetWebFormsSupport { get; }
+        bool ProtectResizedImagesWithHash { get; }
     }
 }
diff --git a/Composite/Core/Configuration/Plugins/GlobalSettingsProvider/IGlobalSettingsProvider.cs b/Composite/Core/Configuration/Plugins/GlobalSettingsProvider/IGlobalSettingsProvider.cs
index 6482b8b219..fba9b53d7d 100644
--- a/Composite/Core/Configuration/Plugins/GlobalSettingsProvider/IGlobalSettingsProvider.cs
+++ b/Composite/Core/Configuration/Plugins/GlobalSettingsProvider/IGlobalSettingsProvider.cs
@@ -89,5 +89,7 @@ internal interface IGlobalSettingsProvider
         bool InheritGlobalReadPermissionOnHiddenPerspectives { get; }
 
         bool OmitAspNetWebFormsSupport { get; }
+
+        bool ProtectResizedImagesWithHash { get; }
     }
 }
diff --git a/Composite/Core/WebClient/Media/ResizingOptions.cs b/Composite/Core/WebClient/Media/ResizingOptions.cs
index 92fadcb288..15f7f3cdd0 100644
--- a/Composite/Core/WebClient/Media/ResizingOptions.cs
+++ b/Composite/Core/WebClient/Media/ResizingOptions.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Specialized;
+using System.Configuration;
 using System.IO;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Web;
 using System.Web.Caching;
@@ -20,8 +22,14 @@ public class ResizingOptions
         private const string ResizedImageKeys = "~/App_Data/Composite/Media/ResizingOptions.xml";
         private static string _resizedImageKeysFilePath;
 
+        private const string ResizingOptionsConfigFileName = "ImageResizing.xml";
+        private static volatile string _hashSalt;
+        private static readonly object SyncRoot = new object();
+
         private int? _qualityOverride;
 
+        private static readonly MD5 HashingAlgorithm = MD5.Create();
+
         /// <summary>
         /// Image height
         /// </summary>
@@ -243,6 +251,32 @@ private static XElement GetPredefinedResizingOptions()
             return xel;
         }
 
+        private static string GetHashSalt()
+        {
+            if (_hashSalt != null) return _hashSalt;
+
+            lock (SyncRoot)
+            {
+                if (_hashSalt != null) return _hashSalt;
+
+                string filePath = Path.Combine(PathUtil.Resolve(GlobalSettingsFacade.ConfigurationDirectory), ResizingOptionsConfigFileName);
+                if (!C1File.Exists(filePath))
+                {
+                    var config = new XElement("ResizedImages",
+                        new XAttribute("hashSalt", Guid.NewGuid()));
+
+                    config.SaveToPath(filePath);
+                }
+
+                var xml = XElementUtils.Load(filePath);
+
+                var hashSalt = (string)xml.Attribute("hashSalt");
+                if (hashSalt == null) throw new ConfigurationErrorsException("Missing required attribute 'hashSalt'", null, filePath, 0);
+
+                return _hashSalt = hashSalt;
+            }
+        }
+
         /// <exclude />
         public override string ToString()
         {
@@ -275,6 +309,18 @@ public override string ToString()
 
             return sb.ToString();
         }
+
+        /// <summary>
+        /// Gets a secure hash for the current resizing options. The hash is salted with machine key and can be used to confirm that
+        /// an image URL with resizing options was generated by the website. 
+        /// </summary>
+        /// <returns></returns>
+        public string GetSecureHash(Guid mediaId)
+        {
+            var value = mediaId + this.ToString() + GetHashSalt();
+            var hash = new Guid(HashingAlgorithm.ComputeHash(Encoding.UTF8.GetBytes(value)));
+            return hash.ToString().Substring(0, 5);
+        }
     }
 }
 
diff --git a/Composite/Plugins/GlobalSettings/GlobalSettingsProviders/ConfigBasedGlobalSettingsProvider.cs b/Composite/Plugins/GlobalSettings/GlobalSettingsProviders/ConfigBasedGlobalSettingsProvider.cs
index 5a2789d55f..d2c09b0e7f 100644
--- a/Composite/Plugins/GlobalSettings/GlobalSettingsProviders/ConfigBasedGlobalSettingsProvider.cs
+++ b/Composite/Plugins/GlobalSettings/GlobalSettingsProviders/ConfigBasedGlobalSettingsProvider.cs
@@ -103,6 +103,8 @@ public ConfigBasedGlobalSettingsProvider(ConfigBasedGlobalSettingsProviderData c
             _configurationData.InheritGlobalReadPermissionOnHiddenPerspectives;
 
         public bool OmitAspNetWebFormsSupport => _configurationData.OmitAspNetWebFormsSupport;
+
+        public bool ProtectResizedImagesWithHash => _configurationData.ProtectResizedImagesWithHash;
     }
 
     internal class ConfigCachingSettings: ICachingSettings
@@ -530,6 +532,14 @@ public bool OmitAspNetWebFormsSupport
             get { return (bool)base[_omitAspNetWebFormsSupportPropertyName]; }
             set { base[_omitAspNetWebFormsSupportPropertyName] = value; }
         }
+
+        private const string _protectResizedImagesWithHash = "protectResizedImagesWithHash";
+        [ConfigurationProperty(_protectResizedImagesWithHash, DefaultValue = false)]
+        public bool ProtectResizedImagesWithHash
+        {
+            get => (bool)base[_protectResizedImagesWithHash];
+            set => base[_protectResizedImagesWithHash] = value;
+        }
     }
 
 
diff --git a/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs b/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs
index f29bf1e234..a84f3771c0 100644
--- a/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs
+++ b/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs
@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Web;
 using Composite.Core;
+using Composite.Core.Configuration;
 using Composite.Core.IO;
 using Composite.Core.Routing;
 using Composite.Core.WebClient;
@@ -83,7 +84,13 @@ public string GetResizedImageUrl(string storeId, Guid mediaId, ResizingOptions r
 
             if (resizingOptions != null && !resizingOptions.IsEmpty)
             {
-                return url + "?" + resizingOptions;
+                var urlWithResizing = url + "?" + resizingOptions;
+                if (!GlobalSettingsFacade.ProtectResizedImagesWithHash)
+                {
+                    return urlWithResizing;
+                }
+
+                return $"{urlWithResizing}&sh={resizingOptions.GetSecureHash(mediaId)}";
             }
 
             return url.ToString();
diff --git a/Website/App_Data/Composite/DebugBuild.Composite.config b/Website/App_Data/Composite/DebugBuild.Composite.config
index 95748ac093..fdab48af51 100644
--- a/Website/App_Data/Composite/DebugBuild.Composite.config
+++ b/Website/App_Data/Composite/DebugBuild.Composite.config
@@ -99,6 +99,7 @@
            functionPreviewEnabled="true"
            inheritGlobalReadPermissionOnHiddenPerspectives="false"
            omitAspNetWebFormsSupport="false"
+           protectResizedImagesWithHash="true"
            >
         <Caching enabled="true">
           <add name="DataAccess" enabled="true" size="-1"/>
diff --git a/Website/App_Data/Composite/ReleaseBuild.Composite.config b/Website/App_Data/Composite/ReleaseBuild.Composite.config
index 5889fa311b..22bc72222c 100644
--- a/Website/App_Data/Composite/ReleaseBuild.Composite.config
+++ b/Website/App_Data/Composite/ReleaseBuild.Composite.config
@@ -94,6 +94,7 @@
       functionPreviewEnabled="true"
       inheritGlobalReadPermissionOnHiddenPerspectives="false"
       omitAspNetWebFormsSupport="false"
+      protectResizedImagesWithHash="true"
       >
         <Caching enabled="true">
           <add name="DataAccess" enabled="true" size="-1"/>
diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 3aed65c819..375089a6d0 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -13,6 +13,7 @@ using Composite.C1Console.Security;
 using Composite.Data;
 using Composite.Data.Types;
 using Composite.Core;
+using Composite.Core.Configuration;
 using Composite.Core.IO;
 using Composite.Core.Extensions;
 using Composite.Core.WebClient;
@@ -582,6 +583,17 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             return new FileOrStream(file);
         }
 
+        if (GlobalSettingsFacade.ProtectResizedImagesWithHash)
+        {
+            var expectedHash = resizingOptions.GetSecureHash(file.Id);
+            if (context.Request.QueryString["sh"] != expectedHash)
+            {
+                // Returning the media file without resizing
+                resizedImageMediaType = mediaType;
+                return new FileOrStream(file);
+            }
+        }
+
         var targetImageMediaType = GetResizedImageMediaType(preferredMediaType ?? mediaType);
 
         try

From 25bb3a65deb8a9064120191543e920a6bd14981c Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Wed, 28 Jul 2021 13:59:40 +0200
Subject: [PATCH 23/36] Disabling resized image URL protection for console
 users

---
 Website/Renderers/ShowMedia.ashx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 375089a6d0..d09930ff11 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -583,7 +583,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             return new FileOrStream(file);
         }
 
-        if (GlobalSettingsFacade.ProtectResizedImagesWithHash)
+        if (GlobalSettingsFacade.ProtectResizedImagesWithHash && !UserValidationFacade.IsLoggedIn())
         {
             var expectedHash = resizingOptions.GetSecureHash(file.Id);
             if (context.Request.QueryString["sh"] != expectedHash)

From 8c6aafc9a7598e4b23e2e2a3daf860737cfdf0d9 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Thu, 30 Sep 2021 15:45:57 +0200
Subject: [PATCH 24/36] Fixing some issues related to reusing the same MD5
 object in parallel

---
 Composite/Composite.csproj                    |  1 +
 Composite/Core/HashingHelper.cs               | 37 +++++++++++++++++++
 Composite/Core/Routing/MediaUrls.cs           |  6 +--
 .../Core/WebClient/Media/ImageResizer.cs      |  6 +--
 .../Core/WebClient/Media/ResizingOptions.cs   |  4 +-
 .../FileSystemMediaFile.cs                    | 10 ++---
 .../Search/Crawling/SearchDocumentBuilder.cs  |  6 +--
 7 files changed, 46 insertions(+), 24 deletions(-)
 create mode 100644 Composite/Core/HashingHelper.cs

diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index c6a12cfee9..6841420f7e 100644
--- a/Composite/Composite.csproj
+++ b/Composite/Composite.csproj
@@ -250,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" />
diff --git a/Composite/Core/HashingHelper.cs b/Composite/Core/HashingHelper.cs
new file mode 100644
index 0000000000..3604adcad7
--- /dev/null
+++ b/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);
+        }
+
+    }
+}
diff --git a/Composite/Core/Routing/MediaUrls.cs b/Composite/Core/Routing/MediaUrls.cs
index 534e389cbe..3cec94db2f 100644
--- a/Composite/Core/Routing/MediaUrls.cs
+++ b/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;
diff --git a/Composite/Core/WebClient/Media/ImageResizer.cs b/Composite/Core/WebClient/Media/ImageResizer.cs
index c93cada6f6..3c5856f843 100644
--- a/Composite/Core/WebClient/Media/ImageResizer.cs
+++ b/Composite/Core/WebClient/Media/ImageResizer.cs
@@ -23,8 +23,6 @@ namespace Composite.Core.WebClient.Media
     [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
     public static class ImageResizer
     {
-        private static readonly MD5 _hashAlgorithm = MD5.Create();
-
         private const string ResizedImagesCacheDirectory = "~/App_Data/Composite/Cache/Resized images";
 
         private static Dictionary<string, IImageFileFormatProvider> _imageFormatProviders;
@@ -194,9 +192,7 @@ public static string GetResizedImage(IMediaFile file, ResizingOptions resizingOp
 
         private static string GetMediaHash(string mediaKeyPath)
         {
-            var bytes = Encoding.UTF8.GetBytes(mediaKeyPath);
-            var hash = _hashAlgorithm.ComputeHash(bytes);
-            var guid = new Guid(hash);
+            var guid = HashingHelper.ComputeMD5Hash(mediaKeyPath, Encoding.UTF8);
             return UrlUtils.CompressGuid(guid).Substring(10);
         }
 
diff --git a/Composite/Core/WebClient/Media/ResizingOptions.cs b/Composite/Core/WebClient/Media/ResizingOptions.cs
index 15f7f3cdd0..9a594531eb 100644
--- a/Composite/Core/WebClient/Media/ResizingOptions.cs
+++ b/Composite/Core/WebClient/Media/ResizingOptions.cs
@@ -28,8 +28,6 @@ public class ResizingOptions
 
         private int? _qualityOverride;
 
-        private static readonly MD5 HashingAlgorithm = MD5.Create();
-
         /// <summary>
         /// Image height
         /// </summary>
@@ -318,7 +316,7 @@ public override string ToString()
         public string GetSecureHash(Guid mediaId)
         {
             var value = mediaId + this.ToString() + GetHashSalt();
-            var hash = new Guid(HashingAlgorithm.ComputeHash(Encoding.UTF8.GetBytes(value)));
+            var hash = HashingHelper.ComputeMD5Hash(value, Encoding.UTF8);
             return hash.ToString().Substring(0, 5);
         }
     }
diff --git a/Composite/Plugins/Data/DataProviders/FileSystemMediaFileProvider/FileSystemMediaFile.cs b/Composite/Plugins/Data/DataProviders/FileSystemMediaFileProvider/FileSystemMediaFile.cs
index c96208687a..ce906172d3 100644
--- a/Composite/Plugins/Data/DataProviders/FileSystemMediaFileProvider/FileSystemMediaFile.cs
+++ b/Composite/Plugins/Data/DataProviders/FileSystemMediaFileProvider/FileSystemMediaFile.cs
@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
+using Composite.Core;
 using Composite.Core.IO;
 using Composite.Data;
 using Composite.Data.Plugins.DataProvider.Streams;
@@ -15,10 +16,6 @@ namespace Composite.Plugins.Data.DataProviders.FileSystemMediaFileProvider
     [FileStreamManager(typeof(FileSystemFileStreamManager))]
     internal sealed class FileSystemMediaFile : FileSystemFileBase, IMediaFile
     {
-        private static readonly MD5 HashingAlgorithm = MD5.Create(); 
-
-
-
         public FileSystemMediaFile(string systemPath, string fileName, string folderName, string storeId, DataSourceId dataSourceId)
         {
             Id = CalculateId(folderName, fileName);
@@ -36,8 +33,7 @@ private static Guid CalculateId(string folderName, string fileName)
 
         private static Guid GetHashValue(string value)
         {
-            var bytes = HashingAlgorithm.ComputeHash(Encoding.ASCII.GetBytes(value));
-            return new Guid(bytes);
+            return HashingHelper.ComputeMD5Hash(value, Encoding.ASCII);
         }
 
 
diff --git a/Composite/Search/Crawling/SearchDocumentBuilder.cs b/Composite/Search/Crawling/SearchDocumentBuilder.cs
index a780f1d27a..3898665a73 100644
--- a/Composite/Search/Crawling/SearchDocumentBuilder.cs
+++ b/Composite/Search/Crawling/SearchDocumentBuilder.cs
@@ -28,8 +28,6 @@ public class SearchDocumentBuilder
 
         private IPage _currentPage;
 
-        private static readonly MD5 HashingAlgorithm = MD5.Create();
-
         /// <summary>
         /// Creates a new instance of <see cref="SearchDocumentBuilder"/>.
         /// </summary>
@@ -268,9 +266,9 @@ private void AddAccessField(EntityToken entityToken)
         internal static string GetEntityTokenHash(EntityToken entityToken)
         {
             var entityTokenString = EntityTokenSerializer.Serialize(entityToken);
-            var bytes = Encoding.UTF8.GetBytes(entityTokenString);
+            var md5Hash  = HashingHelper.ComputeMD5Hash(entityTokenString, Encoding.UTF8);
 
-            return UrlUtils.CompressGuid(new Guid(HashingAlgorithm.ComputeHash(bytes)));
+            return UrlUtils.CompressGuid(md5Hash);
         }
 
         /// <summary>

From f0208443e5d83f94695c18aa0ed3a67936f8cbd4 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Thu, 30 Sep 2021 15:49:19 +0200
Subject: [PATCH 25/36] Fixing an issue related image URL protection and media
 type support

---
 Composite/Core/UrlBuilder.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Composite/Core/UrlBuilder.cs b/Composite/Core/UrlBuilder.cs
index 1c1f87ad6b..5ecfe6ff70 100644
--- a/Composite/Core/UrlBuilder.cs
+++ b/Composite/Core/UrlBuilder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
@@ -68,8 +68,9 @@ public UrlBuilder(string url)
                     string key = DefaultHttpEncoder.UrlDecode(encodedKey);
                     string value = DefaultHttpEncoder.UrlDecode(encodedValue);
 
+                    // For media URLs we need to support "/" character in a query parameter value
                     badUrl = DefaultHttpEncoder.UrlEncode(key) != encodedKey.Replace("%20", "+")
-                             || DefaultHttpEncoder.UrlEncode(value) != encodedValue.Replace("%20", "+");
+                             || DefaultHttpEncoder.UrlEncode(value) != encodedValue.Replace("%20", "+").Replace("/", "%2f");
 
                     if (!badUrl)
                     {

From d1d47465d86386f69584301ab31bec84f21cd5df Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Tue, 19 Oct 2021 14:34:49 +0200
Subject: [PATCH 26/36] WebObjectActivator - ignoring types originated from
 System.Web assembly, for better debugging experience

---
 Composite/AspNet/WebObjectActivator.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Composite/AspNet/WebObjectActivator.cs b/Composite/AspNet/WebObjectActivator.cs
index f8f32431fa..c07ebe5b38 100644
--- a/Composite/AspNet/WebObjectActivator.cs
+++ b/Composite/AspNet/WebObjectActivator.cs
@@ -16,7 +16,11 @@ public WebObjectActivator(IServiceProvider inner)
         public object GetService(Type serviceType)
         {
             var service = _inner.GetService(serviceType);
-            if (service == null)
+
+            // 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
                 {
@@ -24,11 +28,10 @@ public object GetService(Type serviceType)
                 }
                 catch (InvalidOperationException)
                 {
-                    service = Activator.CreateInstance(serviceType, true);
                 }
             }
 
-            return service;
+            return service ?? Activator.CreateInstance(serviceType, true);
         }
     }
 }

From 92e561aac69abe85aabffa39cf86e18df3ac5e96 Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <taras.nakonechnyi@orckestra.com>
Date: Fri, 29 Oct 2021 16:31:43 +0300
Subject: [PATCH 27/36] added validation for non xml chars (#782)

---
 .../top/ui/bindings/data/DataBinding.js       |  9 ++---
 .../data/keyboard/DataInputBinding.js         | 35 +++++++++++++++++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/Website/Composite/scripts/source/top/ui/bindings/data/DataBinding.js b/Website/Composite/scripts/source/top/ui/bindings/data/DataBinding.js
index 98726597e2..1c4f373c79 100644
--- a/Website/Composite/scripts/source/top/ui/bindings/data/DataBinding.js
+++ b/Website/Composite/scripts/source/top/ui/bindings/data/DataBinding.js
@@ -70,7 +70,7 @@ DataBinding.expressions = {
  * Warnings. This is written *inside* the control, not in a balloon. Not all DataBindings 
  * may support warnings; only bindings that rely on direct keyboard input.
  * @see {DataInputBinding}
- * @see {TextBoxBinding} 
+ * @see {TextBoxBinding} 
  * TODO: Move to ConfigurationService?
  */
 DataBinding.warnings = {
@@ -85,13 +85,14 @@ DataBinding.warnings = {
 	"maxlength"					: "{0} characters maximum",
 	"currency"					: "Invalid notation",
 	"email"						: "Invalid e-mail",
-	"guid"						: "Invalid GUID"
+	"guid"						: "Invalid GUID",
+	"character"				: "'{0}', hexadecimal value {1}, is an invalid character."
 }
 
 /**
  * Errors (balloons texts). All DataBindings support errors. 
  * Remember that error presentation is handled by the FieldBinding.
- * @see {FieldBinding#handleAction} 
+ * @see {FieldBinding#handleAction} 
  * TODO: Move to ConfigurationService?
  */
 DataBinding.errors = {
@@ -158,7 +159,7 @@ function DataBinding () {
 	 * The errortext associated, popularly known as balloons. 
 	 * Remember that errors may also be injected by the server 
 	 * in a special UpdatePanelBinding.
-	 * @type {string} 
+	 * @type {string} 
 	 */
 	this.error = null;
 	
diff --git a/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js b/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js
index 4d1cfb54b8..a126dc9de4 100644
--- a/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js
+++ b/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js
@@ -1,7 +1,10 @@
-DataInputBinding.prototype = new DataBinding;
+DataInputBinding.prototype = new DataBinding;
 DataInputBinding.prototype.constructor = DataInputBinding;
 DataInputBinding.superclass = DataBinding.prototype;
 
+
+DataInputBinding.invalidXmlChar = /[^\x09\x0A\x0D\x20-\xD7FF\xE000-\xFFFD\x10000-x10FFFF]/gi;
+
 /**
  * @class
  * @implements {IData}
@@ -52,6 +55,18 @@ function DataInputBinding () {
 	 */
 	this._isInvalidBecauseRequired = false;
 
+	/**
+	 * True when invalid because contains invalid Xml Char.
+	 * @type {boolean}
+	 */
+	this._isInvalidBecauseInvalidXmlChar = false;
+
+	/**
+	 * The invalid Xml Char.
+	 * @type {boolean}
+	 */
+	this._invalidXmlChar = null;
+
 	/**
 	 * True when invalid because of minlength.
 	 * @type {boolean}
@@ -728,6 +743,11 @@ DataInputBinding.prototype.validate = function ( isInternal ) {
 				if ( !this.isFocused ) {
 
 					var message = null;
+					if ( this._isInvalidBecauseInvalidXmlChar == true && this._invalidXmlChar ) {
+						message = DataBinding.warnings [ "character" ];
+						message = message.replace ( "{0}", String ( this._invalidXmlChar ));
+						message = message.replace ( "{1}", String ("0x" + this._invalidXmlChar.charCodeAt(0).toString(16) ));
+					} else
 					if ( this._isInvalidBecauseRequired == true ) {
 						message = DataBinding.warnings [ "required" ];
 					} else if ( this._isInvalidBecauseMinLength == true ) {
@@ -776,6 +796,8 @@ DataInputBinding.prototype._normalizeToValid = function () {
 	}
 };
 
+
+
 /**
  * @return {boolean}
  */
@@ -783,11 +805,19 @@ DataInputBinding.prototype.isValid = function () {
 
 	var isValid = true;
 	this._isInvalidBecauseRequired = false;
+	this._isInvalidBecauseInvalidXmlChar = false;
+	this._invalidXmlChar = "";
 	this._isInvalidBecauseMinLength = false;
 	this._isInvalidaBecuaseMaxLength = false;
 	var value = this.getValue ();
+	var invalidCharMatch = DataInputBinding.invalidXmlChar.exec(value);
+
 
-	if ( value == "" ) {
+	if (invalidCharMatch) {
+		isValid = false;
+		this._isInvalidBecauseInvalidXmlChar = true;
+		this._invalidXmlChar = invalidCharMatch[0];
+	} else if ( value == "" ) {
 		if ( this.isRequired == true ) {
 			isValid = false;
 			this._isInvalidBecauseRequired = true;
@@ -950,6 +980,7 @@ DataInputBinding.prototype.updateElement = function ( element ) {
 	return true;
 };
 
+
 /**
  * Manifest. Because postback without validation may happen,
  * we may need override validation message and post an empty

From 5777ba86b057b55d439db4232df00176f6542860 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Fri, 29 Oct 2021 16:23:32 +0200
Subject: [PATCH 28/36] Fix #776: Duplicate <title /> tag in the new rendering
 pipeline

---
 .../WebClient/Renderings/Page/PageRenderer.cs | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs b/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
index 44f77c28b6..b3bf2beabc 100644
--- a/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
+++ b/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
@@ -258,7 +258,9 @@ internal static void ProcessXhtmlDocument(XhtmlDocument xhtmlDocument, IPage pag
             }
         }
 
-        private static bool IsMetaTag(XElement e) => e.Name.LocalName.Equals("meta", StringComparison.OrdinalIgnoreCase);
+        private static bool IsTitleOrMetaTag(XElement e) =>
+            e.Name.LocalName.Equals("title", StringComparison.OrdinalIgnoreCase)
+            || e.Name.LocalName.Equals("meta", StringComparison.OrdinalIgnoreCase);
 
         private static bool CheckForDuplication(HashSet<string> values, string value)
         {
@@ -301,30 +303,43 @@ private static void RemoveDuplicates(XElement head)
 
             var priorityOrderedElements = new List<XElement>();
 
-            priorityOrderedElements.AddRange(head.Elements().Where(IsMetaTag));
+            priorityOrderedElements.AddRange(head.Elements().Where(IsTitleOrMetaTag));
             priorityOrderedElements.Reverse();
-            priorityOrderedElements.AddRange(head.Elements().Where(e => !IsMetaTag(e)));
+            priorityOrderedElements.AddRange(head.Elements().Where(e => !IsTitleOrMetaTag(e)));
+
+            bool titleTagEncountered = false;
 
             foreach (var e in priorityOrderedElements)
             {
-                var id = (string)e.Attribute(XName_Id);
-
-                bool toBeRemoved = CheckForDuplication(uniqueIdValues, id);
+                var tagName = e.Name.LocalName.ToLowerInvariant();
+                bool toBeRemoved;
 
-                if (!toBeRemoved && !e.Nodes().Any())
+                if (tagName == "title")
+                {
+                    toBeRemoved = titleTagEncountered;
+                    titleTagEncountered = true;
+                }
+                else
                 {
-                    switch (e.Name.LocalName.ToLowerInvariant())
+                    var id = (string)e.Attribute(XName_Id);
+
+                    toBeRemoved = CheckForDuplication(uniqueIdValues, id);
+
+                    if (!toBeRemoved && !e.Nodes().Any())
                     {
-                        case "meta":
-                            var name = (string)e.Attribute(XName_Name);
-                            toBeRemoved = CheckForDuplication(uniqueMetaNameValues, name);
-                            break;
-                        case "script":
-                            toBeRemoved = CheckForDuplication(uniqueScriptAttributes, e.AttributesAsString());
-                            break;
-                        case "link":
-                            toBeRemoved = CheckForDuplication(uniqueLinkAttributes, e.AttributesAsString());
-                            break;
+                        switch (tagName)
+                        {
+                            case "meta":
+                                var name = (string)e.Attribute(XName_Name);
+                                toBeRemoved = CheckForDuplication(uniqueMetaNameValues, name);
+                                break;
+                            case "script":
+                                toBeRemoved = CheckForDuplication(uniqueScriptAttributes, e.AttributesAsString());
+                                break;
+                            case "link":
+                                toBeRemoved = CheckForDuplication(uniqueLinkAttributes, e.AttributesAsString());
+                                break;
+                        }
                     }
                 }
 

From 73dc26050e5f3ffc31531aa332463de9398bc213 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Fri, 29 Oct 2021 17:01:15 +0200
Subject: [PATCH 29/36] Whitelisting the types that can be instantiated with
 JsonSerializer

---
 .../CompositeSerializationBinder.cs           | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/Composite/Core/Serialization/CompositeSerializationBinder.cs b/Composite/Core/Serialization/CompositeSerializationBinder.cs
index af95087ff0..f12a314ed6 100644
--- a/Composite/Core/Serialization/CompositeSerializationBinder.cs
+++ b/Composite/Core/Serialization/CompositeSerializationBinder.cs
@@ -6,7 +6,7 @@
 namespace Composite.Core.Serialization
 {
     /// <summary>
-    /// Removes temproraty assembly references when serializing references to generated classes.
+    /// Removes temporary assembly references when serializing references to generated classes.
     /// </summary>
     internal class CompositeSerializationBinder: DefaultSerializationBinder
     {
@@ -39,7 +39,40 @@ public override Type BindToType(string assemblyName, string typeName)
                 if (result != null) return result;
             }
 
+            ValidateTypeIsSupported(assemblyName, typeName);
+
             return base.BindToType(assemblyName, typeName);
         }
+
+        private void ValidateTypeIsSupported(string assemblyName, string typeName)
+        {
+            var commaOffset = assemblyName.IndexOf(",", StringComparison.Ordinal);
+            if (commaOffset > 0)
+            {
+                assemblyName = assemblyName.Substring(0, commaOffset);
+            }
+
+            if (assemblyName == "Composite"
+                || assemblyName.StartsWith("Composite.")
+                || assemblyName.StartsWith("Orckestra."))
+            {
+                return;
+            }
+
+            if (assemblyName != typeof(object).Assembly.GetName().Name /* "mscorlib" */)
+                throw new NotSupportedException($"Not supported assembly name '{assemblyName}'");
+
+            var dotOffset = typeName.LastIndexOf(".", StringComparison.Ordinal);
+            if (dotOffset > 0)
+            {
+                string ns = typeName.Substring(0, dotOffset);
+                if (ns == nameof(System) || ns.StartsWith("System.Collections"))
+                {
+                    return;
+                }
+            }
+
+            throw new NotSupportedException("Not supported object type");
+        }
     }
 }

From ceb252c46e454f93921bad98b8633ed1036aa33d Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 1 Nov 2021 12:07:29 +0100
Subject: [PATCH 30/36] A code review fix

---
 .../Core/Serialization/CompositeSerializationBinder.cs     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Composite/Core/Serialization/CompositeSerializationBinder.cs b/Composite/Core/Serialization/CompositeSerializationBinder.cs
index f12a314ed6..59c05678a2 100644
--- a/Composite/Core/Serialization/CompositeSerializationBinder.cs
+++ b/Composite/Core/Serialization/CompositeSerializationBinder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using System.Runtime.Serialization;
 using Composite.Core.Types;
 using Newtonsoft.Json.Serialization;
@@ -46,11 +47,7 @@ public override Type BindToType(string assemblyName, string typeName)
 
         private void ValidateTypeIsSupported(string assemblyName, string typeName)
         {
-            var commaOffset = assemblyName.IndexOf(",", StringComparison.Ordinal);
-            if (commaOffset > 0)
-            {
-                assemblyName = assemblyName.Substring(0, commaOffset);
-            }
+            assemblyName = new AssemblyName(assemblyName).Name;
 
             if (assemblyName == "Composite"
                 || assemblyName.StartsWith("Composite.")

From 2bcaaab00cfaa2b225153585bd326b26eeee0a5f Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 1 Nov 2021 15:03:18 +0100
Subject: [PATCH 31/36] Fixing the build

---
 Website/WebSite.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Website/WebSite.csproj b/Website/WebSite.csproj
index 37e236130d..48fd1e830c 100644
--- a/Website/WebSite.csproj
+++ b/Website/WebSite.csproj
@@ -2805,7 +2805,7 @@
       )
 
       if not exist "$(TargetDir)\System.Threading.Tasks.Dataflow.dll" (
-      copy "$(ProjectDir)\..\Packages\System.Threading.Tasks.Dataflow.4.6.0\lib\netstandard1.1\System.Threading.Tasks.Dataflow.dll" "$(TargetDir)\System.Threading.Tasks.Dataflow.dll"
+      copy "$(ProjectDir)\..\Packages\System.Threading.Tasks.Dataflow.4.7.0\lib\netstandard1.1\System.Threading.Tasks.Dataflow.dll" "$(TargetDir)\System.Threading.Tasks.Dataflow.dll"
       )
 
       cd "$(ProjectDir)"

From 9a0bf1de738a45ba085a98acfb68aedf73e948d8 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 1 Nov 2021 15:22:45 +0100
Subject: [PATCH 32/36] Updating version number to 6.11

---
 Composite/Properties/SharedAssemblyInfo.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Composite/Properties/SharedAssemblyInfo.cs b/Composite/Properties/SharedAssemblyInfo.cs
index a6e496d5f4..ea5d1c1489 100644
--- a/Composite/Properties/SharedAssemblyInfo.cs
+++ b/Composite/Properties/SharedAssemblyInfo.cs
@@ -2,15 +2,15 @@
 
 // General Information about the assemblies Composite and Composite.Workflows  
 #if !InternalBuild
-[assembly: AssemblyTitle("C1 CMS 6.10")]
+[assembly: AssemblyTitle("C1 CMS 6.11")]
 #else
-[assembly: AssemblyTitle("C1 CMS 6.10 (Internal Build)")]
+[assembly: AssemblyTitle("C1 CMS 6.11 (Internal Build)")]
 #endif
 
 [assembly: AssemblyCompany("Orckestra Technologies Inc.")]
 [assembly: AssemblyProduct("C1 CMS")]
-[assembly: AssemblyCopyright("Copyright © Orckestra Technologies Inc. 2020")]
+[assembly: AssemblyCopyright("Copyright © Orckestra Technologies Inc. 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("6.10.*")]
+[assembly: AssemblyVersion("6.11.*")]

From c65ac0fae394cdeee77939aa4cfea156ea226389 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 1 Nov 2021 17:40:21 +0100
Subject: [PATCH 33/36] Fixing e2e tests

---
 Website/test/e2e/reset.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Website/test/e2e/reset.js b/Website/test/e2e/reset.js
index 81118073a9..7ca2fd39cf 100644
--- a/Website/test/e2e/reset.js
+++ b/Website/test/e2e/reset.js
@@ -94,6 +94,7 @@
 //    'bin/Microsoft.Web.*.dll',
     'bin/Microsoft.WindowsAzure.*.dll',
     'bin/Orckestra.Search*.dll',
+    'bin/Orckestra.Web.BundlingAndMinification.dll',
     'bin/Orckestra.Web.Css.Less.dll',
     'bin/System.Web.Optimization.dll',
     'bin/WebGrease.dll',

From 1331e984a8daf4f31e58a8ce709fc9d5a4b7d680 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Tue, 2 Nov 2021 17:25:40 +0100
Subject: [PATCH 34/36] Better logging for DllPackageFragmentInstaller;
 IDataItemTreeAttachmentPoint - improved XML comments;

---
 .../DllPackageFragmentInstaller.cs            | 35 +++++++++++++------
 .../Types/IDataItemTreeAttachmentPoint.cs     | 31 +++++++++++-----
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/Composite/Core/PackageSystem/PackageFragmentInstallers/DllPackageFragmentInstaller.cs b/Composite/Core/PackageSystem/PackageFragmentInstallers/DllPackageFragmentInstaller.cs
index dc31c82314..ebd18569e4 100644
--- a/Composite/Core/PackageSystem/PackageFragmentInstallers/DllPackageFragmentInstaller.cs
+++ b/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
                 }
             }
         }
-    
+
     }
 }
\ No newline at end of file
diff --git a/Composite/Data/Types/IDataItemTreeAttachmentPoint.cs b/Composite/Data/Types/IDataItemTreeAttachmentPoint.cs
index 215789aefe..2ee776f85b 100644
--- a/Composite/Data/Types/IDataItemTreeAttachmentPoint.cs
+++ b/Composite/Data/Types/IDataItemTreeAttachmentPoint.cs
@@ -1,47 +1,60 @@
-using System;
+using System;
+using Composite.C1Console.Elements.Plugins.ElementAttachingProvider;
 using Composite.Data.Hierarchy;
 using Composite.Data.Hierarchy.DataAncestorProviders;
 
 
 namespace Composite.Data.Types
 {
-    /// <summary>    
+    /// <summary>
+    /// Represents a link between a tree definition and a data item.
+    /// F.e. a tree that shows navigation elements, attached to a specific C1 page.
     /// </summary>
     /// <exclude />
     [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] 
     [AutoUpdateble]
     [ImmutableTypeId("{24CDC117-4510-41C4-8A73-D1B4CD85FE2A}")]
-    [KeyPropertyName("Id")]
+    [KeyPropertyName(nameof(Id))]
     [DataAncestorProvider(typeof(NoAncestorDataAncestorProvider))]
     [DataScope(DataScopeIdentifier.PublicName)]
-    [CachingAttribute(CachingType.Full)]
+    [Caching(CachingType.Full)]
     public interface IDataItemTreeAttachmentPoint : IData
     {
-        /// <exclude />
+        /// <summary>
+        /// The Id value for the attachment point.
+        /// </summary>
         [StoreFieldType(PhysicalStoreFieldType.Guid)]
         [ImmutableFieldId("{BEB44A8E-37FD-4FA6-A420-B252B8590AD6}")]
         Guid Id { get; set; }
 
 
-        /// <exclude />
+        /// <summary>
+        /// The Id of the tree that is attached.
+        /// </summary>
         [StoreFieldType(PhysicalStoreFieldType.LargeString)]
         [ImmutableFieldId("{FA9A44E0-9D41-491A-86C0-BC5189FFC023}")]
         string TreeId { get; set; }
 
 
-        /// <exclude />
+        /// <summary>
+        /// The position in which the tree elements should be shown, f.e. "Top" or "Bottom". See <see cref="ElementAttachingProviderPosition"/>
+        /// </summary>
         [StoreFieldType(PhysicalStoreFieldType.String, 64)]
         [ImmutableFieldId("{6624A6CF-29DC-4E6A-8B88-25514BC00758}")]
         string Position { get; set; }
 
 
-        /// <exclude />
+        /// <summary>
+        /// The data type of the data item, to which a tree is attached.
+        /// </summary>
         [StoreFieldType(PhysicalStoreFieldType.LargeString)]
         [ImmutableFieldId("{F08DB525-2218-4379-A6F6-A9A904DEF6FE}")]
         string InterfaceType { get; set; }
 
 
-        /// <exclude />
+        /// <summary>
+        /// The key value of the data item to which a tree is attached.
+        /// </summary>
         [StoreFieldType(PhysicalStoreFieldType.LargeString)]
         [ImmutableFieldId("{8A50C365-586D-45F5-8881-EC3878E16593}")]
         string KeyValue { get; set; }

From 4ea12831147981689139a76b56edf5f9ea2ccb60 Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <taras.nakonechnyi@orckestra.com>
Date: Fri, 5 Nov 2021 16:57:06 +0200
Subject: [PATCH 35/36] Prevent invalid xml chars (#786)

---
 .../source/top/ui/bindings/data/keyboard/DataInputBinding.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js b/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js
index a126dc9de4..3cf688889f 100644
--- a/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js
+++ b/Website/Composite/scripts/source/top/ui/bindings/data/keyboard/DataInputBinding.js
@@ -3,7 +3,7 @@ DataInputBinding.prototype.constructor = DataInputBinding;
 DataInputBinding.superclass = DataBinding.prototype;
 
 
-DataInputBinding.invalidXmlChar = /[^\x09\x0A\x0D\x20-\xD7FF\xE000-\xFFFD\x10000-x10FFFF]/gi;
+DataInputBinding.invalidXmlChar = /((?:[\0-\x08\x0B\f\x0E-\x1F\uFFFD\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]))/g;
 
 /**
  * @class

From 85cf7daaefd4109078a1fe17f6f26ecb9d05399d Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitry.dzygin@orckestra.com>
Date: Mon, 8 Nov 2021 12:44:35 +0100
Subject: [PATCH 36/36] Fixing display name not being shown for some of the
 timezones

---
 .../C1Console/Tools/SetTimeZoneWorkflow.cs            |  8 ++++++--
 .../Composite.Plugins.TimezoneDisplayNames.en-us.xml  | 11 ++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Composite.Workflows/C1Console/Tools/SetTimeZoneWorkflow.cs b/Composite.Workflows/C1Console/Tools/SetTimeZoneWorkflow.cs
index f0096146e2..2bc165dee3 100644
--- a/Composite.Workflows/C1Console/Tools/SetTimeZoneWorkflow.cs
+++ b/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},
diff --git a/Website/Composite/localization/Composite.Plugins.TimezoneDisplayNames.en-us.xml b/Website/Composite/localization/Composite.Plugins.TimezoneDisplayNames.en-us.xml
index 162c1aeb96..3f5d39f231 100644
--- a/Website/Composite/localization/Composite.Plugins.TimezoneDisplayNames.en-us.xml
+++ b/Website/Composite/localization/Composite.Plugins.TimezoneDisplayNames.en-us.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <strings>
   <string key = "TimezoneDisplayName.Dateline Standard Time" value = "(UTC-12:00) International Date Line West" />
   <string key = "TimezoneDisplayName.UTC-11" value = "(UTC-11:00) Coordinated Universal Time-11" />
@@ -13,6 +13,7 @@
   <string key = "TimezoneDisplayName.US Mountain Standard Time" value = "(UTC-07:00) Arizona" />
   <string key = "TimezoneDisplayName.Mountain Standard Time (Mexico)" value = "(UTC-07:00) Chihuahua, La Paz, Mazatlan" />
   <string key = "TimezoneDisplayName.Mountain Standard Time" value = "(UTC-07:00) Mountain Time (US &amp; Canada)" />
+  <string key = "TimezoneDisplayName.Yukon Standard Time" value = "(UTC-07:00) Yukon" />
   <string key = "TimezoneDisplayName.Central America Standard Time" value = "(UTC-06:00) Central America" />
   <string key = "TimezoneDisplayName.Central Standard Time" value = "(UTC-06:00) Central Time (US &amp; Canada)" />
   <string key = "TimezoneDisplayName.Easter Island Standard Time" value = "(UTC-06:00) Easter Island" />
@@ -38,6 +39,7 @@
   <string key = "TimezoneDisplayName.Argentina Standard Time" value = "(UTC-03:00) City of Buenos Aires" />
   <string key = "TimezoneDisplayName.Greenland Standard Time" value = "(UTC-03:00) Greenland" />
   <string key = "TimezoneDisplayName.Montevideo Standard Time" value = "(UTC-03:00) Montevideo" />
+  <string key = "TimezoneDisplayName.Magallanes Standard Time" value = "(UTC-03:00) Punta Arenas" />
   <string key = "TimezoneDisplayName.Saint Pierre Standard Time" value = "(UTC-03:00) Saint Pierre and Miquelon" />
   <string key = "TimezoneDisplayName.Bahia Standard Time" value = "(UTC-03:00) Salvador" />
   <string key = "TimezoneDisplayName.UTC-02" value = "(UTC-02:00) Coordinated Universal Time-02" />
@@ -48,6 +50,7 @@
   <string key = "TimezoneDisplayName.Morocco Standard Time" value = "(UTC+00:00) Casablanca" />
   <string key = "TimezoneDisplayName.GMT Standard Time" value = "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" />
   <string key = "TimezoneDisplayName.Greenwich Standard Time" value = "(UTC+00:00) Monrovia, Reykjavik" />
+  <string key = "TimezoneDisplayName.Sao Tome Standard Time" value = "(UTC+00:00) Sao Tome" />
   <string key = "TimezoneDisplayName.W. Europe Standard Time" value = "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" />
   <string key = "TimezoneDisplayName.Central Europe Standard Time" value = "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" />
   <string key = "TimezoneDisplayName.Romance Standard Time" value = "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" />
@@ -65,30 +68,36 @@
   <string key = "TimezoneDisplayName.FLE Standard Time" value = "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" />
   <string key = "TimezoneDisplayName.Turkey Standard Time" value = "(UTC+02:00) Istanbul" />
   <string key = "TimezoneDisplayName.Israel Standard Time" value = "(UTC+02:00) Jerusalem" />
+  <string key = "TimezoneDisplayName.South Sudan Standard Time" value = "(UTC+02:00) Juba" />
   <string key = "TimezoneDisplayName.Kaliningrad Standard Time" value = "(UTC+02:00) Kaliningrad" />
+  <string key = "TimezoneDisplayName.Sudan Standard Time" value = "(UTC+02:00) Khartoum" />
   <string key = "TimezoneDisplayName.Libya Standard Time" value = "(UTC+02:00) Tripoli" />
   <string key = "TimezoneDisplayName.Arabic Standard Time" value = "(UTC+03:00) Baghdad" />
   <string key = "TimezoneDisplayName.Arab Standard Time" value = "(UTC+03:00) Kuwait, Riyadh" />
   <string key = "TimezoneDisplayName.Belarus Standard Time" value = "(UTC+03:00) Minsk" />
   <string key = "TimezoneDisplayName.Russian Standard Time" value = "(UTC+03:00) Moscow, St. Petersburg, Volgograd" />
   <string key = "TimezoneDisplayName.E. Africa Standard Time" value = "(UTC+03:00) Nairobi" />
+  <string key = "TimezoneDisplayName.Volgograd Standard Time" value = "(UTC+03:00) Volgograd" />
   <string key = "TimezoneDisplayName.Iran Standard Time" value = "(UTC+03:30) Tehran" />
   <string key = "TimezoneDisplayName.Arabian Standard Time" value = "(UTC+04:00) Abu Dhabi, Muscat" />
   <string key = "TimezoneDisplayName.Astrakhan Standard Time" value = "(UTC+04:00) Astrakhan, Ulyanovsk" />
   <string key = "TimezoneDisplayName.Azerbaijan Standard Time" value = "(UTC+04:00) Baku" />
   <string key = "TimezoneDisplayName.Russia Time Zone 3" value = "(UTC+04:00) Izhevsk, Samara" />
   <string key = "TimezoneDisplayName.Mauritius Standard Time" value = "(UTC+04:00) Port Louis" />
+  <string key = "TimezoneDisplayName.Saratov Standard Time" value = "(UTC+04:00) Saratov" />
   <string key = "TimezoneDisplayName.Georgian Standard Time" value = "(UTC+04:00) Tbilisi" />
   <string key = "TimezoneDisplayName.Caucasus Standard Time" value = "(UTC+04:00) Yerevan" />
   <string key = "TimezoneDisplayName.Afghanistan Standard Time" value = "(UTC+04:30) Kabul" />
   <string key = "TimezoneDisplayName.West Asia Standard Time" value = "(UTC+05:00) Ashgabat, Tashkent" />
   <string key = "TimezoneDisplayName.Ekaterinburg Standard Time" value = "(UTC+05:00) Ekaterinburg" />
   <string key = "TimezoneDisplayName.Pakistan Standard Time" value = "(UTC+05:00) Islamabad, Karachi" />
+  <string key = "TimezoneDisplayName.Qyzylorda Standard Time" value = "(UTC+05:00) Qyzylorda" />
   <string key = "TimezoneDisplayName.India Standard Time" value = "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" />
   <string key = "TimezoneDisplayName.Sri Lanka Standard Time" value = "(UTC+05:30) Sri Jayawardenepura" />
   <string key = "TimezoneDisplayName.Nepal Standard Time" value = "(UTC+05:45) Kathmandu" />
   <string key = "TimezoneDisplayName.Central Asia Standard Time" value = "(UTC+06:00) Astana" />
   <string key = "TimezoneDisplayName.Bangladesh Standard Time" value = "(UTC+06:00) Dhaka" />
+  <string key = "TimezoneDisplayName.Omsk Standard Time" value = "(UTC+06:00) Omsk" />
   <string key = "TimezoneDisplayName.N. Central Asia Standard Time" value = "(UTC+06:00) Novosibirsk" />
   <string key = "TimezoneDisplayName.Myanmar Standard Time" value = "(UTC+06:30) Yangon (Rangoon)" />
   <string key = "TimezoneDisplayName.SE Asia Standard Time" value = "(UTC+07:00) Bangkok, Hanoi, Jakarta" />