From 9fde241d1efd5f519d02de03f3d1c029d3f8985d Mon Sep 17 00:00:00 2001 From: Dario Ghunney Ware Date: Tue, 21 Oct 2025 14:15:30 +0100 Subject: [PATCH] Little cleanup --- .../stirling/software/common/model/ApplicationProperties.java | 3 ++- app/core/src/main/resources/settings.yml.template | 2 +- .../proprietary/security/CustomLogoutSuccessHandler.java | 3 ++- .../security/configuration/SecurityConfiguration.java | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java index 7bab01135..c1406743c 100644 --- a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java +++ b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java @@ -349,7 +349,8 @@ public class ApplicationProperties { @Data public static class RateLimit { private int maxRequests = 1000; - private String resetSchedule = "0 0 0 * * MON"; // Cron expression: At 00:00 every Monday + private String resetSchedule = + "0 0 0 * * MON"; // Cron expression: At 00:00 every Monday } } diff --git a/app/core/src/main/resources/settings.yml.template b/app/core/src/main/resources/settings.yml.template index ebfdc8afe..4cbed0cc8 100644 --- a/app/core/src/main/resources/settings.yml.template +++ b/app/core/src/main/resources/settings.yml.template @@ -20,7 +20,7 @@ security: username: '' # initial username for the first login password: '' # initial password for the first login oauth2: - enabled: true # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work) + enabled: false # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work) client: keycloak: issuer: '' # URL of the Keycloak realm's OpenID Connect Discovery endpoint diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java index 9a8c74eac..c94c2b607 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java @@ -115,7 +115,8 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { samlClient.setSPKeys(certificate, privateKey); // Build relay state to return user to login page after IdP logout - String relayState = UrlUtils.getOrigin(request) + request.getContextPath() + LOGOUT_PATH; + String relayState = + UrlUtils.getOrigin(request) + request.getContextPath() + LOGOUT_PATH; // Redirect to identity provider for logout with relay state samlClient.redirectToIdentityProvider(response, relayState, nameIdValue); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java index 387bfc6bb..956dc44c6 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java @@ -137,7 +137,6 @@ public class SecurityConfiguration { .addFilterBefore( rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class) .addFilterAfter(firstLoginFilter, IPRateLimitingFilter.class); - // http.addFilterAfter(firstLoginFilter, IPRateLimitingFilter.class); if (v2Enabled) { http.addFilterBefore(jwtAuthenticationFilter(), UserAuthenticationFilter.class);