diff --git a/cas/cas-adapter/.cvsignore b/cas/cas-adapter/.cvsignore deleted file mode 100644 index e6165555be..0000000000 --- a/cas/cas-adapter/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -target -.settings -.classpath -.project -.wtpmodules diff --git a/cas/cas-adapter/pom.xml b/cas/cas-adapter/pom.xml deleted file mode 100644 index 8909ef42a8..0000000000 --- a/cas/cas-adapter/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - 4.0.0 - - org.springframework.security - spring-security-cas - 2.0-SNAPSHOT - - spring-security-cas-adapter - Spring Security - CAS adapter - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - - - - - - org.jasig.cas - cas-server-core - 3.2 - - - org.jasig.service - person-directory - - - jdom - jdom - - - org.springframework - spring-orm - - - org.apache.santuario - xmlsec - - - commons-codec - commons-codec - - - commons-collections - commons-collections - - - org.opensaml - opensaml - - - javax.persistence - persistence-api - - - javax.xml - xmldsig - - - commons-lang - commons-lang - - - org.springframework - spring-webmvc - - - net.sf.ehcache - ehcache - - - org.springframework - spring-webflow - - - org.springframework.ldap - spring-ldap - - - org.springframework.ldap - spring-ldap-tiger - - - - - org.springframework - spring-mock - test - - - org.springframework - spring-jdbc - test - - - - - - jasig-m2 - jasig-m2 - http://developer.ja-sig.org/maven2 - - - - - diff --git a/cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java b/cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java deleted file mode 100644 index d0ad2100d9..0000000000 --- a/cas/cas-adapter/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java +++ /dev/null @@ -1,80 +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.adapters.cas3; - -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationManager; - -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; - -import org.inspektr.common.ioc.annotation.NotNull; -import org.jasig.cas.authentication.handler.AuthenticationException; -import org.jasig.cas.authentication.handler.AuthenticationHandler; -import org.jasig.cas.authentication.handler.support.AbstractUsernamePasswordAuthenticationHandler; -import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; - -/** - *

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 - * distribution.

