From 479960d1eb936460b97ae2f8df21c536590ff08a Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 27 Jun 2022 22:16:15 +0000
Subject: [PATCH] Add var project.build.outputTimestamp to enable reproducible builds
---
src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 bcf1231..d046247 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
@@ -33,8 +33,15 @@
@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);
@@ -51,9 +58,16 @@
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) {
@@ -64,7 +78,7 @@
client = realm.getClients().stream()
.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);
@@ -76,7 +90,7 @@
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);
--
Gitblit v1.9.1