Skip to content

Commit 8972e95

Browse files
committed
Fix NPE in OidcBackend::getLogoutSuccessHandler
1 parent 3326aaa commit 8972e95

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,13 @@ public void customizeContainerEnv(Map<String, String> env) {
162162
@Override
163163
public LogoutSuccessHandler getLogoutSuccessHandler() {
164164
return (httpServletRequest, httpServletResponse, authentication) -> {
165-
SpecExpressionContext context = SpecExpressionContext.create(authentication.getPrincipal(), authentication.getCredentials());
166-
String resolvedLogoutUrl = specExpressionResolver.evaluateToString(getLogoutSuccessURL(), context);
165+
String resolvedLogoutUrl;
166+
if (authentication != null) {
167+
SpecExpressionContext context = SpecExpressionContext.create(authentication.getPrincipal(), authentication.getCredentials());
168+
resolvedLogoutUrl = specExpressionResolver.evaluateToString(getLogoutSuccessURL(), context);
169+
} else {
170+
resolvedLogoutUrl = getLogoutSuccessURL();
171+
}
167172

168173
SimpleUrlLogoutSuccessHandler delegate = new SimpleUrlLogoutSuccessHandler();
169174
delegate.setDefaultTargetUrl(resolvedLogoutUrl);

0 commit comments

Comments
 (0)