From afbceca184ac0ed919d24ef3631153029deb0855 Mon Sep 17 00:00:00 2001
From: Niels Hartvig <nh@umbraco.com>
Date: Mon, 2 Jan 2017 17:29:37 +0100
Subject: [PATCH 1/2] Makes EXIF data in resized images default

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  3 +
 .../config/imageprocessor/cache.config        | 10 +++
 .../config/imageprocessor/processing.config   | 61 +++++++++++++++++++
 .../config/imageprocessor/security.config     | 24 ++++++++
 src/Umbraco.Web.UI/packages.config            |  1 +
 src/Umbraco.Web.UI/web.Template.config        | 13 +++-
 6 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 src/Umbraco.Web.UI/config/imageprocessor/cache.config
 create mode 100644 src/Umbraco.Web.UI/config/imageprocessor/processing.config
 create mode 100644 src/Umbraco.Web.UI/config/imageprocessor/security.config

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 6c46ff0f80..ef27b4ef79 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -651,6 +651,9 @@
     <None Include="Config\BaseRestExtensions.Release.config">
       <DependentUpon>BaseRestExtensions.config</DependentUpon>
     </None>
+    <Content Include="Config\imageprocessor\security.config" />
+    <Content Include="Config\imageprocessor\processing.config" />
+    <Content Include="Config\imageprocessor\cache.config" />
     <None Include="Config\log4net.Release.config">
       <DependentUpon>log4net.config</DependentUpon>
     </None>
diff --git a/src/Umbraco.Web.UI/config/imageprocessor/cache.config b/src/Umbraco.Web.UI/config/imageprocessor/cache.config
new file mode 100644
index 0000000000..a8fd567d6c
--- /dev/null
+++ b/src/Umbraco.Web.UI/config/imageprocessor/cache.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<caching currentCache="DiskCache">
+  <caches>
+    <cache name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" browserMaxDays="7">
+      <settings>
+        <setting key="VirtualCachePath" value="~/app_data/cache" />
+      </settings>
+    </cache>
+  </caches>
+</caching>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/imageprocessor/processing.config b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
new file mode 100644
index 0000000000..2ce29a542a
--- /dev/null
+++ b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
+  <presets>
+  </presets>
+  <plugins>
+    <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" />
+    <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true" />
+    <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" enabled="true" />
+    <plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web" />
+    <plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web" />
+    <plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web" enabled="true" />
+    <plugin name="DetectEdges" type="ImageProcessor.Web.Processors.DetectEdges, ImageProcessor.Web" />
+    <plugin name="EntropyCrop" type="ImageProcessor.Web.Processors.EntropyCrop, ImageProcessor.Web" />
+    <plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web" />
+    <plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web" />
+    <plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" enabled="true" />
+    <plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
+      <settings>
+        <setting key="MaxSize" value="22" />
+        <setting key="MaxSigma" value="5.1" />
+        <setting key="MaxThreshold" value="100" />
+      </settings>
+    </plugin>
+    <plugin name="GaussianSharpen" type="ImageProcessor.Web.Processors.GaussianSharpen, ImageProcessor.Web">
+      <settings>
+        <setting key="MaxSize" value="22" />
+        <setting key="MaxSigma" value="5.1" />
+        <setting key="MaxThreshold" value="100" />
+      </settings>
+    </plugin>
+    <plugin name="Halftone" type="ImageProcessor.Web.Processors.Halftone, ImageProcessor.Web" />
+    <plugin name="Hue" type="ImageProcessor.Web.Processors.Hue, ImageProcessor.Web" />
+    <plugin name="Mask" type="ImageProcessor.Web.Processors.Mask, ImageProcessor.Web">
+      <settings>
+        <setting key="VirtualPath" value="~/images/imageprocessor/mask/" />
+      </settings>
+    </plugin>
+    <plugin name="Meta" type="ImageProcessor.Web.Processors.Meta, ImageProcessor.Web" />
+    <plugin name="Overlay" type="ImageProcessor.Web.Processors.Overlay, ImageProcessor.Web">
+      <settings>
+        <setting key="VirtualPath" value="~/images/imageprocessor/overlay/" />
+      </settings>
+    </plugin>
+    <plugin name="Pixelate" type="ImageProcessor.Web.Processors.Pixelate, ImageProcessor.Web" />
+    <plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web" enabled="true" />
+    <plugin name="ReplaceColor" type="ImageProcessor.Web.Processors.ReplaceColor, ImageProcessor.Web" />
+    <plugin name="Resize" type="ImageProcessor.Web.Processors.Resize, ImageProcessor.Web" enabled="true">
+      <settings>
+        <setting key="MaxWidth" value="5000" />
+        <setting key="MaxHeight" value="5000" />
+      </settings>
+    </plugin>
+    <plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web" />
+    <plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web" />
+    <plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web" />
+    <plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web" />
+    <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" />
+    <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" />
+    <plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" />
+  </plugins>
+</processing>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/imageprocessor/security.config b/src/Umbraco.Web.UI/config/imageprocessor/security.config
new file mode 100644
index 0000000000..7bce8ee7b5
--- /dev/null
+++ b/src/Umbraco.Web.UI/config/imageprocessor/security.config
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<security>
+  <services>
+    <service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web" />
+    <!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
+    <!--<service name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web">
+      <settings>
+        <setting key="Container" value=""/>
+        <setting key="MaxBytes" value="8194304"/>
+        <setting key="Timeout" value="30000"/>
+        <setting key="Host" value="http://yourhost.com/"/>
+      </settings>
+    </service>-->
+    <service prefix="remote.axd" name="RemoteImageService" type="ImageProcessor.Web.Services.RemoteImageService, ImageProcessor.Web">
+      <settings>
+        <setting key="MaxBytes" value="4194304" />
+        <setting key="Timeout" value="3000" />
+        <setting key="Protocol" value="http" />
+      </settings>
+      <whitelist>
+      </whitelist>
+    </service>
+  </services>
+</security>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 008e5e404c..cc1fb8a78e 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -7,6 +7,7 @@
   <package id="Examine" version="0.1.70.0" targetFramework="net45" />
   <package id="ImageProcessor" version="2.4.5.0" targetFramework="net45" />
   <package id="ImageProcessor.Web" version="4.6.6.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web.Config" version="2.3.0.0" targetFramework="net45" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 09df754e74..10c64797f4 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -14,7 +14,13 @@
 			<section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
 			<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
 		</sectionGroup>
