diff --git a/README.md b/README.md index d853f47..ff85ea6 100644 --- 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 new file mode 100644 index 0000000..5f0053b Binary files /dev/null and b/Sitecore Packages/SI-Snitch for Sitecore-10.0.0.zip differ diff --git a/Sitecore Packages/SI-Snitch for Sitecore.xml b/Sitecore Packages/SI-Snitch for Sitecore.xml index 3b5b2e6..45af944 100644 --- a/Sitecore Packages/SI-Snitch for Sitecore.xml +++ b/Sitecore Packages/SI-Snitch for Sitecore.xml @@ -3,7 +3,7 @@ SI-Snitch for Sitecore Derek Correia & Robbert Hock - 9.3 + 10.0.0 diff --git a/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs b/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs index d48336f..eeeaa81 100644 --- 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 index f404c69..7fcdddf 100644 --- 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 index 012b617..a1cf3d3 100644 --- a/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj +++ b/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj @@ -9,8 +9,9 @@ Properties SitecoreServices.SISnitch SitecoreServices.SISnitch - v4.7.1 + v4.8 512 + true @@ -36,9 +37,6 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\IdentityModel.3.7.0\lib\net452\IdentityModel.dll - ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll @@ -48,6 +46,12 @@ ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll + + ..\packages\Microsoft.Configuration.ConfigurationBuilders.Base.1.0.2\lib\Net471\Microsoft.Configuration.ConfigurationBuilders.Base.dll + + + ..\packages\Microsoft.Configuration.ConfigurationBuilders.Environment.1.0.2\lib\Net471\Microsoft.Configuration.ConfigurationBuilders.Environment.dll + ..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll @@ -78,50 +82,50 @@ ..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\packages\Microsoft.IdentityModel.Logging.5.2.2\lib\net451\Microsoft.IdentityModel.Logging.dll + + ..\packages\Microsoft.IdentityModel.JsonWebTokens.5.3.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll - - ..\packages\Microsoft.IdentityModel.Protocols.5.2.2\lib\net451\Microsoft.IdentityModel.Protocols.dll + + ..\packages\Microsoft.IdentityModel.Logging.5.3.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.2.2\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll + + ..\packages\Microsoft.IdentityModel.Protocols.5.3.0\lib\net461\Microsoft.IdentityModel.Protocols.dll - - ..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.2\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll + + ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.3.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll - - ..\packages\Microsoft.IdentityModel.Tokens.5.2.2\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.3.0\lib\net461\Microsoft.IdentityModel.Protocols.WsFederation.dll - - ..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.2\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\packages\Microsoft.IdentityModel.Tokens.5.3.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\packages\Microsoft.IdentityModel.Xml.5.2.2\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\packages\Microsoft.IdentityModel.Tokens.Saml.5.3.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\packages\Microsoft.IdentityModel.Xml.5.3.0\lib\net461\Microsoft.IdentityModel.Xml.dll - - ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll + + ..\packages\Microsoft.Owin.4.1.0\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Security.4.0.0\lib\net451\Microsoft.Owin.Security.dll + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - ..\packages\Microsoft.Owin.Security.ActiveDirectory.4.0.0\lib\net451\Microsoft.Owin.Security.ActiveDirectory.dll + + ..\packages\Microsoft.Owin.Security.4.1.0\lib\net45\Microsoft.Owin.Security.dll - - ..\packages\Microsoft.Owin.Security.Cookies.4.0.0\lib\net451\Microsoft.Owin.Security.Cookies.dll + + ..\packages\Microsoft.Owin.Security.ActiveDirectory.4.1.0\lib\net45\Microsoft.Owin.Security.ActiveDirectory.dll - - ..\packages\Microsoft.Owin.Security.Jwt.4.0.0\lib\net451\Microsoft.Owin.Security.Jwt.dll + + ..\packages\Microsoft.Owin.Security.Cookies.4.1.0\lib\net45\Microsoft.Owin.Security.Cookies.dll - - ..\packages\Microsoft.Owin.Security.OAuth.4.0.0\lib\net451\Microsoft.Owin.Security.OAuth.dll + + ..\packages\Microsoft.Owin.Security.Jwt.4.1.0\lib\net45\Microsoft.Owin.Security.Jwt.dll - - ..\packages\Microsoft.Owin.Security.OpenIdConnect.4.0.0\lib\net451\Microsoft.Owin.Security.OpenIdConnect.dll + + ..\packages\Microsoft.Owin.Security.OAuth.4.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll ..\packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.Common.dll @@ -153,41 +157,38 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\packages\Sitecore.Framework.Conditions.4.0.0\lib\netstandard2.0\Sitecore.Framework.Conditions.dll + + ..\packages\Sitecore.Framework.Conditions.4.2.0\lib\netstandard2.0\Sitecore.Framework.Conditions.dll - - ..\packages\Sitecore.Framework.Data.Blobs.1.0.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.dll + + ..\packages\Sitecore.Framework.Data.Blobs.1.1.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.dll - - ..\packages\Sitecore.Framework.Data.Blobs.Abstractions.1.0.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.Abstractions.dll + + ..\packages\Sitecore.Framework.Data.Blobs.Abstractions.1.1.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.Abstractions.dll - - ..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll + + ..\packages\Sitecore.Kernel.10.0.0\lib\net48\Sitecore.Kernel.dll - - ..\packages\Sitecore.Logging.9.3.0\lib\net471\Sitecore.Logging.dll + + ..\packages\Sitecore.Logging.10.0.0\lib\net48\Sitecore.Logging.dll - - ..\packages\Sitecore.Logging.Client.9.3.0\lib\net471\Sitecore.Logging.Client.dll + + ..\packages\Sitecore.Logging.Client.10.0.0\lib\net48\Sitecore.Logging.Client.dll - ..\packages\Sitecore.Nexus.Consumption.1.1.1\lib\netstandard2.0\Sitecore.Nexus.Consumption.dll + ..\packages\Sitecore.Nexus.Consumption.1.2.0\lib\netstandard2.0\Sitecore.Nexus.Consumption.dll ..\packages\Sitecore.Nexus.Licensing.2.0.6\lib\netstandard2.0\Sitecore.Nexus.Licensing.dll - - ..\packages\Sitecore.Owin.9.3.0\lib\net471\Sitecore.Owin.dll + + ..\packages\Sitecore.Owin.10.0.0\lib\net48\Sitecore.Owin.dll - - ..\packages\Sitecore.Owin.Authentication.9.3.0\lib\net471\Sitecore.Owin.Authentication.dll + + ..\packages\Sitecore.Owin.Authentication.10.0.0\lib\net48\Sitecore.Owin.Authentication.dll - - ..\packages\Sitecore.Owin.Authentication.IdentityServer.9.3.0\lib\net471\Sitecore.Owin.Authentication.IdentityServer.dll - - - ..\packages\Sitecore.Zip.9.3.0\lib\net471\Sitecore.Zip.dll + + ..\packages\Sitecore.Zip.10.0.0\lib\net48\Sitecore.Zip.dll @@ -201,9 +202,10 @@ - - ..\packages\System.IdentityModel.Tokens.Jwt.5.2.2\lib\net451\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.5.3.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll + @@ -242,9 +244,6 @@ - - ..\packages\System.Text.Encodings.Web.4.4.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - diff --git a/SitecoreServices.SISnitch/app.config b/SitecoreServices.SISnitch/app.config index 6acda81..eb7e23d 100644 --- a/SitecoreServices.SISnitch/app.config +++ b/SitecoreServices.SISnitch/app.config @@ -1,5 +1,12 @@  + +
+ + + + + @@ -8,27 +15,27 @@ - + - + - + - + - + - + @@ -36,16 +43,20 @@ - + - + + + + + - \ No newline at end of file + diff --git a/SitecoreServices.SISnitch/packages.config b/SitecoreServices.SISnitch/packages.config index 2fbb624..0df8fd0 100644 --- a/SitecoreServices.SISnitch/packages.config +++ b/SitecoreServices.SISnitch/packages.config @@ -1,70 +1,69 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file