From fdc948b8ec697be0ae04da2f91c66c6526d463b5 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Thu, 25 Jul 2019 22:51:11 +0200 Subject: [PATCH] Remove the unused 'casServerUrlPrefix' parameter fixes #329 --- .../cas/client/session/SingleSignOutFilter.java | 5 ----- .../cas/client/session/SingleSignOutHandler.java | 15 --------------- .../client/session/SingleSignOutFilterTests.java | 1 - .../client/session/SingleSignOutHandlerTests.java | 2 -- .../cas/client/tomcat/v6/SingleSignOutValve.java | 4 ---- .../cas/client/tomcat/v7/SingleSignOutValve.java | 4 ---- .../cas/client/tomcat/v8/SingleSignOutValve.java | 4 ---- .../cas/client/tomcat/v85/SingleSignOutValve.java | 4 ---- 8 files changed, 39 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java index 1729103..72eea2e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java @@ -47,7 +47,6 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { setArtifactParameterName(getString(ConfigurationKeys.ARTIFACT_PARAMETER_NAME)); setLogoutParameterName(getString(ConfigurationKeys.LOGOUT_PARAMETER_NAME)); setRelayStateParameterName(getString(ConfigurationKeys.RELAY_STATE_PARAMETER_NAME)); - setCasServerUrlPrefix(getString(ConfigurationKeys.CAS_SERVER_URL_PREFIX)); setLogoutCallbackPath(getString(ConfigurationKeys.LOGOUT_CALLBACK_PATH)); HANDLER.setArtifactParameterOverPost(getBoolean(ConfigurationKeys.ARTIFACT_PARAMETER_OVER_POST)); HANDLER.setEagerlyCreateSessions(getBoolean(ConfigurationKeys.EAGERLY_CREATE_SESSIONS)); @@ -68,10 +67,6 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { HANDLER.setRelayStateParameterName(name); } - public void setCasServerUrlPrefix(final String casServerUrlPrefix) { - HANDLER.setCasServerUrlPrefix(casServerUrlPrefix); - } - public void setLogoutCallbackPath(String logoutCallbackPath) { HANDLER.setLogoutCallbackPath(logoutCallbackPath); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java index e1b15bc..4835d58 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java @@ -62,9 +62,6 @@ public final class SingleSignOutHandler { /** Parameter name that stores the state of the CAS server webflow for the callback */ private String relayStateParameterName = ConfigurationKeys.RELAY_STATE_PARAMETER_NAME.getDefaultValue(); - - /** The prefix url of the CAS server */ - private String casServerUrlPrefix = ""; /** The logout callback path configured at the CAS server, if there is one */ private String logoutCallbackPath; @@ -103,13 +100,6 @@ public final class SingleSignOutHandler { this.logoutParameterName = name; } - /** - * @param casServerUrlPrefix The prefix url of the CAS server. - */ - public void setCasServerUrlPrefix(final String casServerUrlPrefix) { - this.casServerUrlPrefix = casServerUrlPrefix; - } - /** * @param logoutCallbackPath The logout callback path configured at the CAS server. */ @@ -137,11 +127,6 @@ public final class SingleSignOutHandler { CommonUtils.assertNotNull(this.logoutParameterName, "logoutParameterName cannot be null."); CommonUtils.assertNotNull(this.sessionMappingStorage, "sessionMappingStorage cannot be null."); CommonUtils.assertNotNull(this.relayStateParameterName, "relayStateParameterName cannot be null."); - CommonUtils.assertNotNull(this.casServerUrlPrefix, "casServerUrlPrefix cannot be null."); - - if (CommonUtils.isBlank(this.casServerUrlPrefix)) { - logger.warn("Front Channel single sign out redirects are disabled when the 'casServerUrlPrefix' value is not set."); - } if (this.artifactParameterOverPost) { this.safeParameters = Arrays.asList(this.logoutParameterName, this.artifactParameterName); diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutFilterTests.java index a5af91a..ae7102f 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutFilterTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutFilterTests.java @@ -55,7 +55,6 @@ public class SingleSignOutFilterTests { @Before public void setUp() throws Exception { filter = new SingleSignOutFilter(); - filter.setCasServerUrlPrefix(CAS_SERVER_URL_PREFIX); filter.setIgnoreInitConfiguration(true); filter.init(new MockFilterConfig()); request = new MockHttpServletRequest(); diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java index e80e31d..b5134e5 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java @@ -37,7 +37,6 @@ public final class SingleSignOutHandlerTests { private final static String ANOTHER_PARAMETER = "anotherParameter"; private final static String TICKET = "ST-xxxxxxxx"; - private final static String URL = "http://mycasserver"; private final static String LOGOUT_PARAMETER_NAME = "logoutRequest"; private final static String RELAY_STATE_PARAMETER_NAME = "RelayState"; private final static String ARTIFACT_PARAMETER_NAME = "ticket2"; @@ -52,7 +51,6 @@ public final class SingleSignOutHandlerTests { handler.setLogoutParameterName(LOGOUT_PARAMETER_NAME); handler.setRelayStateParameterName(RELAY_STATE_PARAMETER_NAME); handler.setArtifactParameterName(ARTIFACT_PARAMETER_NAME); - handler.setCasServerUrlPrefix(URL); handler.init(); request = new MockHttpServletRequest(); response = new MockHttpServletResponse(); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java index ac6f26b..7c20216 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java @@ -56,10 +56,6 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio this.handler.setRelayStateParameterName(name); } - public void setCasServerUrlPrefix(final String casServerUrlPrefix) { - this.handler.setCasServerUrlPrefix(casServerUrlPrefix); - } - public void setLogoutCallbackPath(String logoutCallbackPath) { this.handler.setLogoutCallbackPath(logoutCallbackPath); } diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java index 77711bc..66f2853 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java @@ -60,10 +60,6 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { this.handler.setRelayStateParameterName(name); } - public void setCasServerUrlPrefix(final String casServerUrlPrefix) { - this.handler.setCasServerUrlPrefix(casServerUrlPrefix); - } - public void setLogoutCallbackPath(String logoutCallbackPath) { this.handler.setLogoutCallbackPath(logoutCallbackPath); } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java index e7196f5..e1be82d 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java @@ -60,10 +60,6 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { this.handler.setRelayStateParameterName(name); } - public void setCasServerUrlPrefix(final String casServerUrlPrefix) { - this.handler.setCasServerUrlPrefix(casServerUrlPrefix); - } - public void setLogoutCallbackPath(String logoutCallbackPath) { this.handler.setLogoutCallbackPath(logoutCallbackPath); } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java index ccbdcc5..8d27e05 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java @@ -60,10 +60,6 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { this.handler.setRelayStateParameterName(name); } - public void setCasServerUrlPrefix(final String casServerUrlPrefix) { - this.handler.setCasServerUrlPrefix(casServerUrlPrefix); - } - public void setLogoutCallbackPath(String logoutCallbackPath) { this.handler.setLogoutCallbackPath(logoutCallbackPath); }