Merge pull request #3 from KayeeNL/develop

Updated SI Snitch to Sitecore 10.0.0 - Merge Develop into Master
KayeeNL · Nov 5, 2020 · 2719f7e · 2719f7e
2 parents 9ec9414 + 0cd475a
commit 2719f7e
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 147 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ There are two ways to use this project:
 _Right click 'Save link as...' since GitHub doesn't respect url encoding, but markdown needs it for formatting in this readme ;-)_
 
 - [SI-Snitch for Sitecore-9.3](./Sitecore%20Packages/SI-Snitch%20for%20Sitecore-9.3.zip) ( Sitecore 9.3)
+- [SI-Snitch for Sitecore-10.0.0](./Sitecore%20Packages/SI-Snitch%20for%20Sitecore-10.0.0.zip) ( Sitecore 10.0.0)
 
 The above package can be installed through the normal Sitecore Installation Wizard.
 
@@ -58,6 +59,6 @@ _Originally developed by:_
 
 Derek Correia - Twitter: [@derekc](https://twitter.com/derekc), GitHub: https://github.com/derekcorreia
 
-_Upgraded to support Sitecore 9.3_
+_Upgraded to support Sitecore 9.3 & Sitecore 10.0.0_
 
 Robbert Hock - Twitter: [@kayeeNL](https://twitter.com/kayeenl), GitHub: https://github.com/KayeeNL
diff --git a/Sitecore Packages/SI-Snitch for Sitecore-10.0.0.zip b/Sitecore Packages/SI-Snitch for Sitecore-10.0.0.zip
diff --git a/Sitecore Packages/SI-Snitch for Sitecore.xml b/Sitecore Packages/SI-Snitch for Sitecore.xml
@@ -3,7 +3,7 @@
     <metadata>
       <PackageName>SI-Snitch for Sitecore</PackageName>
       <Author>Derek Correia &amp; Robbert Hock</Author>
-      <Version>9.3</Version>
+      <Version>10.0.0</Version>
       <Revision />
       <License />
       <Comment />

diff --git a/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs b/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SitecoreServices.SISnitch")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("A small utility for inspecting claims on a Sitecore instance that are coming from a Sitecore Identity Server.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SitecoreServices.SISnitch")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/SitecoreServices.SISnitch/SISnitch.cs b/SitecoreServices.SISnitch/SISnitch.cs
@@ -1,15 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
 using Sitecore.Owin.Authentication.Services;
-using Sitecore.Owin.Authentication.IdentityServer.Transformations;
 using Sitecore.Abstractions;
 using Sitecore.Diagnostics;
 
-namespace SitecoreServices.SISnitch 
+namespace SitecoreServices.SISnitch
 {
     public class Snitch : Transformation
     {

diff --git a/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj b/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj
diff --git a/SitecoreServices.SISnitch/app.config b/SitecoreServices.SISnitch/app.config
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <section name="configBuilders" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false" />
+  </configSections>
+  <configBuilders>
+    <builders>
+    <add name="Environment" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=1.0.0.0, Culture=neutral" /></builders>
+  </configBuilders>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -8,44 +15,48 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Protocols.WsFederation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>
diff --git a/SitecoreServices.SISnitch/packages.config b/SitecoreServices.SISnitch/packages.config
@@ -1,70 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EnterpriseLibrary.Common" version="6.0.1304.0" targetFramework="net471" />
-  <package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net471" />
-  <package id="EnterpriseLibrary.TransientFaultHandling.Caching" version="6.0.1304.0" targetFramework="net471" />
-  <package id="EnterpriseLibrary.TransientFaultHandling.Configuration" version="6.0.1304.0" targetFramework="net471" />
-  <package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net471" />
-  <package id="EnterpriseLibrary.TransientFaultHandling.ServiceBus" version="6.0.1304.0" targetFramework="net471" />
-  <package id="EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage" version="6.0.1304.0" targetFramework="net471" />
-  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net471" />
-  <package id="IdentityModel" version="3.7.0" targetFramework="net471" />
-  <package id="Lucene.Net" version="3.0.3" targetFramework="net471" />
-  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net471" />
-  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net471" />
-  <package id="Microsoft.AspNet.WebApi" version="5.2.6" targetFramework="net471" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net471" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net471" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.6" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" version="2.2.0" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Logging" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.IdentityModel.Logging" version="5.2.2" targetFramework="net471" />
-  <package id="Microsoft.IdentityModel.Protocols" version="5.2.2" targetFramework="net471" />
-  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.2.2" targetFramework="net471" />
-  <package id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.2.2" targetFramework="net471" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.2.2" targetFramework="net471" />
-  <package id="Microsoft.IdentityModel.Tokens.Saml" version="5.2.2" targetFramework="net471" />
-  <package id="Microsoft.IdentityModel.Xml" version="5.2.2" targetFramework="net471" />
-  <package id="Microsoft.Owin" version="4.0.0" targetFramework="net471" />
-  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.0" targetFramework="net471" />
-  <package id="Microsoft.Owin.Security" version="4.0.0" targetFramework="net471" />
-  <package id="Microsoft.Owin.Security.ActiveDirectory" version="4.0.0" targetFramework="net471" />
-  <package id="Microsoft.Owin.Security.Cookies" version="4.0.0" targetFramework="net471" />
-  <package id="Microsoft.Owin.Security.Jwt" version="4.0.0" targetFramework="net471" />
-  <package id="Microsoft.Owin.Security.OAuth" version="4.0.0" targetFramework="net471" />
-  <package id="Microsoft.Owin.Security.OpenIdConnect" version="4.0.0" targetFramework="net471" />
-  <package id="Mvp.Xml" version="2.3.0" targetFramework="net471" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" />
-  <package id="Owin" version="1.0" targetFramework="net471" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net471" />
-  <package id="Sitecore.Framework.Conditions" version="4.0.0" targetFramework="net471" />
-  <package id="Sitecore.Framework.Data.Blobs" version="1.0.0" targetFramework="net471" />
-  <package id="Sitecore.Framework.Data.Blobs.Abstractions" version="1.0.0" targetFramework="net471" />
-  <package id="Sitecore.Kernel" version="9.3.0" targetFramework="net471" />
-  <package id="Sitecore.Logging" version="9.3.0" targetFramework="net471" />
-  <package id="Sitecore.Logging.Client" version="9.3.0" targetFramework="net471" />
-  <package id="Sitecore.Nexus.Consumption" version="1.1.1" targetFramework="net471" />
-  <package id="Sitecore.Nexus.Licensing" version="2.0.6" targetFramework="net471" />
-  <package id="Sitecore.Owin" version="9.3.0" targetFramework="net471" />
-  <package id="Sitecore.Owin.Authentication" version="9.3.0" targetFramework="net471" />
-  <package id="Sitecore.Owin.Authentication.IdentityServer" version="9.3.0" targetFramework="net471" />
-  <package id="Sitecore.Zip" version="9.3.0" targetFramework="net471" />
-  <package id="System.Buffers" version="4.5.0" targetFramework="net471" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.2" targetFramework="net471" />
-  <package id="System.Memory" version="4.5.1" targetFramework="net471" />
-  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net471" />
-  <package id="System.Security.AccessControl" version="4.5.0" targetFramework="net471" />
-  <package id="System.Security.Cryptography.Xml" version="4.5.0" targetFramework="net471" />
-  <package id="System.Security.Permissions" version="4.5.0" targetFramework="net471" />
-  <package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net471" />
-  <package id="System.Text.Encodings.Web" version="4.4.0" targetFramework="net471" />
+  <package id="EnterpriseLibrary.Common" version="6.0.1304.0" targetFramework="net48" />
+  <package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net48" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.Caching" version="6.0.1304.0" targetFramework="net48" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.Configuration" version="6.0.1304.0" targetFramework="net48" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net48" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.ServiceBus" version="6.0.1304.0" targetFramework="net48" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage" version="6.0.1304.0" targetFramework="net48" />
+  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net48" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.6" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.6" targetFramework="net48" />
+  <package id="Microsoft.Configuration.ConfigurationBuilders.Base" version="1.0.2" targetFramework="net48" />
+  <package id="Microsoft.Configuration.ConfigurationBuilders.Environment" version="1.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" version="2.2.0" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Protocols" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Tokens.Saml" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Xml" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.Owin" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.Owin.Security" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.Owin.Security.ActiveDirectory" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.Owin.Security.Cookies" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.Owin.Security.Jwt" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.1.0" targetFramework="net48" />
+  <package id="Mvp.Xml" version="2.3.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net48" />
+  <package id="Owin" version="1.0" targetFramework="net48" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net48" />
+  <package id="Sitecore.Framework.Conditions" version="4.2.0" targetFramework="net48" />
+  <package id="Sitecore.Framework.Data.Blobs" version="1.1.0" targetFramework="net48" />
+  <package id="Sitecore.Framework.Data.Blobs.Abstractions" version="1.1.0" targetFramework="net48" />
+  <package id="Sitecore.Kernel" version="10.0.0" targetFramework="net48" />
+  <package id="Sitecore.Logging" version="10.0.0" targetFramework="net48" />
+  <package id="Sitecore.Logging.Client" version="10.0.0" targetFramework="net48" />
+  <package id="Sitecore.Nexus.Consumption" version="1.2.0" targetFramework="net48" />
+  <package id="Sitecore.Nexus.Licensing" version="2.0.6" targetFramework="net48" />
+  <package id="Sitecore.Owin" version="10.0.0" targetFramework="net48" />
+  <package id="Sitecore.Owin.Authentication" version="10.0.0" targetFramework="net48" />
+  <package id="Sitecore.Zip" version="10.0.0" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.0" targetFramework="net48" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.3.0" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.1" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net48" />
+  <package id="System.Security.AccessControl" version="4.5.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Xml" version="4.5.0" targetFramework="net48" />
+  <package id="System.Security.Permissions" version="4.5.0" targetFramework="net48" />
+  <package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net48" />
 </packages>