Skip to content

Commit 2bdc954

Browse files
committed
Fix #30571: fix NPE in OpenIdReAuthorizeFilter
1 parent aed75c9 commit 2bdc954

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/auth/impl/oidc/OpenIdReAuthorizeFilter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,10 @@ protected void doFilterInternal(@Nonnull HttpServletRequest request, @Nonnull Ht
109109
* See {@link RefreshTokenOAuth2AuthorizedClientProvider}
110110
*/
111111
private boolean accessTokenExpired(OAuth2AuthorizedClient authorizedClient) {
112-
return authorizedClient.getAccessToken().getExpiresAt() == null ||
113-
clock.instant().isAfter(authorizedClient.getAccessToken().getExpiresAt().minus(this.clockSkew));
112+
if (authorizedClient == null || authorizedClient.getAccessToken() == null || authorizedClient.getAccessToken().getExpiresAt() == null) {
113+
return true;
114+
}
115+
return clock.instant().isAfter(authorizedClient.getAccessToken().getExpiresAt().minus(this.clockSkew));
114116
}
115117

116118
}

0 commit comments

Comments
 (0)