Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] further refresh_token debugging #685

Closed
wants to merge 2 commits into from
Closed

[WIP] further refresh_token debugging #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4ecaa3
[WIP] further rfresh_token debugging
michalskrivanek Sep 28, 2022
c66bace
Update OAuthRevokeServlet.java
michalskrivanek Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...odules/enginesso/src/main/java/org/ovirt/engine/core/sso/service/TokenCleanupService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,20 @@ public static void cleanupSsoSession(
log.debug("No existing Session found for token: {}, cannot invalidate session",
ssoSession.getAccessToken());
} else {
log.debug("Existing Session found for token: {}, invalidating session", ssoSession.getAccessToken());
log.debug("Existing Session found for token: {}, refresh_token: {}, invalidating session",
ssoSession.getAccessToken(), refreshToken);
try {
existingSession.invalidate();
} catch (IllegalStateException ex) {
log.debug("Unable to cleanup SsoSession: {}", ex.getMessage());
}
}
if (ssoContext.getSsoLocalConfig().getBoolean("ENGINE_SSO_ENABLE_EXTERNAL_SSO")) {
log.debug("Existing Session found for token: {}, invalidating session on external OP",
ssoSession.getAccessToken());
ExternalOIDCService.logout(ssoContext, refreshToken);
log.debug("Existing Session found for token: {}, refresh_token: {}, invalidating session on external OP",
ssoSession.getAccessToken(), refreshToken);
if (refreshToken != null) {
ExternalOIDCService.logout(ssoContext, refreshToken);
}
}
invokeAuthnLogout(ssoContext, ssoSession);
SsoService.notifyClientsOfLogoutEvent(ssoContext,
Expand Down
6 changes: 4 additions & 2 deletions ...odules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/OAuthRevokeServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)

SsoSession ssoSession = ssoContext.getSsoSession(token);
if (ssoSession != null) {
log.debug("refresh_token: {}", ssoSession.getRefreshToken());
Set<String> associatedClientIds = new TreeSet<>(ssoSession.getAssociatedClientIds());
boolean revokeAllScope = SsoService.scopeAsList(scope).contains("ovirt-ext=revoke:revoke-all");
if (revokeAllScope) {
Expand All @@ -55,10 +56,11 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
ssoSession.getAssociatedClientIds().remove(clientIdAndSecret[0]);
}
if (revokeAllScope || ssoSession.getAssociatedClientIds().isEmpty()) {
log.info("User {}@{} with profile [{}] successfully logged out",
log.info("User {}@{} with profile [{}] successfully logged out, refresh_token: {}",
SsoService.getUserId(ssoSession.getPrincipalRecord()),
ssoContext.getUserAuthzName(ssoSession),
ssoSession.getProfile());
ssoSession.getProfile(),
ssoSession.getRefreshToken());
TokenCleanupService.cleanupSsoSession(ssoContext, ssoSession, associatedClientIds);
}
}
Expand Down