update some dependencies and make it more stable against null ref

paule96 · paule96 · commit a4f89b6a390f · 2022-10-31T17:47:02.000+01:00
diff --git a/samples/CZ.AspNetCore.EasyAuthAuthentication.Samples.Client/CZ.AspNetCore.EasyAuthAuthentication.Samples.Client.csproj b/samples/CZ.AspNetCore.EasyAuthAuthentication.Samples.Client/CZ.AspNetCore.EasyAuthAuthentication.Samples.Client.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.6" />
+    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/CZ.AspNetCore.EasyAuthAuthentication.Samples.Web/CZ.AspNetCore.EasyAuthAuthentication.Samples.Web.csproj b/samples/CZ.AspNetCore.EasyAuthAuthentication.Samples.Web/CZ.AspNetCore.EasyAuthAuthentication.Samples.Web.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.30" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CZ.AspNetCore.EasyAuthAuthentication/CZ.AspNetCore.EasyAuthAuthentication.csproj b/src/CZ.AspNetCore.EasyAuthAuthentication/CZ.AspNetCore.EasyAuthAuthentication.csproj
@@ -47,12 +47,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.24.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/CZ.AspNetCore.EasyAuthAuthentication/Services/Base/EasyAuthWithHeaderService.cs b/src/CZ.AspNetCore.EasyAuthAuthentication/Services/Base/EasyAuthWithHeaderService.cs
@@ -2,6 +2,7 @@ namespace CZ.AspNetCore.EasyAuthAuthentication.Services.Base
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Security.Claims;
     using System.Text;
     using CZ.AspNetCore.EasyAuthAuthentication.Interfaces;
@@ -87,8 +88,8 @@ private AuthenticationTicket BuildIdentityFromEasyAuthRequestHeaders(IHeaderDict
                             Convert.FromBase64String(headerContent)
                         )
                     );
-            var claims = JsonConvert.DeserializeObject<IEnumerable<AADClaimsModel>>(xMsClientPrincipal["claims"].ToString());
-            return AuthenticationTicketBuilder.Build(claims, providerName, options);
+            var claims = JsonConvert.DeserializeObject<IEnumerable<AADClaimsModel>>(xMsClientPrincipal["claims"]?.ToString() ?? "[]");
+            return AuthenticationTicketBuilder.Build(claims ?? Enumerable.Empty<AADClaimsModel>(), providerName, options);
         }
 
         bool IEasyAuthAuthentificationService.CanHandleAuthentification(HttpContext httpContext) => this.CanHandleAuthentification(httpContext);
diff --git a/src/CZ.AspNetCore.EasyAuthAuthentication/Services/LocalAuthMeService.cs b/src/CZ.AspNetCore.EasyAuthAuthentication/Services/LocalAuthMeService.cs
@@ -5,6 +5,7 @@ namespace CZ.AspNetCore.EasyAuthAuthentication.Services
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Net;
     using System.Net.Http;
     using System.Security.Claims;
@@ -87,12 +88,12 @@ private async Task<AuthenticationTicket> CreateUserTicket()
 
         private AuthenticationTicket BuildIdentityFromEasyAuthMeJson(JObject payload)
         {
-            var providerName = payload["provider_name"].Value<string>();
+            var providerName = payload["provider_name"]?.Value<string>();
             this.Logger.LogDebug($"payload was fetched from easyauth me json, provider: {providerName}");
 
             this.Logger.LogInformation("building claims from payload...");
             return AuthenticationTicketBuilder.Build(
-                    JsonConvert.DeserializeObject<IEnumerable<AADClaimsModel>>(payload["user_claims"].ToString()),
+                    JsonConvert.DeserializeObject<IEnumerable<AADClaimsModel>>(payload["user_claims"]?.ToString() ?? "[]") ?? Enumerable.Empty<AADClaimsModel>(),
                     providerName,
                     this.defaultOptions.GetProviderOptions()
                 );
diff --git a/test/CZ.AspNetCore.EasyAuthAuthentication.Test/CZ.AspNetCore.EasyAuthAuthentication.Test.csproj b/test/CZ.AspNetCore.EasyAuthAuthentication.Test/CZ.AspNetCore.EasyAuthAuthentication.Test.csproj
@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ namespace CZ.AspNetCore.EasyAuthAuthentication.Services.Base`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
	`5`	`+ using System.Linq;`
`5`	`6`	`using System.Security.Claims;`
`6`	`7`	`using System.Text;`
`7`	`8`	`using CZ.AspNetCore.EasyAuthAuthentication.Interfaces;`
`@@ -87,8 +88,8 @@ private AuthenticationTicket BuildIdentityFromEasyAuthRequestHeaders(IHeaderDict`
`87`	`88`	`Convert.FromBase64String(headerContent)`
`88`	`89`	`)`
`89`	`90`	`);`
`90`		`- var claims = JsonConvert.DeserializeObject<IEnumerable<AADClaimsModel>>(xMsClientPrincipal["claims"].ToString());`
`91`		`- return AuthenticationTicketBuilder.Build(claims, providerName, options);`
	`91`	`+ var claims = JsonConvert.DeserializeObject<IEnumerable<AADClaimsModel>>(xMsClientPrincipal["claims"]?.ToString() ?? "[]");`
	`92`	`+ return AuthenticationTicketBuilder.Build(claims ?? Enumerable.Empty<AADClaimsModel>(), providerName, options);`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`bool IEasyAuthAuthentificationService.CanHandleAuthentification(HttpContext httpContext) => this.CanHandleAuthentification(httpContext);`