- * - * @author Scott Battaglia - * @version $Id:CasAuthenticationHandler.java 2151 2007-09-22 11:54:13Z luke_t $ - * - * @see AuthenticationHandler - * @see AuthenticationManager - */ -public final class CasAuthenticationHandler extends AbstractUsernamePasswordAuthenticationHandler { - //~ Instance fields ================================================================================================ - - @NotNull - private AuthenticationManager authenticationManager; - - protected boolean authenticateUsernamePasswordInternal(final UsernamePasswordCredentials credentials) - throws AuthenticationException { - final Authentication authenticationRequest = new UsernamePasswordAuthenticationToken(credentials.getUsername(), - credentials.getPassword()); - - if (log.isDebugEnabled()) { - log.debug("Attempting to authenticate for user: " + credentials.getUsername()); - } - - try { - this.authenticationManager.authenticate(authenticationRequest); - } catch (final org.springframework.security.AuthenticationException e) { - if (log.isDebugEnabled()) { - log.debug("Authentication request for " + credentials.getUsername() + " failed: " + e.toString(), e); - } - - return false; - } - - if (log.isDebugEnabled()) { - log.debug("Authentication request for " + credentials.getUsername() + " successful."); - } - - return true; - } - - /** - * Method to set the Spring Security AuthenticationManager to delegate to. - * - * @param authenticationManager the Spring Security AuthenticationManager that knows how to authenticate users. - */ - public void setAuthenticationManager(final AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; - } -} diff --git a/cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml b/cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml deleted file mode 100644 index 7eba0bdb2e..0000000000 --- a/cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - rod=koala,ROLES_IGNORED_BY_CAS - dianne=emu,ROLES_IGNORED_BY_CAS - scott=wombat,ROLES_IGNORED_BY_CAS - peter=opal,disabled,ROLES_IGNORED_BY_CAS - - - - - - - - - - - - - - - - - - - - diff --git a/cas/cas-adapter/src/main/site/site.xml b/cas/cas-adapter/src/main/site/site.xml deleted file mode 100644 index 260537eb57..0000000000 --- a/cas/cas-adapter/src/main/site/site.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - 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 deleted file mode 100644 index 899eb07626..0000000000 --- a/cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java +++ /dev/null @@ -1,85 +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.adapters.cas3; - -import org.springframework.security.AuthenticationManager; - -import org.jasig.cas.authentication.handler.AuthenticationException; -import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; - -import org.springframework.test.AbstractDependencyInjectionSpringContextTests; - - -/** - * Tests {@link CasAuthenticationHandler} - * - * @author Scott Battaglia - * @version $Id:CasAuthenticationHandlerTests.java 2151 2007-09-22 11:54:13Z luke_t $ - */ -public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSpringContextTests { - //~ Instance fields ================================================================================================ - - private AuthenticationManager authenticationManager; - private CasAuthenticationHandler casAuthenticationHandler; - - //~ Methods ======================================================================================================== - - protected String[] getConfigLocations() { - return new String[] {"/org/springframework/security/adapters/cas3/applicationContext-valid.xml"}; - } - - private UsernamePasswordCredentials getCredentialsFor(final String username, final String password) { - final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(); - credentials.setUsername(username); - credentials.setPassword(password); - - return credentials; - } - - protected void onSetUp() throws Exception { - this.casAuthenticationHandler = new CasAuthenticationHandler(); - this.casAuthenticationHandler.setAuthenticationManager(authenticationManager); - } - - public void setAuthenticationManager(final AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; - } - - public void testGracefullyHandlesInvalidInput() { - try { - assertFalse(this.casAuthenticationHandler.authenticate(getCredentialsFor("", ""))); - assertFalse(this.casAuthenticationHandler.authenticate(getCredentialsFor(null, null))); - } catch (final AuthenticationException e) { - fail("AuthenticationException not expected."); - } - } - - public void testInvalidUsernamePasswordCombination() { - try { - assertFalse(this.casAuthenticationHandler.authenticate(getCredentialsFor("scott", "scott"))); - } catch (final AuthenticationException e) { - fail("AuthenticationException not expected."); - } - } - - public void testValidUsernamePasswordCombination() { - try { - assertTrue(this.casAuthenticationHandler.authenticate(getCredentialsFor("scott", "wombat"))); - } catch (final AuthenticationException e) { - fail("AuthenticationException not expected."); - } - } -} diff --git a/cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas3/applicationContext-valid.xml b/cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas3/applicationContext-valid.xml deleted file mode 100644 index 5a54af0d51..0000000000 --- a/cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas3/applicationContext-valid.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - rod=koala,ROLE_TELLER,ROLE_SUPERVISOR - dianne=emu,ROLE_TELLER - scott=wombat,ROLE_TELLER - peter=opal,disabled,ROLE_TELLER - - - - - - - - - - - - - - - - diff --git a/cas/cas-client/pom.xml b/cas/cas-client/pom.xml deleted file mode 100644 index 58229088bc..0000000000 --- a/cas/cas-client/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - spring-security-cas - org.springframework.security - 2.0-SNAPSHOT - - 4.0.0 - org.springframework.security - spring-security-cas-client - Spring Security - CAS client integration - 2.0-SNAPSHOT - - - - org.springframework.security - spring-security-core - ${project.version} - - - javax.servlet - servlet-api - - - org.springframework - spring-mock - true - - - org.jasig.cas - cas-client-core - 3.1.1 - - - net.sf.ehcache - ehcache - true - - - \ No newline at end of file diff --git a/cas/pom.xml b/cas/pom.xml index 313e0e5be6..61237b0234 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -8,12 +8,7 @@ spring-security-cas Spring Security - CAS support - pom - - - cas-client - cas-adapter - + jar @@ -24,6 +19,25 @@ org.springframework spring-dao + + + javax.servlet + servlet-api + + + org.springframework + spring-mock + true + + + org.jasig.cas + cas-client-core + 3.1.1 + + + net.sf.ehcache + ehcache + true diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/providers/cas/CasAuthenticationProvider.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/providers/cas/CasAuthenticationProvider.java rename to cas/src/main/java/org/springframework/security/providers/cas/CasAuthenticationProvider.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/providers/cas/CasAuthenticationToken.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/providers/cas/CasAuthenticationToken.java rename to cas/src/main/java/org/springframework/security/providers/cas/CasAuthenticationToken.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/StatelessTicketCache.java b/cas/src/main/java/org/springframework/security/providers/cas/StatelessTicketCache.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/providers/cas/StatelessTicketCache.java rename to cas/src/main/java/org/springframework/security/providers/cas/StatelessTicketCache.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCache.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCache.java rename to cas/src/main/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCache.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCache.java b/cas/src/main/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCache.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCache.java rename to cas/src/main/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCache.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/cache/package.html b/cas/src/main/java/org/springframework/security/providers/cas/cache/package.html similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/providers/cas/cache/package.html rename to cas/src/main/java/org/springframework/security/providers/cas/cache/package.html diff --git a/cas/cas-client/src/main/java/org/springframework/security/providers/cas/package.html b/cas/src/main/java/org/springframework/security/providers/cas/package.html similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/providers/cas/package.html rename to cas/src/main/java/org/springframework/security/providers/cas/package.html diff --git a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java b/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java rename to cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java b/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java rename to cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java b/cas/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java rename to cas/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java diff --git a/cas/cas-client/src/main/java/org/springframework/security/ui/cas/package.html b/cas/src/main/java/org/springframework/security/ui/cas/package.html similarity index 100% rename from cas/cas-client/src/main/java/org/springframework/security/ui/cas/package.html rename to cas/src/main/java/org/springframework/security/ui/cas/package.html diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java rename to cas/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java b/cas/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java rename to cas/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/AbstractStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/providers/cas/cache/AbstractStatelessTicketCacheTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/AbstractStatelessTicketCacheTests.java rename to cas/src/test/java/org/springframework/security/providers/cas/cache/AbstractStatelessTicketCacheTests.java diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCacheTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCacheTests.java rename to cas/src/test/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCacheTests.java diff --git a/cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCacheTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCacheTests.java rename to cas/src/test/java/org/springframework/security/providers/cas/cache/NullStatelessTicketCacheTests.java diff --git a/cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java b/cas/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java rename to cas/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java diff --git a/cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java b/cas/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java rename to cas/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java diff --git a/cas/cas-client/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java b/cas/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java similarity index 100% rename from cas/cas-client/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java rename to cas/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java