parent
1966a26d6f
commit
fdc948b8ec
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue