From 8d8a63c364818b969f90badeb271df3988e8ff56 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 08:47:17 +0000
Subject: [PATCH] Update to Keycloak 21.1.1
---
src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
index 339051f..103249f 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
@@ -6,7 +6,7 @@
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
import org.keycloak.models.ClientModel;
-import org.keycloak.models.RealmModel;
+import org.keycloak.models.KeycloakSession;
import org.keycloak.protocol.AuthorizationEndpointBase;
import org.keycloak.protocol.cas.CASLoginProtocol;
import org.keycloak.protocol.oidc.utils.RedirectUtils;
@@ -26,15 +26,22 @@
private AuthenticationSessionModel authenticationSession;
private String redirectUri;
- public AuthorizationEndpoint(RealmModel realm, EventBuilder event) {
- super(realm, event);
+ public AuthorizationEndpoint(KeycloakSession session, EventBuilder event) {
+ super(session, event);
event.event(EventType.LOGIN);
}
@GET
public Response build() {
- MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
+ MultivaluedMap<String, String> params = session.getContext().getUri().getQueryParameters();
String service = params.getFirst(CASLoginProtocol.SERVICE_PARAM);
+
+ boolean isSaml11Request = false;
+ if (service == null && params.containsKey(CASLoginProtocol.TARGET_PARAM)) {
+ // SAML 1.1 authorization uses the TARGET parameter instead of service
+ service = params.getFirst(CASLoginProtocol.TARGET_PARAM);
+ isSaml11Request = true;
+ }
boolean renew = params.containsKey(CASLoginProtocol.RENEW_PARAM);
boolean gateway = params.containsKey(CASLoginProtocol.GATEWAY_PARAM);
@@ -42,46 +49,50 @@
checkRealm();
checkClient(service);
- AuthorizationEndpointChecks checks = getOrCreateAuthenticationSession(client, null);
- if (checks.response != null) {
- return checks.response;
- }
-
- authenticationSession = checks.authSession;
+ authenticationSession = createAuthenticationSession(client, null);
updateAuthenticationSession();
// So back button doesn't work
- CacheControlUtil.noBackButtonCacheControlHeader();
+ CacheControlUtil.noBackButtonCacheControlHeader(session);
if (renew) {
authenticationSession.setClientNote(CASLoginProtocol.RENEW_PARAM, "true");
}
+ if (gateway) {
+ authenticationSession.setClientNote(CASLoginProtocol.GATEWAY_PARAM, "true");
+ }
+ if (isSaml11Request) {
+ // Flag the session so we can return the ticket as "SAMLart" in the response
+ authenticationSession.setClientNote(CASLoginProtocol.TARGET_PARAM, "true");
+ }
this.event.event(EventType.LOGIN);
- return handleBrowserAuthenticationRequest(authenticationSession, new CASLoginProtocol(session, realm, uriInfo, headers, event), gateway, false);
+ return handleBrowserAuthenticationRequest(authenticationSession, new CASLoginProtocol(session, realm, session.getContext().getUri(), headers, event), gateway, false);
}
private void checkClient(String service) {
if (service == null) {
event.error(Errors.INVALID_REQUEST);
- throw new ErrorPageException(session, Messages.MISSING_PARAMETER, CASLoginProtocol.SERVICE_PARAM);
+ throw new ErrorPageException(session, Response.Status.BAD_REQUEST, Messages.MISSING_PARAMETER, CASLoginProtocol.SERVICE_PARAM);
}
- client = realm.getClients().stream()
+ event.detail(Details.REDIRECT_URI, service);
+
+ client = realm.getClientsStream()
.filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
- .filter(c -> RedirectUtils.verifyRedirectUri(uriInfo, service, realm, c) != null)
+ .filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
.findFirst().orElse(null);
if (client == null) {
event.error(Errors.CLIENT_NOT_FOUND);
- throw new ErrorPageException(session, Messages.CLIENT_NOT_FOUND);
+ throw new ErrorPageException(session, Response.Status.BAD_REQUEST, Messages.CLIENT_NOT_FOUND);
}
if (!client.isEnabled()) {
event.error(Errors.CLIENT_DISABLED);
- throw new ErrorPageException(session, Messages.CLIENT_DISABLED);
+ throw new ErrorPageException(session, Response.Status.BAD_REQUEST, Messages.CLIENT_DISABLED);
}
- redirectUri = RedirectUtils.verifyRedirectUri(uriInfo, service, realm, client);
+ redirectUri = RedirectUtils.verifyRedirectUri(session, service, client);
event.client(client.getClientId());
event.detail(Details.REDIRECT_URI, redirectUri);
@@ -93,10 +104,5 @@
authenticationSession.setProtocol(CASLoginProtocol.LOGIN_PROTOCOL);
authenticationSession.setRedirectUri(redirectUri);
authenticationSession.setAction(AuthenticationSessionModel.Action.AUTHENTICATE.name());
- }
-
- @Override
- protected boolean isNewRequest(AuthenticationSessionModel authSession, ClientModel clientFromRequest, String requestState) {
- return true;
}
}
--
Gitblit v1.9.1