Merge pull request #942 from ITfoxtec/test

Test
ITfoxtec · Sep 4, 2024 · fb38649 · fb38649
2 parents 554aa5e + ad76399
commit fb38649
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 35 deletions.
diff --git a/src/FoxIDs.Control/Controllers/Parties/TSamlUpPartyReadMetadataController.cs b/src/FoxIDs.Control/Controllers/Parties/TSamlUpPartyReadMetadataController.cs
@@ -41,10 +41,10 @@ public TSamlUpPartyReadMetadataController(TelemetryScopedLogger logger, IMapper
                 {
                     case Api.SamlReadMetadataType.Url:
                         samlUpParty.MetadataUrl = samlReadMetadataRequest.Metadata;
-                        await samlMetadataReadLogic.PopulateModelAsync(samlUpParty);
+                        samlUpParty = await samlMetadataReadLogic.PopulateModelAsync(samlUpParty);
                         break;
                     case Api.SamlReadMetadataType.Xml:
-                        await samlMetadataReadLogic.PopulateModelAsync(samlUpParty, samlReadMetadataRequest.Metadata);
+                        samlUpParty = await samlMetadataReadLogic.PopulateModelAsync(samlUpParty, samlReadMetadataRequest.Metadata);
                         break;
                     default:
                         throw new NotSupportedException();

diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.9.27</Version>
+		<Version>1.9.28</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Control/Logic/OidcDiscoveryReadUpLogic.cs b/src/FoxIDs.Control/Logic/OidcDiscoveryReadUpLogic.cs
@@ -25,7 +25,7 @@ public async Task<bool> PopulateModelAsync(ModelStateDictionary modelState, MPar
             {
                 if (mp.UpdateState != PartyUpdateStates.Manual)
                 {
-                    await oidcDiscoveryReadModelLogic.PopulateModelAsync(mp);
+                    _ = await oidcDiscoveryReadModelLogic.PopulateModelAsync(mp);
 
                     if(mp.UpdateState == PartyUpdateStates.AutomaticStopped)
                     {

diff --git a/src/FoxIDs.Control/Logic/SamlMetadataReadUpLogic.cs b/src/FoxIDs.Control/Logic/SamlMetadataReadUpLogic.cs
@@ -25,7 +25,7 @@ public async Task<bool> PopulateModelAsync(ModelStateDictionary modelState, Saml
             {
                 if (mp.UpdateState != PartyUpdateStates.Manual)
                 {
-                    await samlMetadataReadLogic.PopulateModelAsync(mp);
+                    _ = await samlMetadataReadLogic.PopulateModelAsync(mp);
 
                     if (mp.UpdateState == PartyUpdateStates.AutomaticStopped)
                     {

diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.9.27</Version>
+		<Version>1.9.28</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.9.27</Version>
+		<Version>1.9.28</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/src/FoxIDs.Shared/FoxIDs.Shared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.9.27</Version>
+		<Version>1.9.28</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/Infrastructure/Filters/HttpSecurityHeadersAttribute.cs b/src/FoxIDs.Shared/Infrastructure/Filters/HttpSecurityHeadersAttribute.cs
@@ -45,8 +45,6 @@ protected virtual void ActionExecutionInit(ActionExecutedContext resultContext)
 
             protected virtual void SetHeaders(HttpContext httpContext)
             {
-                logger.ScopeTrace(() => $"Adding http security headers. Is {(isHtmlContent ? string.Empty : "not")} view.");
-
                 httpContext.Response.SetHeader("X-Content-Type-Options", "nosniff");
                 httpContext.Response.SetHeader("Referrer-Policy", "no-referrer");
                 httpContext.Response.SetHeader("X-XSS-Protection", "1; mode=block");
@@ -62,8 +60,6 @@ protected virtual void SetHeaders(HttpContext httpContext)
                     httpContext.Response.SetHeader("Content-Security-Policy", csp);
                     httpContext.Response.SetHeader("X-Content-Security-Policy", csp);
                 }
-
-                logger.ScopeTrace(() => $"Http security headers added.");
             }       
 
             protected virtual void HeaderXFrameOptions(HttpContext httpContext)

diff --git a/src/FoxIDs.Shared/Logic/Parties/OidcDiscoveryReadModelLogic.cs b/src/FoxIDs.Shared/Logic/Parties/OidcDiscoveryReadModelLogic.cs
@@ -14,7 +14,7 @@ public class OidcDiscoveryReadModelLogic<MParty, MClient> : OidcDiscoveryReadLog
         public OidcDiscoveryReadModelLogic(IHttpClientFactory httpClientFactory) : base(httpClientFactory) 
         { }
 
-        public async Task PopulateModelAsync(MParty party)
+        public async Task<MParty> PopulateModelAsync(MParty party)
         {
             (var oidcDiscovery, var jsonWebKeySet) = await GetOidcDiscoveryAndValidateAsync(party.Authority);
 
@@ -60,6 +60,8 @@ public async Task PopulateModelAsync(MParty party)
                     key.X5tS256 = null;
                 }
             }
+
+            return party;
         }
 
         private void CorrectFacebookOidcDiscoveryAddTokenEndpoint(OidcDiscovery oidcDiscovery)

diff --git a/src/FoxIDs.Shared/Logic/Parties/SamlMetadataReadLogic.cs b/src/FoxIDs.Shared/Logic/Parties/SamlMetadataReadLogic.cs
@@ -20,10 +20,10 @@ public SamlMetadataReadLogic(IHttpClientFactory httpClientFactory)
             this.httpClientFactory = httpClientFactory;
         }
 
-        public async Task PopulateModelAsync(SamlUpParty party)
+        public async Task<SamlUpParty> PopulateModelAsync(SamlUpParty party)
         {
             var metadata = await ReadMetadataAsync(party.MetadataUrl);
-            await PopulateModelAsync(party, metadata);
+            return await PopulateModelAsync(party, metadata);
         }
 
         private async Task<string> ReadMetadataAsync(string metadataUrl)
@@ -42,7 +42,7 @@ private async Task<string> ReadMetadataAsync(string metadataUrl)
             }
         }
 
-        public async Task PopulateModelAsync(SamlUpParty party, string metadataXml)
+        public async Task<SamlUpParty> PopulateModelAsync(SamlUpParty party, string metadataXml)
         {
             if(metadataXml?.Length > Constants.Models.SamlParty.MetadataXmlSize)
             {
@@ -51,10 +51,10 @@ public async Task PopulateModelAsync(SamlUpParty party, string metadataXml)
 
             var entityDescriptor = new EntityDescriptor();
             entityDescriptor.ReadIdPSsoDescriptor(metadataXml);
-            await PopulateModelInternalAsync(party, entityDescriptor);
+            return await PopulateModelInternalAsync(party, entityDescriptor);
         }
 
-        private async Task PopulateModelInternalAsync(SamlUpParty party, EntityDescriptor entityDescriptor)
+        private async Task<SamlUpParty> PopulateModelInternalAsync(SamlUpParty party, EntityDescriptor entityDescriptor)
         {
             if (entityDescriptor.IdPSsoDescriptor != null)
             {
@@ -98,6 +98,8 @@ private async Task PopulateModelInternalAsync(SamlUpParty party, EntityDescripto
                 {
                     party.SignAuthnRequest = entityDescriptor.IdPSsoDescriptor.WantAuthnRequestsSigned.Value;
                 }
+
+                return party;
             }
             else
             {

diff --git a/src/FoxIDs.Shared/Repository/MongoDb/MongoDbRepositoryClient.cs b/src/FoxIDs.Shared/Repository/MongoDb/MongoDbRepositoryClient.cs
@@ -43,7 +43,7 @@ private void Init()
             }
             if (settings.Options.Cache == CacheOptions.MongoDb)
             {
-                _ = InitCollection<DataTtlDocument>(database, settings.MongoDb.CacheCollectionName);
+                InitTtlCollection<DataTtlDocument>(database, settings.MongoDb.CacheCollectionName);
             }
         }
 

diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.9.27</Version>
+		<Version>1.9.28</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/FoxIDs.csproj b/src/FoxIDs/FoxIDs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.9.27</Version>
+		<Version>1.9.28</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/Logic/Oidc/OidcAuthUpLogic.cs b/src/FoxIDs/Logic/Oidc/OidcAuthUpLogic.cs
@@ -98,7 +98,7 @@ public async Task<IActionResult> AuthenticationRequestAsync(string partyId)
             var party = await tenantDataRepository.GetAsync<TParty>(oidcUpSequenceData.UpPartyId);
             logger.SetScopeProperty(Constants.Logs.UpPartyClientId, party.Client.ClientId);
 
-            await oidcDiscoveryReadUpLogic.CheckOidcDiscoveryAndUpdatePartyAsync(party);
+            party = await oidcDiscoveryReadUpLogic.CheckOidcDiscoveryAndUpdatePartyAsync(party);
 
             var nonce = RandomGenerator.GenerateNonce();
             var loginCallBackUrl = HttpContext.GetUpPartyUrl(party.Name, Constants.Routes.OAuthController, Constants.Endpoints.AuthorizationResponse, partyBindingPattern: party.PartyBindingPattern);

diff --git a/src/FoxIDs/Logic/Oidc/OidcDiscoveryReadUpLogic.cs b/src/FoxIDs/Logic/Oidc/OidcDiscoveryReadUpLogic.cs
@@ -26,24 +26,24 @@ public OidcDiscoveryReadUpLogic(FoxIDsSettings settings, TelemetryScopedLogger l
             this.oidcDiscoveryReadModelLogic = oidcDiscoveryReadModelLogic;
         }
 
-        public async Task CheckOidcDiscoveryAndUpdatePartyAsync(TParty party)
+        public async Task<TParty> CheckOidcDiscoveryAndUpdatePartyAsync(TParty party)
         {
             if (party.UpdateState != PartyUpdateStates.Automatic)
             {
-                return;
+                return party;
             }
 
             var lastUpdated = DateTimeOffset.FromUnixTimeSeconds(party.LastUpdated);
             if (lastUpdated.AddSeconds(party.OidcDiscoveryUpdateRate.Value) >= DateTimeOffset.UtcNow)
             {
-                return;
+                return party;
             }
 
             var key = UpdateWaitPeriodKey(party.Id);
             if (await cacheProvider.ExistsAsync(key))
             {
                 logger.ScopeTrace(() => $"Authentication method '{party.Id}' not updated with OIDC discovery because another update is in progress.");
-                return;
+                return party;
             }
             else
             {
@@ -56,14 +56,14 @@ public async Task CheckOidcDiscoveryAndUpdatePartyAsync(TParty party)
                 party.UpdateState = PartyUpdateStates.AutomaticStopped;
                 await tenantDataRepository.SaveAsync(party);
                 await cacheProvider.DeleteAsync(FailingUpdateCountKey(party.Id));
-                return;
+                return party;
             }
 
             try
             {
                 try
                 {
-                    await oidcDiscoveryReadModelLogic.PopulateModelAsync(party);
+                    party = await oidcDiscoveryReadModelLogic.PopulateModelAsync(party);
                 }
                 catch (Exception ex)
                 {
@@ -80,6 +80,8 @@ public async Task CheckOidcDiscoveryAndUpdatePartyAsync(TParty party)
                 await cacheProvider.IncrementNumberAsync(FailingUpdateCountKey(party.Id));
                 logger.Warning(ex);
             }
+
+            return party;
         }
 
         private string UpdateWaitPeriodKey(string partyId)

diff --git a/src/FoxIDs/Logic/Saml/SamlAuthnUpLogic.cs b/src/FoxIDs/Logic/Saml/SamlAuthnUpLogic.cs
@@ -95,7 +95,7 @@ public async Task<IActionResult> AuthnRequestAsync(string partyId)
             }
 
             var party = await tenantDataRepository.GetAsync<SamlUpParty>(samlUpSequenceData.UpPartyId);
-            await samlMetadataReadUpLogic.CheckMetadataAndUpdateUpPartyAsync(party);
+            party = await samlMetadataReadUpLogic.CheckMetadataAndUpdateUpPartyAsync(party);
 
             switch (party.AuthnBinding.RequestBinding)
             {

diff --git a/src/FoxIDs/Logic/Saml/SamlMetadataReadUpLogic.cs b/src/FoxIDs/Logic/Saml/SamlMetadataReadUpLogic.cs
@@ -26,24 +26,24 @@ public SamlMetadataReadUpLogic(FoxIDsSettings settings, TelemetryScopedLogger lo
             this.samlMetadataReadLogic = samlMetadataReadLogic;
         }
 
-        public async Task CheckMetadataAndUpdateUpPartyAsync(SamlUpParty party)
+        public async Task<SamlUpParty> CheckMetadataAndUpdateUpPartyAsync(SamlUpParty party)
         {
             if (party.UpdateState != PartyUpdateStates.Automatic)
             {
-                return;
+                return party;
             }
 
             var lastUpdated = DateTimeOffset.FromUnixTimeSeconds(party.LastUpdated);
             if (lastUpdated.AddSeconds(party.MetadataUpdateRate.Value) >= DateTimeOffset.UtcNow)
             {
-                return;
+                return party;
             }
 
             var key = UpdateUpPartyWaitPeriodKey(party.Id);
             if (await cacheProvider.ExistsAsync(key))
             {
                 logger.ScopeTrace(() => $"Authentication method '{party.Id}' not updated with SAML 2.0 metadata because another update is in progress.");
-                return;
+                return party;
             }
             else
             {
@@ -56,14 +56,14 @@ public async Task CheckMetadataAndUpdateUpPartyAsync(SamlUpParty party)
                 party.UpdateState = PartyUpdateStates.AutomaticStopped;
                 await tenantDataRepository.SaveAsync(party);
                 await cacheProvider.DeleteAsync(FailingUpdateUpPartyCountKey(party.Id));
-                return;
+                return party;
             }
 
             try
             {
                 try
                 {
-                    await samlMetadataReadLogic.PopulateModelAsync(party);
+                    party = await samlMetadataReadLogic.PopulateModelAsync(party);
                 }
                 catch (Exception ex)
                 {
@@ -80,6 +80,8 @@ public async Task CheckMetadataAndUpdateUpPartyAsync(SamlUpParty party)
                 await cacheProvider.IncrementNumberAsync(FailingUpdateUpPartyCountKey(party.Id));
                 logger.Warning(ex);
             }
+
+            return party;
         }
 
         private string UpdateUpPartyWaitPeriodKey(string partyId)
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ private void Init() @@
                 }
                 if (settings.Options.Cache == CacheOptions.MongoDb)
                 {
-                    _ = InitCollection<DataTtlDocument>(database, settings.MongoDb.CacheCollectionName);
+                    InitTtlCollection<DataTtlDocument>(database, settings.MongoDb.CacheCollectionName);
                 }
             }
@@ Expand Down @@