-	</configSections>
+
+    <sectionGroup name="imageProcessor">
+      <section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" />
+      <section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" />
+      <section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web" />
+    </sectionGroup>
+  </configSections>
 
 	<umbracoConfiguration>
 		<settings configSource="config\umbracoSettings.config" />
@@ -434,4 +440,9 @@
 		</system.webServer>
 	</location>
 
+  <imageProcessor>
+    <security configSource="config\imageprocessor\security.config" />
+    <caching configSource="config\imageprocessor\cache.config" />
+    <processing configSource="config\imageprocessor\processing.config" />
+  </imageProcessor>
 </configuration>

From 6a374cbfa6c310514abdf121b6914722b23c3bda Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 3 Jan 2017 15:57:21 +0100
Subject: [PATCH 2/2] Make the NuGet install and upgrade work

---
 build/NuSpecs/UmbracoCms.Core.nuspec              | 1 +
 build/NuSpecs/UmbracoCms.nuspec                   | 1 +
 build/NuSpecs/tools/processing.config.install.xdt | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 build/NuSpecs/tools/processing.config.install.xdt

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 44499f6a64..5849f2679f 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -35,6 +35,7 @@
       <dependency id="Examine" version="[0.1.70, 1.0.0)" />
       <dependency id="ImageProcessor" version="[2.5.0, 3.0.0)" />
       <dependency id="ImageProcessor.Web" version="[4.7.0, 5.0.0)" />
+      <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
       <dependency id="semver" version="[1.1.2, 2.0.0)" />
       <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />	  
 	  <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index d30a139adc..b56c8e6205 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -43,6 +43,7 @@
     <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
     <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
     <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
+    <file src="tools\processing.config.install.xdt" target="Content\Config\imageprocessor\processing.config.install.xdt" />
     <file src="build\**" target="build" />
   </files>
 </package>
diff --git a/build/NuSpecs/tools/processing.config.install.xdt b/build/NuSpecs/tools/processing.config.install.xdt
new file mode 100644
index 0000000000..0bef321533
--- /dev/null
+++ b/build/NuSpecs/tools/processing.config.install.xdt
@@ -0,0 +1 @@
+<processing xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xdt:Transform="SetAttributes(preserveExifMetaData)" preserveExifMetaData="true" />
\ No newline at end of file