Provides JA-SIG CAS 3 authentication by delegating to the Spring Security AuthenticationManager.
This class would be configured in the webapp/WEB-INF/deployerConfigContext.xml file in the CAS
@@ -45,15 +40,9 @@ import org.springframework.util.Assert;
public final class CasAuthenticationHandler extends AbstractUsernamePasswordAuthenticationHandler {
//~ Instance fields ================================================================================================
+ @NotNull
private AuthenticationManager authenticationManager;
- private Log log = LogFactory.getLog(this.getClass());
-
- //~ Methods ========================================================================================================
-
- protected void afterPropertiesSetInternal() throws Exception {
- Assert.notNull(this.authenticationManager, "authenticationManager cannot be null.");
- }
-
+
protected boolean authenticateUsernamePasswordInternal(final UsernamePasswordCredentials credentials)
throws AuthenticationException {
final Authentication authenticationRequest = new UsernamePasswordAuthenticationToken(credentials.getUsername(),
diff --git a/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java b/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
index 61914e3667..65f23de546 100644
--- a/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
+++ b/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
@@ -52,24 +52,12 @@ public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSp
protected void onSetUp() throws Exception {
this.casAuthenticationHandler = new CasAuthenticationHandler();
this.casAuthenticationHandler.setAuthenticationManager(authenticationManager);
- this.casAuthenticationHandler.afterPropertiesSet();
}
public void setAuthenticationManager(final AuthenticationManager authenticationManager) {
this.authenticationManager = authenticationManager;
}
- public void testAfterPropertiesSet() throws Exception {
- this.casAuthenticationHandler.setAuthenticationManager(null);
-
- try {
- this.casAuthenticationHandler.afterPropertiesSet();
- fail("IllegalArgumenException expected when no AuthenticationManager is set.");
- } catch (final IllegalArgumentException e) {
- // this is okay
- }
- }
-
public void testGracefullyHandlesInvalidInput() {
try {
assertFalse(this.casAuthenticationHandler.authenticate(getCredentialsFor("", "")));
diff --git a/cas/cas-client/pom.xml b/cas/cas-client/pom.xml
index 9a7f9d7bba..f3e81e3e4f 100644
--- a/cas/cas-client/pom.xml
+++ b/cas/cas-client/pom.xml
@@ -21,6 +21,18 @@
Authentication.
*
* @author Ben Alex
+ * @author Scott Battaglia
* @version $Id$
*/
public class CasAuthenticationToken extends AbstractAuthenticationToken implements Serializable {
//~ Instance fields ================================================================================================
private static final long serialVersionUID = 1L;
- private final List proxyList;
private final Object credentials;
private final Object principal;
- private final String proxyGrantingTicketIou;
private final UserDetails userDetails;
private final int keyHash;
+ private final Assertion assertion;
//~ Constructors ===================================================================================================
@@ -57,22 +55,17 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
* org.springframework.security.userdetails.UserDetailsService}) (cannot be null)
* @param userDetails the user details (from the {@link
* org.springframework.security.userdetails.UserDetailsService}) (cannot be null)
- * @param proxyList the list of proxies from CAS (cannot be
- * null)
- * @param proxyGrantingTicketIou the PGT-IOU ID from CAS (cannot be
- * null, but may be an empty String if no
- * PGT-IOU ID was provided)
+ * @param assertion the assertion returned from the CAS servers. It contains the principal and how to obtain a
+ * proxy ticket for the user.
*
* @throws IllegalArgumentException if a null was passed
*/
public CasAuthenticationToken(final String key, final Object principal, final Object credentials,
- final GrantedAuthority[] authorities, final UserDetails userDetails, final List proxyList,
- final String proxyGrantingTicketIou) {
+ final GrantedAuthority[] authorities, final UserDetails userDetails, final Assertion assertion) {
super(authorities);
if ((key == null) || ("".equals(key)) || (principal == null) || "".equals(principal) || (credentials == null)
- || "".equals(credentials) || (authorities == null) || (userDetails == null) || (proxyList == null)
- || (proxyGrantingTicketIou == null)) {
+ || "".equals(credentials) || (authorities == null) || (userDetails == null) || (assertion == null)) {
throw new IllegalArgumentException("Cannot pass null or empty values to constructor");
}
@@ -80,8 +73,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
this.principal = principal;
this.credentials = credentials;
this.userDetails = userDetails;
- this.proxyList = proxyList;
- this.proxyGrantingTicketIou = proxyGrantingTicketIou;
+ this.assertion = assertion;
setAuthenticated(true);
}
@@ -94,15 +86,9 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
if (obj instanceof CasAuthenticationToken) {
CasAuthenticationToken test = (CasAuthenticationToken) obj;
-
- // proxyGrantingTicketIou is never null due to constructor
- if (!this.getProxyGrantingTicketIou().equals(test.getProxyGrantingTicketIou())) {
- return false;
- }
-
- // proxyList is never null due to constructor
- if (!this.getProxyList().equals(test.getProxyList())) {
- return false;
+
+ if (!this.assertion.equals(test.getAssertion())) {
+ return false;
}
if (this.getKeyHash() != test.getKeyHash()) {
@@ -127,18 +113,8 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
return this.principal;
}
- /**
- * Obtains the proxy granting ticket IOU.
- *
- * @return the PGT IOU-ID or an empty String if no proxy callback was requested when validating the
- * service ticket
- */
- public String getProxyGrantingTicketIou() {
- return proxyGrantingTicketIou;
- }
-
- public List getProxyList() {
- return proxyList;
+ public Assertion getAssertion() {
+ return this.assertion;
}
public UserDetails getUserDetails() {
@@ -148,9 +124,8 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append(super.toString());
- sb.append("; Credentials (Service/Proxy Ticket): ").append(this.credentials);
- sb.append("; Proxy-Granting Ticket IOU: ").append(this.proxyGrantingTicketIou);
- sb.append("; Proxy List: ").append(this.proxyList);
+ sb.append(" Assertion: ").append(this.assertion);
+ sb.append(" Credentials (Service/Proxy Ticket): ").append(this.credentials);
return (sb.toString());
}
diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/CasProxyDecider.java b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/CasProxyDecider.java
deleted file mode 100644
index df4f4e0577..0000000000
--- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/CasProxyDecider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.providers.cas;
-
-import java.util.List;
-
-
-/**
- * Decides whether a proxy list presented via CAS is trusted or not.
- *
- *
- * CAS 1.0 allowed services to receive a service ticket and then validate it. - * CAS 2.0 allows services to receive a service ticket and then validate it - * with a proxy callback URL. The callback will enable the CAS server to - * authenticate the service. In doing so the service will receive a - * proxy-granting ticket and a proxy-granting ticket IOU. The IOU is just an - * internal record that a proxy-granting ticket is due to be received via the - * callback URL. - *
- * - *- * With a proxy-granting ticket, a service can request the CAS server provides - * it with a proxy ticket. A proxy ticket is just a service ticket, but the - * CAS server internally tracks the list (chain) of services used to build the - * proxy ticket. The proxy ticket is then presented to the target service. - *
- * - *
- * If this application is a target service of a proxy ticket, the
- * CasProxyDecider resolves whether or not the proxy list is
- * trusted. Applications should only trust services they allow to impersonate
- * an end user.
- *
- * If this application is a service that should never accept proxy-granting - * tickets, the implementation should reject tickets that present a proxy list - * with any members. If the list has no members, it indicates the CAS server - * directly authenticated the user (ie there are no services which proxied the - * user authentication). - *
- * - * @author Ben Alex - * @version $Id$ - */ -public interface CasProxyDecider { - //~ Methods ======================================================================================================== - - /** - * Decides whether the proxy list is trusted. - *Must throw any ProxyUntrustedException if the
- * proxy list is untrusted.
ProxyUntrustedException with the specified
- * message.
- *
- * @param msg the detail message.
- */
- public ProxyUntrustedException(String msg) {
- super(msg);
- }
-
-/**
- * Constructs a ProxyUntrustedException with the specified
- * message and root cause.
- *
- * @param msg the detail message.
- * @param t root cause
- */
- public ProxyUntrustedException(String msg, Throwable t) {
- super(msg, t);
- }
-}
diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/TicketResponse.java b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/TicketResponse.java
deleted file mode 100644
index f02061fdf4..0000000000
--- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/TicketResponse.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.providers.cas;
-
-import java.util.List;
-import java.util.Vector;
-
-
-/**
- * Represents a CAS service ticket in native CAS form.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class TicketResponse {
- //~ Instance fields ================================================================================================
-
- private List proxyList;
- private String proxyGrantingTicketIou;
- private String user;
-
- //~ Constructors ===================================================================================================
-
-/**
- * Constructor.
- *
- *
- * If null is passed into the proxyList or
- * proxyGrantingTicketIou, suitable defaults are established.
- * However, null cannot be passed for the user
- * argument.
- *
null or
- * an empty String)
- * @param proxyList as provided by CAS (may be null)
- * @param proxyGrantingTicketIou as provided by CAS (may be
- * null)
- *
- * @throws IllegalArgumentException DOCUMENT ME!
- */
- public TicketResponse(String user, List proxyList, String proxyGrantingTicketIou) {
- if (proxyList == null) {
- proxyList = new Vector();
- }
-
- if (proxyGrantingTicketIou == null) {
- proxyGrantingTicketIou = "";
- }
-
- if ((user == null) || "".equals(user)) {
- throw new IllegalArgumentException("Cannot pass null or empty String for User");
- }
-
- this.user = user;
- this.proxyList = proxyList;
- this.proxyGrantingTicketIou = proxyGrantingTicketIou;
- }
-
- //~ Methods ========================================================================================================
-
- public String getProxyGrantingTicketIou() {
- return proxyGrantingTicketIou;
- }
-
- public List getProxyList() {
- return proxyList;
- }
-
- public String getUser() {
- return user;
- }
-
- public String toString() {
- StringBuffer sb = new StringBuffer();
- sb.append(super.toString());
- sb.append(": User: " + this.user);
- sb.append("; Proxy-Granting Ticket IOU: " + this.proxyGrantingTicketIou);
- sb.append("; Proxy List: " + this.proxyList.toString());
-
- return sb.toString();
- }
-}
diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/TicketValidator.java b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/TicketValidator.java
deleted file mode 100644
index 98d05f30bd..0000000000
--- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/TicketValidator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.providers.cas;
-
-import org.springframework.security.AuthenticationException;
-
-
-/**
- * Validates a CAS service ticket.
- *
- *
- * Implementations must accept CAS proxy tickets, in addition to CAS service
- * tickets. If proxy tickets should be rejected, this is resolved by a {@link
- * CasProxyDecider} implementation (not by the TicketValidator).
- *
- * Implementations may request a proxy granting ticket if wish, although this - * behaviour is not mandatory. - *
- * - * @author Ben Alex - * @version $Id$ - */ -public interface TicketValidator { - //~ Methods ======================================================================================================== - - /** - * Returns information about the ticket, if it is valid for this service.Must throw an
- * AuthenticationException if the ticket is not valid for this service.
Also accepts the request if there was no proxy (ie the user - * directly authenticated against this service).
- * - * @author Ben Alex - * @version $Id$ - */ -public class AcceptAnyCasProxy implements CasProxyDecider { - //~ Static fields/initializers ===================================================================================== - - private static final Log logger = LogFactory.getLog(AcceptAnyCasProxy.class); - - //~ Methods ======================================================================================================== - - public void confirmProxyListTrusted(List proxyList) - throws ProxyUntrustedException { - Assert.notNull(proxyList, "proxyList cannot be null"); - - if (logger.isDebugEnabled()) { - logger.debug("Always accepting proxy list: " + proxyList.toString()); - } - } -} diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/NamedCasProxyDecider.java b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/NamedCasProxyDecider.java deleted file mode 100644 index 9953c4d648..0000000000 --- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/NamedCasProxyDecider.java +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.security.providers.cas.proxy; - -import org.springframework.security.SpringSecurityMessageSource; - -import org.springframework.security.providers.cas.CasProxyDecider; -import org.springframework.security.providers.cas.ProxyUntrustedException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.InitializingBean; - -import org.springframework.context.MessageSource; -import org.springframework.context.MessageSourceAware; -import org.springframework.context.support.MessageSourceAccessor; - -import org.springframework.util.Assert; - -import java.util.List; - - -/** - * Accepts proxied requests if the closest proxy is named in thevalidProxies list.Also accepts the - * request if there was no proxy (ie the user directly authenticated against this service).
- */ -public class NamedCasProxyDecider implements CasProxyDecider, InitializingBean, MessageSourceAware { - //~ Static fields/initializers ===================================================================================== - - private static final Log logger = LogFactory.getLog(NamedCasProxyDecider.class); - - //~ Instance fields ================================================================================================ - - private List validProxies; - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); - - //~ Methods ======================================================================================================== - - public void afterPropertiesSet() throws Exception { - Assert.notNull(this.validProxies, "A validProxies list must be set"); - Assert.notNull(this.messages, "A message source must be set"); - } - - public void confirmProxyListTrusted(List proxyList) - throws ProxyUntrustedException { - Assert.notNull(proxyList, "proxyList cannot be null"); - - if (logger.isDebugEnabled()) { - logger.debug("Proxy list: " + proxyList.toString()); - } - - if (proxyList.size() == 0) { - // A Service Ticket (not a Proxy Ticket) - return; - } - - if (!validProxies.contains(proxyList.get(0))) { - throw new ProxyUntrustedException(messages.getMessage("NamedCasProxyDecider.untrusted", - new Object[] {proxyList.get(0)}, "Nearest proxy {0} is untrusted")); - } - } - - public List getValidProxies() { - return validProxies; - } - - public void setMessageSource(MessageSource messageSource) { - this.messages = new MessageSourceAccessor(messageSource); - } - - public void setValidProxies(List validProxies) { - this.validProxies = validProxies; - } -} diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/RejectProxyTickets.java b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/RejectProxyTickets.java deleted file mode 100644 index 1088095f9e..0000000000 --- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/RejectProxyTickets.java +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.security.providers.cas.proxy; - -import org.springframework.security.SpringSecurityMessageSource; - -import org.springframework.security.providers.cas.CasProxyDecider; -import org.springframework.security.providers.cas.ProxyUntrustedException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.InitializingBean; - -import org.springframework.context.MessageSource; -import org.springframework.context.MessageSourceAware; -import org.springframework.context.support.MessageSourceAccessor; - -import org.springframework.util.Assert; - -import java.util.List; - - -/** - * Accepts no proxied requests.This class should be used if only service tickets wish to be accepted (ie no - * proxy tickets at all).
- */ -public class RejectProxyTickets implements CasProxyDecider, MessageSourceAware, InitializingBean { - //~ Static fields/initializers ===================================================================================== - - private static final Log logger = LogFactory.getLog(RejectProxyTickets.class); - - //~ Instance fields ================================================================================================ - - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); - - //~ Methods ======================================================================================================== - - public void afterPropertiesSet() throws Exception { - Assert.notNull(this.messages, "A message source must be set"); - } - - public void confirmProxyListTrusted(List proxyList) - throws ProxyUntrustedException { - Assert.notNull(proxyList, "proxyList cannot be null"); - - if (proxyList.size() == 0) { - // A Service Ticket (not a Proxy Ticket) - return; - } - - if (logger.isDebugEnabled()) { - logger.debug("Proxies are unacceptable; proxy list provided: " + proxyList.toString()); - } - - throw new ProxyUntrustedException( - messages.getMessage("RejectProxyTickets.reject", "Proxy tickets are rejected")); - } - - public void setMessageSource(MessageSource messageSource) { - this.messages = new MessageSourceAccessor(messageSource); - } -} diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/package.html b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/package.html deleted file mode 100644 index cc163a2f6f..0000000000 --- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/proxy/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - -Implementations that decide whether proxy lists of -CAS authentications are trusted. - - diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidator.java b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidator.java deleted file mode 100644 index 4fccdf99aa..0000000000 --- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidator.java +++ /dev/null @@ -1,114 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.security.providers.cas.ticketvalidator; - -import org.springframework.security.providers.cas.TicketValidator; -import org.springframework.security.ui.cas.ServiceProperties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.InitializingBean; -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; - -import java.io.File; - - -/** - * Convenience abstract base forTicketValidators.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public abstract class AbstractTicketValidator implements TicketValidator, InitializingBean {
- //~ Static fields/initializers =====================================================================================
-
- private static final Log logger = LogFactory.getLog(AbstractTicketValidator.class);
-
- //~ Instance fields ================================================================================================
-
- private ServiceProperties serviceProperties;
- private String casValidate;
- private String trustStore;
- private String trustPassword;
-
- //~ Methods ========================================================================================================
-
- public void afterPropertiesSet() throws Exception {
- Assert.hasLength(casValidate, "A casValidate URL must be set");
- Assert.notNull(serviceProperties, "serviceProperties must be specified");
-
- if (StringUtils.hasLength(trustStore)) {
- logger.info("Setting system property 'javax.net.ssl.trustStore' to value [" + trustStore + "]");
-
- if (! (new File(trustStore)).exists()) {
- throw new IllegalArgumentException("Parameter 'trustStore' file does not exist at " + trustStore);
- }
-
- System.setProperty("javax.net.ssl.trustStore", trustStore);
- }
-
- if (StringUtils.hasLength(trustPassword)) {
- System.setProperty("javax.net.ssl.trustStorePassword", trustPassword);
- }
- }
-
- /**
- * Mandatory URL to CAS' proxy ticket valiation service.This is usually something like
- * https://www.mycompany.com/cas/proxyValidate.
javax.net.ssl.trustStore.
- *
- * @return the javax.net.ssl.trustStore that will be set during bean initialization, or
- * null to leave the system property unchanged
- */
- public String getTrustStore() {
- return trustStore;
- }
-
- public void setCasValidate(String casValidate) {
- this.casValidate = casValidate;
- }
-
- public void setServiceProperties(ServiceProperties serviceProperties) {
- this.serviceProperties = serviceProperties;
- }
-
- public void setTrustStore(String trustStore) {
- this.trustStore = trustStore;
- }
-
- /**
- * Optional property which causes the system property javax.net.ssl.trustStorePassword to be set.
- *
- * @param trustPassword
- */
- public void setTrustPassword(String trustPassword) {
- this.trustPassword = trustPassword;
- }
-}
diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/CasProxyTicketValidator.java b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/CasProxyTicketValidator.java
deleted file mode 100644
index 832e1fb44e..0000000000
--- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/CasProxyTicketValidator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.providers.cas.ticketvalidator;
-
-import edu.yale.its.tp.cas.client.ProxyTicketValidator;
-
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.AuthenticationServiceException;
-import org.springframework.security.BadCredentialsException;
-
-import org.springframework.security.providers.cas.TicketResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
-/**
- * Uses CAS' ProxyTicketValidator to validate a service ticket.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class CasProxyTicketValidator extends AbstractTicketValidator {
- //~ Static fields/initializers =====================================================================================
-
- private static final Log logger = LogFactory.getLog(CasProxyTicketValidator.class);
-
- //~ Instance fields ================================================================================================
-
- private String proxyCallbackUrl;
-
- //~ Methods ========================================================================================================
-
- public TicketResponse confirmTicketValid(String serviceTicket)
- throws AuthenticationException {
- // Attempt to validate presented ticket using CAS' ProxyTicketValidator class
- ProxyTicketValidator pv = new ProxyTicketValidator();
-
- pv.setCasValidateUrl(super.getCasValidate());
- pv.setServiceTicket(serviceTicket);
- pv.setService(super.getServiceProperties().getService());
-
- if (super.getServiceProperties().isSendRenew()) {
- logger.warn(
- "The current CAS ProxyTicketValidator does not support the 'renew' property. "
- + "The ticket cannot be validated as having been issued by a 'renew' authentication. "
- + "It is expected this will be corrected in a future version of CAS' ProxyTicketValidator.");
- }
-
- if ((this.proxyCallbackUrl != null) && (!"".equals(this.proxyCallbackUrl))) {
- pv.setProxyCallbackUrl(proxyCallbackUrl);
- }
-
- return validateNow(pv);
- }
-
- /**
- * Optional callback URL to obtain a proxy-granting ticket from CAS.
- * This callback URL belongs to the Spring Security secured application. We suggest you use
- * CAS' ProxyTicketReceptor servlet to receive this callback and manage the proxy-granting ticket list.
- * The callback URL is usually something like
- * https://www.mycompany.com/application/casProxy/receptor.
- *
If left null, the CasAuthenticationToken will not have a proxy granting
- * ticket IOU and there will be no proxy-granting ticket callback. Accordingly, the Spring Securty
- * secured application will be unable to obtain a proxy ticket to call another CAS-secured service on
- * behalf of the user. This is not really an issue for most applications.
null if not used
- */
- public String getProxyCallbackUrl() {
- return proxyCallbackUrl;
- }
-
- public void setProxyCallbackUrl(String proxyCallbackUrl) {
- this.proxyCallbackUrl = proxyCallbackUrl;
- }
-
- /**
- * Perform the actual remote invocation. Protected to enable replacement during tests.
- *
- * @param pv the populated ProxyTicketValidator
- *
- * @return the TicketResponse
- *
- * @throws AuthenticationServiceException ifProxyTicketValidator internally fails
- * @throws BadCredentialsException DOCUMENT ME!
- */
- protected TicketResponse validateNow(ProxyTicketValidator pv)
- throws AuthenticationServiceException, BadCredentialsException {
- try {
- pv.validate();
- } catch (Exception internalProxyTicketValidatorProblem) {
- throw new AuthenticationServiceException(internalProxyTicketValidatorProblem.getMessage());
- }
-
- if (!pv.isAuthenticationSuccesful()) {
- throw new BadCredentialsException(pv.getErrorCode() + ": " + pv.getErrorMessage());
- }
-
- return new TicketResponse(pv.getUser(), pv.getProxyList(), pv.getPgtIou());
- }
-}
diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/package.html b/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/package.html
deleted file mode 100644
index 26bceb87c2..0000000000
--- a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/ticketvalidator/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Implementations that validate service tickets.
-
-
diff --git a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java
index 29a617be9e..579bd9f919 100644
--- a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java
+++ b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java
@@ -59,9 +59,9 @@ public class CasProcessingFilter extends AbstractProcessingFilter {
//~ Methods ========================================================================================================
- public Authentication attemptAuthentication(HttpServletRequest request)
+ public Authentication attemptAuthentication(final HttpServletRequest request)
throws AuthenticationException {
- String username = CAS_STATEFUL_IDENTIFIER;
+ final String username = CAS_STATEFUL_IDENTIFIER;
String password = request.getParameter("ticket");
if (password == null) {
diff --git a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java
index 797438dc0d..acc75a87a6 100644
--- a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java
+++ b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java
@@ -16,14 +16,13 @@
package org.springframework.security.ui.cas;
import java.io.IOException;
-import java.net.URLEncoder;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.jasig.cas.client.util.CommonUtils;
import org.springframework.security.AuthenticationException;
import org.springframework.security.ui.AuthenticationEntryPoint;
import org.springframework.beans.factory.InitializingBean;
@@ -39,6 +38,7 @@ import org.springframework.util.Assert;
* which will validate the CAS login was successful.
*
* @author Ben Alex
+ * @author Scott Battaglia
* @version $Id$
*/
public class CasProcessingFilterEntryPoint implements AuthenticationEntryPoint, InitializingBean {
@@ -67,20 +67,11 @@ public class CasProcessingFilterEntryPoint implements AuthenticationEntryPoint,
public void commence(final ServletRequest servletRequest, final ServletResponse servletResponse,
final AuthenticationException authenticationException)
throws IOException, ServletException {
- final HttpServletRequest request = (HttpServletRequest) servletRequest;
final HttpServletResponse response = (HttpServletResponse) servletResponse;
- final String urlEncodedService = this.encodeServiceUrlWithSessionId ? response.encodeURL(this.serviceProperties.getService()) : this.serviceProperties.getService();
+ final String urlEncodedService = CommonUtils.constructServiceUrl(null, response, this.serviceProperties.getService(), null, "ticket", this.encodeServiceUrlWithSessionId);
+ final String redirectUrl = CommonUtils.constructRedirectUrl(this.loginUrl, "service", urlEncodedService, this.serviceProperties.isSendRenew(), false);
- final StringBuffer buffer = new StringBuffer(255);
-
- synchronized (buffer) {
- buffer.append(this.loginUrl);
- buffer.append("?service=");
- buffer.append(URLEncoder.encode(urlEncodedService, "UTF-8"));
- buffer.append(this.serviceProperties.isSendRenew() ? "&renew=true" : "");
- }
-
- response.sendRedirect(buffer.toString());
+ response.sendRedirect(redirectUrl);
}
/**
diff --git a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java
index 03e2f317ef..98812c885a 100644
--- a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java
+++ b/cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java
@@ -16,6 +16,7 @@
package org.springframework.security.ui.cas;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
/**
@@ -36,9 +37,7 @@ public class ServiceProperties implements InitializingBean {
//~ Methods ========================================================================================================
public void afterPropertiesSet() throws Exception {
- if ((service == null) || "".equals(service)) {
- throw new IllegalArgumentException("service must be specified");
- }
+ Assert.hasLength(this.service, "service must be specified.");
}
/**
diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java b/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java
index c9da5138c5..dd5bf39256 100644
--- a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java
+++ b/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java
@@ -23,19 +23,21 @@ import org.springframework.security.GrantedAuthorityImpl;
import org.springframework.security.providers.TestingAuthenticationToken;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-import org.springframework.security.providers.cas.ticketvalidator.AbstractTicketValidator;
import org.springframework.security.ui.cas.CasProcessingFilter;
+import org.springframework.security.ui.cas.ServiceProperties;
import org.springframework.security.userdetails.User;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.UserDetailsService;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Vector;
+import org.jasig.cas.client.validation.Assertion;
+import org.jasig.cas.client.validation.AssertionImpl;
+import org.jasig.cas.client.validation.TicketValidationException;
+import org.jasig.cas.client.validation.TicketValidator;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -44,6 +46,7 @@ import static org.junit.Assert.*;
* Tests {@link CasAuthenticationProvider}.
*
* @author Ben Alex
+ * @author Scott Battaglia
* @version $Id$
*/
public class CasAuthenticationProviderTests {
@@ -58,16 +61,25 @@ public class CasAuthenticationProviderTests {
return new User("user", "password", true, true, true, true,
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_A"), new GrantedAuthorityImpl("ROLE_B")});
}
+
+ private ServiceProperties makeServiceProperties() {
+ final ServiceProperties serviceProperties = new ServiceProperties();
+ serviceProperties.setSendRenew(false);
+ serviceProperties.setService("http://test.com");
+
+ return serviceProperties;
+ }
@Test
public void statefulAuthenticationIsSuccessful() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider(true));
cap.setKey("qwerty");
StatelessTicketCache cache = new MockStatelessTicketCache();
cap.setStatelessTicketCache(cache);
+ cap.setServiceProperties(makeServiceProperties());
+
cap.setTicketValidator(new MockTicketValidator(true));
cap.afterPropertiesSet();
@@ -86,9 +98,6 @@ public class CasAuthenticationProviderTests {
CasAuthenticationToken casResult = (CasAuthenticationToken) result;
assertEquals(makeUserDetailsFromAuthoritiesPopulator(), casResult.getPrincipal());
- assertEquals("PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt",
- casResult.getProxyGrantingTicketIou());
- assertEquals("https://localhost/portal/j_spring_cas_security_check", casResult.getProxyList().get(0));
assertEquals("ST-123", casResult.getCredentials());
assertEquals(new GrantedAuthorityImpl("ROLE_A"), casResult.getAuthorities()[0]);
assertEquals(new GrantedAuthorityImpl("ROLE_B"), casResult.getAuthorities()[1]);
@@ -107,12 +116,12 @@ public class CasAuthenticationProviderTests {
public void statelessAuthenticationIsSuccessful() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider(true));
cap.setKey("qwerty");
StatelessTicketCache cache = new MockStatelessTicketCache();
cap.setStatelessTicketCache(cache);
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(CasProcessingFilter.CAS_STATELESS_IDENTIFIER,
@@ -146,12 +155,12 @@ public class CasAuthenticationProviderTests {
public void missingTicketIdIsDetected() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider(true));
cap.setKey("qwerty");
StatelessTicketCache cache = new MockStatelessTicketCache();
cap.setStatelessTicketCache(cache);
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
UsernamePasswordAuthenticationToken token =
@@ -162,18 +171,19 @@ public class CasAuthenticationProviderTests {
@Test(expected = BadCredentialsException.class)
public void invalidKeyIsDetected() throws Exception {
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider(true));
cap.setKey("qwerty");
StatelessTicketCache cache = new MockStatelessTicketCache();
cap.setStatelessTicketCache(cache);
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
CasAuthenticationToken token = new CasAuthenticationToken("WRONG_KEY", makeUserDetails(), "credentials",
- new GrantedAuthority[] {new GrantedAuthorityImpl("XX")}, makeUserDetails(), new Vector(), "IOU-xxx");
+ new GrantedAuthority[] {new GrantedAuthorityImpl("XX")}, makeUserDetails(), assertion);
cap.authenticate(token);
}
@@ -181,10 +191,10 @@ public class CasAuthenticationProviderTests {
@Test(expected = IllegalArgumentException.class)
public void detectsMissingAuthoritiesPopulator() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
- cap.setCasProxyDecider(new MockProxyDecider());
cap.setKey("qwerty");
cap.setStatelessTicketCache(new MockStatelessTicketCache());
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
}
@@ -192,19 +202,9 @@ public class CasAuthenticationProviderTests {
public void detectsMissingKey() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider());
- cap.setStatelessTicketCache(new MockStatelessTicketCache());
- cap.setTicketValidator(new MockTicketValidator(true));
- cap.afterPropertiesSet();
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void detectsMissingProxyDecider() throws Exception {
- CasAuthenticationProvider cap = new CasAuthenticationProvider();
- cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setKey("qwerty");
cap.setStatelessTicketCache(new MockStatelessTicketCache());
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
}
@@ -214,9 +214,9 @@ public class CasAuthenticationProviderTests {
// set this explicitly to null to test failure
cap.setStatelessTicketCache(null);
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider());
cap.setKey("qwerty");
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
}
@@ -224,9 +224,9 @@ public class CasAuthenticationProviderTests {
public void detectsMissingTicketValidator() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider(true));
cap.setKey("qwerty");
cap.setStatelessTicketCache(new MockStatelessTicketCache());
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
}
@@ -234,14 +234,13 @@ public class CasAuthenticationProviderTests {
public void gettersAndSettersMatch() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider());
cap.setKey("qwerty");
cap.setStatelessTicketCache(new MockStatelessTicketCache());
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
assertTrue(cap.getUserDetailsService() != null);
- assertTrue(cap.getCasProxyDecider() != null);
assertEquals("qwerty", cap.getKey());
assertTrue(cap.getStatelessTicketCache() != null);
assertTrue(cap.getTicketValidator() != null);
@@ -251,10 +250,10 @@ public class CasAuthenticationProviderTests {
public void ignoresClassesItDoesNotSupport() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider());
cap.setKey("qwerty");
cap.setStatelessTicketCache(new MockStatelessTicketCache());
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
TestingAuthenticationToken token = new TestingAuthenticationToken("user", "password",
@@ -269,10 +268,10 @@ public class CasAuthenticationProviderTests {
public void ignoresUsernamePasswordAuthenticationTokensWithoutCasIdentifiersAsPrincipal() throws Exception {
CasAuthenticationProvider cap = new CasAuthenticationProvider();
cap.setUserDetailsService(new MockAuthoritiesPopulator());
- cap.setCasProxyDecider(new MockProxyDecider());
cap.setKey("qwerty");
cap.setStatelessTicketCache(new MockStatelessTicketCache());
cap.setTicketValidator(new MockTicketValidator(true));
+ cap.setServiceProperties(makeServiceProperties());
cap.afterPropertiesSet();
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("some_normal_user",
@@ -295,27 +294,6 @@ public class CasAuthenticationProviderTests {
}
}
- private class MockProxyDecider implements CasProxyDecider {
- private boolean acceptProxy;
-
- public MockProxyDecider(boolean acceptProxy) {
- this.acceptProxy = acceptProxy;
- }
-
- private MockProxyDecider() {
- super();
- }
-
- public void confirmProxyListTrusted(List proxyList)
- throws ProxyUntrustedException {
- if (acceptProxy) {
- return;
- } else {
- throw new ProxyUntrustedException("As requested from mock");
- }
- }
- }
-
private class MockStatelessTicketCache implements StatelessTicketCache {
private Map cache = new HashMap();
@@ -336,23 +314,19 @@ public class CasAuthenticationProviderTests {
}
}
- private class MockTicketValidator extends AbstractTicketValidator {
+ private class MockTicketValidator implements TicketValidator {
private boolean returnTicket;
public MockTicketValidator(boolean returnTicket) {
this.returnTicket = returnTicket;
}
- public TicketResponse confirmTicketValid(String serviceTicket)
- throws AuthenticationException {
- if (returnTicket) {
- List list = new Vector();
- list.add("https://localhost/portal/j_spring_cas_security_check");
-
- return new TicketResponse("rod", list, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
- }
-
- throw new BadCredentialsException("As requested from mock");
- }
+ public Assertion validate(final String ticket, final String service)
+ throws TicketValidationException {
+ if (returnTicket) {
+ return new AssertionImpl("rod");
+ }
+ throw new BadCredentialsException("As requested from mock");
+ }
}
}
diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java b/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java
index a71a197d91..64cd71dbce 100644
--- a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java
+++ b/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java
@@ -17,6 +17,8 @@ package org.springframework.security.providers.cas;
import junit.framework.TestCase;
+import org.jasig.cas.client.validation.Assertion;
+import org.jasig.cas.client.validation.AssertionImpl;
import org.springframework.security.GrantedAuthority;
import org.springframework.security.GrantedAuthorityImpl;
@@ -25,10 +27,6 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke
import org.springframework.security.userdetails.User;
import org.springframework.security.userdetails.UserDetails;
-import java.util.List;
-import java.util.Vector;
-
-
/**
* Tests {@link CasAuthenticationToken}.
*
@@ -66,10 +64,11 @@ public class CasAuthenticationTokenTests extends TestCase {
}
public void testConstructorRejectsNulls() {
+ final Assertion assertion = new AssertionImpl("test");
try {
new CasAuthenticationToken(null, makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
assertTrue(true);
@@ -78,7 +77,7 @@ public class CasAuthenticationTokenTests extends TestCase {
try {
new CasAuthenticationToken("key", null, "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
assertTrue(true);
@@ -87,15 +86,14 @@ public class CasAuthenticationTokenTests extends TestCase {
try {
new CasAuthenticationToken("key", makeUserDetails(), null,
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
assertTrue(true);
}
try {
- new CasAuthenticationToken("key", makeUserDetails(), "Password", null, makeUserDetails(), new Vector(),
- "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ new CasAuthenticationToken("key", makeUserDetails(), "Password", null, makeUserDetails(), assertion);
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
assertTrue(true);
@@ -104,7 +102,7 @@ public class CasAuthenticationTokenTests extends TestCase {
try {
new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), null, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), null);
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
assertTrue(true);
@@ -113,25 +111,17 @@ public class CasAuthenticationTokenTests extends TestCase {
try {
new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- null, new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
- fail("Should have thrown IllegalArgumentException");
- } catch (IllegalArgumentException expected) {
- assertTrue(true);
- }
-
- try {
- new CasAuthenticationToken("key", makeUserDetails(), "Password",
- new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), new Vector(), null);
+ null, assertion);
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
assertTrue(true);
}
+
try {
new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), null, new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
assertTrue(true);
@@ -139,38 +129,31 @@ public class CasAuthenticationTokenTests extends TestCase {
}
public void testEqualsWhenEqual() {
- List proxyList1 = new Vector();
- proxyList1.add("https://localhost/newPortal/j_spring_cas_security_check");
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList1, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
-
- List proxyList2 = new Vector();
- proxyList2.add("https://localhost/newPortal/j_spring_cas_security_check");
+ makeUserDetails(), assertion);
CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList2, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
assertEquals(token1, token2);
}
public void testGetters() {
// Build the proxy list returned in the ticket from CAS
- List proxyList = new Vector();
- proxyList.add("https://localhost/newPortal/j_spring_cas_security_check");
-
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
assertEquals("key".hashCode(), token.getKeyHash());
assertEquals(makeUserDetails(), token.getPrincipal());
assertEquals("Password", token.getCredentials());
assertEquals("ROLE_ONE", token.getAuthorities()[0].getAuthority());
assertEquals("ROLE_TWO", token.getAuthorities()[1].getAuthority());
- assertEquals("PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt", token.getProxyGrantingTicketIou());
- assertEquals(proxyList, token.getProxyList());
+ assertEquals(assertion, token.getAssertion());
assertEquals(makeUserDetails().getUsername(), token.getUserDetails().getUsername());
}
@@ -186,30 +169,25 @@ public class CasAuthenticationTokenTests extends TestCase {
}
public void testNotEqualsDueToAbstractParentEqualsCheck() {
- List proxyList1 = new Vector();
- proxyList1.add("https://localhost/newPortal/j_spring_cas_security_check");
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList1, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
-
- List proxyList2 = new Vector();
- proxyList2.add("https://localhost/newPortal/j_spring_cas_security_check");
+ makeUserDetails(), assertion);
CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails("OTHER_NAME"), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList2, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
assertTrue(!token1.equals(token2));
}
public void testNotEqualsDueToDifferentAuthenticationClass() {
- List proxyList1 = new Vector();
- proxyList1.add("https://localhost/newPortal/j_spring_cas_security_check");
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList1, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken("Test", "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")});
@@ -218,75 +196,50 @@ public class CasAuthenticationTokenTests extends TestCase {
}
public void testNotEqualsDueToKey() {
- List proxyList1 = new Vector();
- proxyList1.add("https://localhost/newPortal/j_spring_cas_security_check");
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList1, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
-
- List proxyList2 = new Vector();
- proxyList2.add("https://localhost/newPortal/j_spring_cas_security_check");
+ makeUserDetails(), assertion);
CasAuthenticationToken token2 = new CasAuthenticationToken("DIFFERENT_KEY", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList2, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
assertTrue(!token1.equals(token2));
}
- public void testNotEqualsDueToProxyGrantingTicket() {
- List proxyList1 = new Vector();
- proxyList1.add("https://localhost/newPortal/j_spring_cas_security_check");
+ public void testNotEqualsDueToAssertion() {
+ final Assertion assertion = new AssertionImpl("test");
+ final Assertion assertion2 = new AssertionImpl("test");
CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList1, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
-
- List proxyList2 = new Vector();
- proxyList2.add("https://localhost/newPortal/j_spring_cas_security_check");
+ makeUserDetails(), assertion);
CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList2, "PGTIOU-SOME_OTHER_VALUE");
-
- assertTrue(!token1.equals(token2));
- }
-
- public void testNotEqualsDueToProxyList() {
- List proxyList1 = new Vector();
- proxyList1.add("https://localhost/newPortal/j_spring_cas_security_check");
-
- CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
- new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList1, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
-
- List proxyList2 = new Vector();
- proxyList2.add("https://localhost/SOME_OTHER_PORTAL/j_spring_cas_security_check");
-
- CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password",
- new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), proxyList2, "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion2);
assertTrue(!token1.equals(token2));
}
public void testSetAuthenticated() {
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
assertTrue(token.isAuthenticated());
token.setAuthenticated(false);
assertTrue(!token.isAuthenticated());
}
public void testToString() {
+ final Assertion assertion = new AssertionImpl("test");
CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password",
new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
- makeUserDetails(), new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
+ makeUserDetails(), assertion);
String result = token.toString();
- assertTrue(result.lastIndexOf("Proxy List:") != -1);
- assertTrue(result.lastIndexOf("Proxy-Granting Ticket IOU:") != -1);
assertTrue(result.lastIndexOf("Credentials (Service/Proxy Ticket):") != -1);
}
}
diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/TicketResponseTests.java b/cas/cas-client/src/test/java/org/springframework/security/providers/cas/TicketResponseTests.java
deleted file mode 100644
index 5c650888e7..0000000000
--- a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/TicketResponseTests.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.providers.cas;
-
-import junit.framework.TestCase;
-
-import java.util.List;
-import java.util.Vector;
-
-
-/**
- * Tests {@link TicketResponse}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class TicketResponseTests extends TestCase {
- //~ Constructors ===================================================================================================
-
- public TicketResponseTests() {
- super();
- }
-
- public TicketResponseTests(String arg0) {
- super(arg0);
- }
-
- //~ Methods ========================================================================================================
-
- public static void main(String[] args) {
- junit.textui.TestRunner.run(TicketResponseTests.class);
- }
-
- public final void setUp() throws Exception {
- super.setUp();
- }
-
- public void testConstructorAcceptsNullProxyGrantingTicketIOU() {
- TicketResponse ticket = new TicketResponse("rod", new Vector(), null);
- assertEquals("", ticket.getProxyGrantingTicketIou());
- }
-
- public void testConstructorAcceptsNullProxyList() {
- TicketResponse ticket = new TicketResponse("rod", null,
- "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
- assertEquals(new Vector(), ticket.getProxyList());
- }
-
- public void testConstructorRejectsNullUser() {
- try {
- new TicketResponse(null, new Vector(), "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
- fail("Should have thrown IllegalArgumentException");
- } catch (IllegalArgumentException expected) {
- assertTrue(true);
- }
- }
-
- public void testGetters() {
- // Build the proxy list returned in the ticket from CAS
- List proxyList = new Vector();
- proxyList.add("https://localhost/newPortal/j_spring_cas_security_check");
-
- TicketResponse ticket = new TicketResponse("rod", proxyList,
- "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
- assertEquals("rod", ticket.getUser());
- assertEquals(proxyList, ticket.getProxyList());
- assertEquals("PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt", ticket.getProxyGrantingTicketIou());
- }
-
- public void testNoArgConstructorDoesntExist() {
- Class clazz = TicketResponse.class;
-
- try {
- clazz.getDeclaredConstructor((Class[]) null);
- fail("Should have thrown NoSuchMethodException");
- } catch (NoSuchMethodException expected) {
- assertTrue(true);
- }
- }
-
- public void testToString() {
- TicketResponse ticket = new TicketResponse("rod", null,
- "PGTIOU-0-R0zlgrl4pdAQwBvJWO3vnNpevwqStbSGcq3vKB2SqSFFRnjPHt");
- String result = ticket.toString();
- assertTrue(result.lastIndexOf("Proxy List:") != -1);
- assertTrue(result.lastIndexOf("Proxy-Granting Ticket IOU:") != -1);
- assertTrue(result.lastIndexOf("User:") != -1);
- }
-}
diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/AbstractStatelessTicketCacheTests.java b/cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/AbstractStatelessTicketCacheTests.java
new file mode 100644
index 0000000000..6af289b8b0
--- /dev/null
+++ b/cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/AbstractStatelessTicketCacheTests.java
@@ -0,0 +1,35 @@
+package org.springframework.security.providers.cas.cache;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jasig.cas.client.validation.Assertion;
+import org.jasig.cas.client.validation.AssertionImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.providers.cas.CasAuthenticationToken;
+import org.springframework.security.userdetails.User;
+
+/**
+ *
+ * @author Scott Battaglia
+ * @version $Revision$ $Date$
+ * @since 2.0
+ *
+ */
+public abstract class AbstractStatelessTicketCacheTests {
+
+ protected CasAuthenticationToken getToken() {
+ List