From eb192d2a42b7179e42773ae9bea9f05dad8f0f6a Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:13:30 +0200 Subject: [PATCH 1/6] Backport changes from original project "Commit 06a84eb" See PR 179 Co-Authored-By: Alexander <13603921+AleF83@users.noreply.github.com> Co-Authored-By: gentoo90 --- src/Helpers/AspNetServicesHelper.cs | 12 ++++++------ src/Program.cs | 18 ++---------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/Helpers/AspNetServicesHelper.cs b/src/Helpers/AspNetServicesHelper.cs index e156a74..3596f46 100644 --- a/src/Helpers/AspNetServicesHelper.cs +++ b/src/Helpers/AspNetServicesHelper.cs @@ -6,19 +6,19 @@ namespace OpenIdConnectServer.Helpers { public class AspNetServicesOptions { - public AspNetCorsOptions Cors { get; set; } + public AspNetCorsOptions? Cors { get; set; } - public IDictionary Authentication { get; set; } - public SessionOptions Session { get; set; } + public IDictionary? Authentication { get; set; } + public SessionOptions? Session { get; set; } - public ForwardedHeadersOptions ForwardedHeadersOptions { get; set; } + public ForwardedHeadersOptions? ForwardedHeadersOptions { get; set; } - public string BasePath { get; set; } + public string? BasePath { get; set; } } public class AuthenticationOptions { - public CookieAuthenticationOptions CookieAuthenticationOptions { get; set; } + public CookieAuthenticationOptions? CookieAuthenticationOptions { get; set; } } public static class AspNetServicesHelper diff --git a/src/Program.cs b/src/Program.cs index 8375efe..2ded708 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -53,6 +53,7 @@ var app = builder.Build(); +app.UsePathBase(Config.GetAspNetServicesOptions().BasePath); var aspNetServicesOptions = Config.GetAspNetServicesOptions(); AspNetServicesHelper.ConfigureAspNetServices(builder.Services, aspNetServicesOptions); @@ -65,16 +66,6 @@ app.UseIdentityServer(); -var basePath = Config.GetAspNetServicesOptions().BasePath; -if (!string.IsNullOrEmpty(basePath)) -{ - app.UseWhen(ctx => ctx.Request.Path.StartsWithSegments(basePath), appBuilder => - { - appBuilder.UseMiddleware(); - appBuilder.UseMiddleware(); - }); -} - app.UseHttpsRedirection(); var manifestEmbeddedProvider = new ManifestEmbeddedFileProvider(typeof(Program).Assembly, "wwwroot"); @@ -84,13 +75,8 @@ }); app.UseRouting(); - app.UseAuthorization(); -app.UseEndpoints(endpoints => - { - endpoints.MapDefaultControllerRoute(); - }); - +app.MapDefaultControllerRoute(); app.MapRazorPages(); app.Run(); From 4a19dec8c988970dcb341ab459ee2fdaa47794b2 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:14:18 +0200 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44c3e47..796e438 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.0.10 +* Backported some cleanup commits from upstream +* Updated dependencies + # 1.0.9 * Updated dependencies From 307e8183d1a315306d2ec692175621a2da4639dc Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 21 May 2025 15:33:45 +0200 Subject: [PATCH 3/6] Improve bug report template --- .github/ISSUE_TEMPLATE/bug_report.yml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index a61d834..033bcdb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -33,6 +33,15 @@ body: validations: required: true + - type: textarea + id: description + attributes: + label: Description of the problem + description: | + Describe as exactly as possible what is not working. + validations: + required: true + - type: textarea id: steps-to-reproduce attributes: @@ -47,20 +56,6 @@ body: validations: required: true - - type: textarea - id: expected-behavior - attributes: - label: Expected behavior - description: | - Tell us what you expect to happen. - - - type: textarea - id: actual-behavior - attributes: - label: Actual behavior - description: | - Tell us what happens with the steps given above. - - type: textarea id: additional-information attributes: From 3863e3c8ff3959168ea26ae0a7394c2b5cd95312 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 4 Jun 2025 04:15:24 +0000 Subject: [PATCH 4/6] Update aquasecurity/trivy-action action to v0.31.0 --- .github/workflows/image-vuln-scan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image-vuln-scan.yml b/.github/workflows/image-vuln-scan.yml index 06f5afa..39f1730 100644 --- a/.github/workflows/image-vuln-scan.yml +++ b/.github/workflows/image-vuln-scan.yml @@ -20,13 +20,13 @@ jobs: - uses: actions/checkout@v4 - name: Scan - Full - uses: aquasecurity/trivy-action@0.30.0 + uses: aquasecurity/trivy-action@0.31.0 with: image-ref: ${{ env.TRIVYY_IMAGE_REF }} - name: Scan - Relevant id: scan_relevant - uses: aquasecurity/trivy-action@0.30.0 + uses: aquasecurity/trivy-action@0.31.0 with: image-ref: ${{ env.TRIVYY_IMAGE_REF }} exit-code: 1 From c12bee8138cff5d58ec83f08c8a1051713aa5ec8 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 5 Jun 2025 04:16:47 +0000 Subject: [PATCH 5/6] Update dependency Duende.IdentityServer to 7.2.4 --- src/OpenIdConnectServerMock.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenIdConnectServerMock.csproj b/src/OpenIdConnectServerMock.csproj index c25fdae..3cb946f 100644 --- a/src/OpenIdConnectServerMock.csproj +++ b/src/OpenIdConnectServerMock.csproj @@ -26,7 +26,7 @@ - + From 5df126093cba04dfa49355e005f6398226e6cb8c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 11 Jun 2025 04:17:23 +0000 Subject: [PATCH 6/6] Update dotnet.aspnetcore to 8.0.17 --- src/OpenIdConnectServerMock.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenIdConnectServerMock.csproj b/src/OpenIdConnectServerMock.csproj index 3cb946f..63ece27 100644 --- a/src/OpenIdConnectServerMock.csproj +++ b/src/OpenIdConnectServerMock.csproj @@ -27,8 +27,8 @@ - - + +