diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java index 886c460..837e9da 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java @@ -350,4 +350,19 @@ public final class CommonUtils { editor.setAsText(proxies); return (ProxyList) editor.getValue(); } + + /** + * Sends the redirect message and captures the exceptions that we can't possibly do anything with. + * + * @param response the HttpServletResponse. CANNOT be NULL. + * @param url the url to redirect to. + */ + public static void sendRedirect(final HttpServletResponse response, final String url) { + try { + response.sendRedirect(url); + } catch (final Exception e) { + LOG.warn(e.getMessage(), e); + } + + } } diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AbstractLogoutHandler.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AbstractLogoutHandler.java index f8b1fdc..ef6f49b 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AbstractLogoutHandler.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AbstractLogoutHandler.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.util.AbstractCasFilter; +import org.jasig.cas.client.util.CommonUtils; import org.jasig.cas.client.validation.Assertion; /** @@ -22,6 +23,7 @@ import org.jasig.cas.client.validation.Assertion; * */ public abstract class AbstractLogoutHandler implements LogoutHandler { + protected final Log log = LogFactory.getLog(getClass()); protected String redirectUrl; @@ -34,16 +36,10 @@ public abstract class AbstractLogoutHandler implements LogoutHandler { public void logout(final HttpServletRequest request, final HttpServletResponse response) { this.log.debug("Processing logout request from CAS server."); - Assertion assertion = null; + final Assertion assertion; final HttpSession httpSession = request.getSession(false); - if (httpSession != null) { - assertion = (Assertion) httpSession.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION); - if (assertion != null) { - httpSession.removeAttribute(AbstractCasFilter.CONST_CAS_ASSERTION); - } - } - - if (assertion != null) { + if (httpSession != null && (assertion = (Assertion) httpSession.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION)) != null) { + httpSession.removeAttribute(AbstractCasFilter.CONST_CAS_ASSERTION); this.log.info("Successfully logged out " + assertion.getPrincipal()); } else { this.log.info("Session already ended."); @@ -51,12 +47,8 @@ public abstract class AbstractLogoutHandler implements LogoutHandler { final String redirectUrl = constructRedirectUrl(request); if (redirectUrl != null) { - try { - this.log.debug("Redirecting to " + redirectUrl); - response.sendRedirect(redirectUrl); - } catch (Exception e) { - this.log.error("Error redirecting to " + redirectUrl, e); - } + this.log.debug("Redirecting to " + redirectUrl); + CommonUtils.sendRedirect(response, redirectUrl); } } diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java index c582e79..92b5da4 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java @@ -77,11 +77,7 @@ public class AuthenticatorDelegate { if (CommonUtils.isBlank(token)) { final String redirectUrl = CommonUtils.constructRedirectUrl(this.casServerLoginUrl, this.serviceParameterName, service, false, false); log.debug("Redirecting to " + redirectUrl); - try { - response.sendRedirect(redirectUrl); - } catch (IOException e) { - throw new IllegalStateException("Cannot redirect to " + redirectUrl, e); - } + CommonUtils.sendRedirect(response, redirectUrl); return null; } try { diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java index 5b87854..dec1e52 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java @@ -10,12 +10,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.security.Principal; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.HashSet; +import java.util.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,6 +32,7 @@ import org.jasig.cas.client.util.CommonUtils; * */ public class PropertiesCasRealmDelegate implements CasRealm { + /** Log instance */ private final Log log = LogFactory.getLog(getClass()); @@ -76,16 +72,14 @@ public class PropertiesCasRealmDelegate implements CasRealm { // Use TreeSet to sort roles final Set roleSet = new HashSet(); final String[] roles = properties.getProperty(user).split(",\\s*"); - for (int i = 0; i < roles.length; i++) { - roleSet.add(roles[i]); - } - roleMap.put(user, roleSet); + roleSet.addAll(Arrays.asList(roles)); + roleMap.put(user, roleSet); } } /** {@inheritDoc} */ public Principal authenticate(final Principal p) { - if (roleMap.get(p.getName()) != null) { + if (roleMap.containsKey(p.getName())) { return p; } else { return null; @@ -103,10 +97,7 @@ public class PropertiesCasRealmDelegate implements CasRealm { /** {@inheritDoc} */ public boolean hasRole(final Principal principal, final String role) { final Set roles = (Set) roleMap.get(principal.getName()); - if (roles != null) { - return roles.contains(role); - } else { - return false; - } + + return roles != null && roles.contains(role); } } diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/RegexUriLogoutHandler.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/RegexUriLogoutHandler.java index 27986a9..78e0a12 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/RegexUriLogoutHandler.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/RegexUriLogoutHandler.java @@ -16,9 +16,11 @@ import org.jasig.cas.client.util.CommonUtils; * * @author Marvin S. Addison * @version $Revision$ + * @since 3.1.12 * */ -public class RegexUriLogoutHandler extends AbstractLogoutHandler { +public final class RegexUriLogoutHandler extends AbstractLogoutHandler { + private String logoutUriRegex; private Pattern logoutUriPattern; @@ -31,7 +33,7 @@ public class RegexUriLogoutHandler extends AbstractLogoutHandler { } /** - * Initalializes the component for use. + * Initializes the component for use. */ public void init() { CommonUtils.assertNotNull(this.logoutUriRegex, "A logout URI regular expression is required."); diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/StaticUriLogoutHandler.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/StaticUriLogoutHandler.java index 1b21f4a..58ab91e 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/StaticUriLogoutHandler.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/StaticUriLogoutHandler.java @@ -15,9 +15,11 @@ import org.jasig.cas.client.util.CommonUtils; * * @author Marvin S. Addison * @version $Revision$ + * @since 3.1.12 * */ -public class StaticUriLogoutHandler extends AbstractLogoutHandler { +public final class StaticUriLogoutHandler extends AbstractLogoutHandler { + private String logoutUri; /** diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasRealm.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasRealm.java index 213374b..6d7fe30 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasRealm.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasRealm.java @@ -20,6 +20,7 @@ import org.jasig.cas.client.tomcat.CasRealm; * */ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { + /** Logger instance */ protected final Log log = LogFactory.getLog(getClass()); @@ -60,7 +61,7 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { } /** {@inheritDoc} */ - protected Principal getPrincipal(String username) { + protected Principal getPrincipal(final String username) { throw new UnsupportedOperationException(); } diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java index fd5a29e..cf1a7af 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLifecycleValve.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFactory; * */ public abstract class AbstractLifecycleValve extends ValveBase implements Lifecycle { + /** Logger instance */ protected final Log log = LogFactory.getLog(getClass()); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLogoutValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLogoutValve.java index 2a7b9ee..5da6670 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLogoutValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractLogoutValve.java @@ -27,12 +27,11 @@ public abstract class AbstractLogoutValve extends AbstractLifecycleValve { getLogoutHandler().logout(request, response); // Do not proceed up valve chain return; - } else { - this.log.debug("URI is not a logout request: " + request.getRequestURI()); - getNext().invoke(request, response); } + + this.log.debug("URI is not a logout request: " + request.getRequestURI()); + getNext().invoke(request, response); } protected abstract LogoutHandler getLogoutHandler(); - } diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AssertionCasRealm.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AssertionCasRealm.java index 731bede..3cfc894 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AssertionCasRealm.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AssertionCasRealm.java @@ -11,7 +11,7 @@ import org.jasig.cas.client.tomcat.CasRealm; /** * Tomcat Realm that implements {@link CasRealm} for principal and - * role data backed by the CAS {@link Assertion}. + * role data backed by the CAS {@link org.jasig.cas.client.validation.Assertion}. *

* Authentication always succeeds and simply returns the given principal. * @@ -20,12 +20,13 @@ import org.jasig.cas.client.tomcat.CasRealm; * */ public class AssertionCasRealm extends AbstractCasRealm { + private final AssertionCasRealmDelegate delegate = new AssertionCasRealmDelegate(); /** {@inheritDoc} */ public void start() throws LifecycleException { super.start(); - this.log.info("Startup completed."); + log.info("Startup completed."); } /** diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas10CasAuthenticator.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas10CasAuthenticator.java index 923cad5..30062b4 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas10CasAuthenticator.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas10CasAuthenticator.java @@ -17,6 +17,7 @@ import org.jasig.cas.client.validation.TicketValidator; * @since 3.1.12 */ public class Cas10CasAuthenticator extends AbstractCasAuthenticator { + public static final String AUTH_METHOD = "CAS10"; private static final String NAME = Cas10CasAuthenticator.class.getName(); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20CasAuthenticator.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20CasAuthenticator.java index 29d0676..4a04d04 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20CasAuthenticator.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20CasAuthenticator.java @@ -17,6 +17,7 @@ import org.jasig.cas.client.validation.TicketValidator; * @since 3.1.12 */ public final class Cas20CasAuthenticator extends AbstractCasAuthenticator { + public static final String AUTH_METHOD = "CAS20"; private static final String NAME = Cas20CasAuthenticator.class.getName(); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20ProxyCasAuthenticator.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20ProxyCasAuthenticator.java index 7baa336..09c5d89 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20ProxyCasAuthenticator.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas20ProxyCasAuthenticator.java @@ -18,6 +18,7 @@ import org.jasig.cas.client.validation.TicketValidator; * @since 3.1.12 */ public final class Cas20ProxyCasAuthenticator extends AbstractCasAuthenticator { + public static final String AUTH_METHOD = "CAS20-PROXY"; private static final String NAME = Cas20ProxyCasAuthenticator.class.getName(); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/PropertiesCasRealm.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/PropertiesCasRealm.java index 46416c1..5bd290c 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/PropertiesCasRealm.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/PropertiesCasRealm.java @@ -25,6 +25,7 @@ import org.jasig.cas.client.tomcat.PropertiesCasRealmDelegate; * */ public class PropertiesCasRealm extends AbstractCasRealm { + private final PropertiesCasRealmDelegate delegate = new PropertiesCasRealmDelegate(); /** diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/ProxyCallbackValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/ProxyCallbackValve.java index 439049f..a1eed09 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/ProxyCallbackValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/ProxyCallbackValve.java @@ -26,6 +26,7 @@ import java.io.IOException; * @since 3.1.12 */ public final class ProxyCallbackValve extends AbstractLifecycleValve { + private static final String NAME = ProxyCallbackValve.class.getName(); private static ProxyGrantingTicketStorage PROXY_GRANTING_TICKET_STORAGE; diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java index cbb7bee..b071ae2 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/RegexUriLogoutValve.java @@ -18,6 +18,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler; * @since 3.1.12 */ public final class RegexUriLogoutValve extends AbstractLogoutValve { + private static final String NAME = RegexUriLogoutValve.class.getName(); private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler(); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Saml11Authenticator.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Saml11Authenticator.java index 7a79db0..b6c1b29 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Saml11Authenticator.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Saml11Authenticator.java @@ -17,6 +17,7 @@ import org.jasig.cas.client.validation.TicketValidator; * */ public class Saml11Authenticator extends AbstractAuthenticator { + public static final String AUTH_METHOD = "SAML11"; private static final String NAME = Saml11Authenticator.class.getName(); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java index 5b36904..5bc9916 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/SingleSignOutValve.java @@ -28,6 +28,7 @@ import org.jasig.cas.client.session.SingleSignOutHandler; * */ public class SingleSignOutValve extends AbstractLifecycleValve implements SessionListener { + private static final String NAME = SingleSignOutValve.class.getName(); private final SingleSignOutHandler handler = new SingleSignOutHandler(); @@ -48,7 +49,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio public void start() throws LifecycleException { super.start(); handler.init(); - this.log.info("Startup completed."); + log.info("Startup completed."); } /** {@inheritDoc} */ @@ -62,7 +63,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio // Do not proceed up valve chain return; } else { - this.log.debug("Ignoring URI " + request.getRequestURI()); + log.debug("Ignoring URI " + request.getRequestURI()); } getNext().invoke(request, response); } diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java index 75799dd..bb6c09b 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/StaticUriLogoutValve.java @@ -18,6 +18,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler; * @since 3.1.12 */ public final class StaticUriLogoutValve extends AbstractLogoutValve { + private static final String NAME = StaticUriLogoutValve.class.getName(); private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler(); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValve.java index 71b779b..d8dd561 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValve.java @@ -25,6 +25,7 @@ import java.io.IOException; * @since 3.1.12 */ public abstract class AbstractLogoutValve extends ValveBase { + protected final Log log = LogFactory.getLog(getClass()); public final void invoke(final Request request, final Response response) throws IOException, ServletException { @@ -32,10 +33,10 @@ public abstract class AbstractLogoutValve extends ValveBase { getLogoutHandler().logout(request, response); // Do not proceed up valve chain return; - } else { - this.log.debug("URI is not a logout request: " + request.getRequestURI()); - getNext().invoke(request, response); } + + this.log.debug("URI is not a logout request: " + request.getRequestURI()); + getNext().invoke(request, response); } protected abstract LogoutHandler getLogoutHandler(); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AssertionCasRealm.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AssertionCasRealm.java index 4794260..50845b9 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AssertionCasRealm.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AssertionCasRealm.java @@ -19,6 +19,7 @@ import org.jasig.cas.client.tomcat.CasRealm; * */ public class AssertionCasRealm extends AbstractCasRealm { + private final AssertionCasRealmDelegate delegate = new AssertionCasRealmDelegate(); /** diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas10CasAuthenticator.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas10CasAuthenticator.java index e582a04..b7491e6 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas10CasAuthenticator.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas10CasAuthenticator.java @@ -17,6 +17,7 @@ import org.jasig.cas.client.validation.TicketValidator; * @since 3.1.12 */ public final class Cas10CasAuthenticator extends AbstractCasAuthenticator { + public static final String AUTH_METHOD = "CAS10"; private static final String NAME = Cas10CasAuthenticator.class.getName(); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20CasAuthenticator.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20CasAuthenticator.java index ecf3781..d015860 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20CasAuthenticator.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20CasAuthenticator.java @@ -17,6 +17,7 @@ import org.jasig.cas.client.validation.TicketValidator; * @since 3.1.12 */ public final class Cas20CasAuthenticator extends AbstractCasAuthenticator { + public static final String AUTH_METHOD = "CAS20"; private static final String NAME = Cas20CasAuthenticator.class.getName(); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20ProxyCasAuthenticator.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20ProxyCasAuthenticator.java index 00b537a..353ff26 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20ProxyCasAuthenticator.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Cas20ProxyCasAuthenticator.java @@ -18,6 +18,7 @@ import org.jasig.cas.client.validation.TicketValidator; * @since 3.1.12 */ public final class Cas20ProxyCasAuthenticator extends AbstractCasAuthenticator { + public static final String AUTH_METHOD = "CAS20-PROXY"; private static final String NAME = Cas20ProxyCasAuthenticator.class.getName(); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/PropertiesCasRealm.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/PropertiesCasRealm.java index 289fee7..e520bb3 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/PropertiesCasRealm.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/PropertiesCasRealm.java @@ -25,6 +25,7 @@ import org.jasig.cas.client.tomcat.PropertiesCasRealmDelegate; * */ public class PropertiesCasRealm extends AbstractCasRealm { + private final PropertiesCasRealmDelegate delegate = new PropertiesCasRealmDelegate(); /** diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java index c247433..9a2b430 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegexUriLogoutValve.java @@ -20,6 +20,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler; * @since 3.1.12 */ public final class RegexUriLogoutValve extends AbstractLogoutValve { + /** Logger instance */ private final Log log = LogFactory.getLog(getClass()); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java index f2ce712..e0a067b 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/SingleSignOutValve.java @@ -31,6 +31,7 @@ import org.jasig.cas.client.session.SingleSignOutHandler; * */ public class SingleSignOutValve extends ValveBase implements SessionListener { + /** Logger instance */ private final Log log = LogFactory.getLog(getClass()); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java index 456c54d..5dd2a4e 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/StaticUriLogoutValve.java @@ -20,6 +20,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler; * @since 3.1.12 */ public final class StaticUriLogoutValve extends AbstractLogoutValve { + /** Logger instance */ private final Log log = LogFactory.getLog(getClass());