Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-09-08 17:51:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(security): prevent NPE on logout when JWT service is unavailable (#4390)

Browse Source
This commit is contained in:
Ludy 2025-09-05 11:59:24 +02:00 committed by GitHub
parent dde6cc2d49
commit f14955a019
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java
View File

@ -71,9 +71,12 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
authentication.getClass().getSimpleName()); authentication.getClass().getSimpleName());
getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH); getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH);
} }
} else if (!jwtService.extractToken(request).isBlank()) { } else if (jwtService != null) {
jwtService.clearToken(response); String token = jwtService.extractToken(request);
getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH); if (token != null && !token.isBlank()) {
jwtService.clearToken(response);
getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH);
}
} else { } else {
// Redirect to login page after logout // Redirect to login page after logout
String path = checkForErrors(request); String path = checkForErrors(request);
@ -165,7 +168,8 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
log.info("Redirecting to Keycloak logout URL: {}", logoutUrl); log.info("Redirecting to Keycloak logout URL: {}", logoutUrl);
} else { } else {
log.info( log.info(
"No redirect URL for {} available. Redirecting to default logout URL: {}", "No redirect URL for {} available. Redirecting to default logout URL:"
+ " {}",
registrationId, registrationId,
logoutUrl); logoutUrl);
} }