From 1293d5189bfdc7c46fc456f52126b81febf23df8 Mon Sep 17 00:00:00 2001
From: Matthias Piepkorn <mpiepk@gmail.com>
Date: Mon, 22 Jan 2018 12:00:27 +0000
Subject: [PATCH] remove dependency on internal SAML packages
---
src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 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 aff46db..339051f 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,6 @@
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
import org.keycloak.models.ClientModel;
-import org.keycloak.models.ClientSessionModel;
import org.keycloak.models.RealmModel;
import org.keycloak.protocol.AuthorizationEndpointBase;
import org.keycloak.protocol.cas.CASLoginProtocol;
@@ -14,6 +13,7 @@
import org.keycloak.services.ErrorPageException;
import org.keycloak.services.messages.Messages;
import org.keycloak.services.util.CacheControlUtil;
+import org.keycloak.sessions.AuthenticationSessionModel;
import javax.ws.rs.GET;
import javax.ws.rs.core.MultivaluedMap;
@@ -23,7 +23,7 @@
private static final Logger logger = Logger.getLogger(AuthorizationEndpoint.class);
private ClientModel client;
- private ClientSessionModel clientSession;
+ private AuthenticationSessionModel authenticationSession;
private String redirectUri;
public AuthorizationEndpoint(RealmModel realm, EventBuilder event) {
@@ -35,33 +35,30 @@
public Response build() {
MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
String service = params.getFirst(CASLoginProtocol.SERVICE_PARAM);
- boolean renew = "true".equalsIgnoreCase(params.getFirst(CASLoginProtocol.RENEW_PARAM));
- boolean gateway = "true".equalsIgnoreCase(params.getFirst(CASLoginProtocol.GATEWAY_PARAM));
+ boolean renew = params.containsKey(CASLoginProtocol.RENEW_PARAM);
+ boolean gateway = params.containsKey(CASLoginProtocol.GATEWAY_PARAM);
checkSsl();
checkRealm();
checkClient(service);
- createClientSession();
+ AuthorizationEndpointChecks checks = getOrCreateAuthenticationSession(client, null);
+ if (checks.response != null) {
+ return checks.response;
+ }
+
+ authenticationSession = checks.authSession;
+ updateAuthenticationSession();
+
// So back button doesn't work
CacheControlUtil.noBackButtonCacheControlHeader();
+ if (renew) {
+ authenticationSession.setClientNote(CASLoginProtocol.RENEW_PARAM, "true");
+ }
+
this.event.event(EventType.LOGIN);
- return handleBrowserAuthenticationRequest(clientSession, new CASLoginProtocol(session, realm, uriInfo, headers, event, renew), gateway, false);
- }
-
- private void checkSsl() {
- if (!uriInfo.getBaseUri().getScheme().equals("https") && realm.getSslRequired().isRequired(clientConnection)) {
- event.error(Errors.SSL_REQUIRED);
- throw new ErrorPageException(session, Messages.HTTPS_REQUIRED);
- }
- }
-
- private void checkRealm() {
- if (!realm.isEnabled()) {
- event.error(Errors.REALM_DISABLED);
- throw new ErrorPageException(session, Messages.REALM_NOT_ENABLED);
- }
+ return handleBrowserAuthenticationRequest(authenticationSession, new CASLoginProtocol(session, realm, uriInfo, headers, event), gateway, false);
}
private void checkClient(String service) {
@@ -92,10 +89,14 @@
session.getContext().setClient(client);
}
- private void createClientSession() {
- clientSession = session.sessions().createClientSession(realm, client);
- clientSession.setAuthMethod(CASLoginProtocol.LOGIN_PROTOCOL);
- clientSession.setRedirectUri(redirectUri);
- clientSession.setAction(ClientSessionModel.Action.AUTHENTICATE.name());
+ private void updateAuthenticationSession() {
+ 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