diff --git a/cas-client-integration-tomcat-v7/pom.xml b/cas-client-integration-tomcat-v7/pom.xml index 56cf3b1..5eccd4d 100644 --- a/cas-client-integration-tomcat-v7/pom.xml +++ b/cas-client-integration-tomcat-v7/pom.xml @@ -23,7 +23,7 @@ org.apache.tomcat tomcat-catalina - 7.0.0 + 7.0.8 jar compile diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java index d03f35e..bb8e01b 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java @@ -61,6 +61,15 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements protected abstract String getAuthenticationMethod(); + /** + * Provided for Tomcat 7.0.8 support. + * + * @return the authentication method. + */ + protected String getAuthMethod() { + return getAuthenticationMethod(); + } + /** * Abstract method that subclasses should use to provide the name of the artifact parameter (i.e. ticket) * diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasRealm.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasRealm.java index 65be680..26091a3 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasRealm.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasRealm.java @@ -21,6 +21,7 @@ package org.jasig.cas.client.tomcat.v7; import java.security.Principal; +import org.apache.catalina.Wrapper; import org.apache.catalina.realm.RealmBase; import org.jasig.cas.client.tomcat.CasRealm; @@ -43,11 +44,17 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { return getDelegate().getRoles(p); } - /** {@inheritDoc} */ public boolean hasRole(final Principal principal, final String role) { return getDelegate().hasRole(principal, role); } + /** + * Tomcat 7.0.8 changed their APIs so {@link #hasRole(java.security.Principal, String)} is only valid for 7.0.7 and below. + */ + public boolean hasRole(final Wrapper wrapper, final Principal principal, final String role) { + return hasRole(principal, role); + } + /** {@inheritDoc} */ public String toString() { return getName(); @@ -64,12 +71,12 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { } /** {@inheritDoc} */ - protected String getPassword(final String username) { + protected String getPassword(final String userName) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - protected Principal getPrincipal(final String username) { + protected Principal getPrincipal(final String userName) { throw new UnsupportedOperationException(); }