From bab29c84f4dc6d546c3e8eb7aacb1ac6b6d26170 Mon Sep 17 00:00:00 2001 From: Misagh Moayyed Date: Mon, 5 Aug 2019 14:14:59 +0430 Subject: [PATCH] fix compile errors --- .../authentication/AttributePrincipalImpl.java | 2 ++ .../authentication/AuthenticationFilter.java | 3 +++ ...ontainsPatternUrlPatternMatcherStrategy.java | 2 ++ .../DefaultAuthenticationRedirectStrategy.java | 3 ++- .../DefaultGatewayResolverImpl.java | 2 ++ ...ireRegionRegexUrlPatternMatcherStrategy.java | 2 ++ .../ExactUrlPatternMatcherStrategy.java | 2 ++ ...ompatibleAuthenticationRedirectStrategy.java | 3 ++- .../RegexUrlPatternMatcherStrategy.java | 2 ++ .../cas/client/authentication/SimpleGroup.java | 4 ++++ .../client/authentication/SimplePrincipal.java | 1 + .../BaseConfigurationStrategy.java | 10 ++++++++++ .../JndiConfigurationStrategyImpl.java | 1 + .../LegacyConfigurationStrategyImpl.java | 2 ++ .../PropertiesConfigurationStrategyImpl.java | 1 + ...stemPropertiesConfigurationStrategyImpl.java | 1 + .../WebXmlConfigurationStrategyImpl.java | 2 ++ .../jasig/cas/client/jaas/CasLoginModule.java | 7 ++++++- .../jaas/ServiceAndTicketCallbackHandler.java | 1 + .../jaas/Servlet3AuthenticationFilter.java | 3 ++- .../jasig/cas/client/jaas/TicketCredential.java | 1 + ...EncryptedProxyGrantingTicketStorageImpl.java | 2 ++ .../cas/client/proxy/Cas20ProxyRetriever.java | 1 + .../cas/client/proxy/CleanUpTimerTask.java | 1 + .../proxy/ProxyGrantingTicketStorageImpl.java | 3 +++ .../HashMapBackedSessionMappingStorage.java | 3 +++ .../cas/client/session/SingleSignOutFilter.java | 5 ++++- .../client/session/SingleSignOutHandler.java | 2 ++ .../SingleSignOutHttpSessionListener.java | 2 ++ .../cas/client/ssl/AnyHostnameVerifier.java | 1 + .../client/ssl/HttpsURLConnectionFactory.java | 1 + .../cas/client/ssl/RegexHostnameVerifier.java | 1 + .../client/ssl/WhitelistHostnameVerifier.java | 1 + .../cas/client/util/AbstractCasFilter.java | 2 ++ .../util/AbstractConfigurationFilter.java | 1 + .../client/util/AssertionThreadLocalFilter.java | 5 ++++- .../jasig/cas/client/util/DelegatingFilter.java | 3 +++ .../cas/client/util/ErrorRedirectFilter.java | 3 +++ .../util/HttpServletRequestWrapperFilter.java | 8 +++++++- .../cas/client/util/MapNamespaceContext.java | 3 +++ .../client/util/ThreadLocalXPathExpression.java | 4 ++++ .../org/jasig/cas/client/util/XmlUtils.java | 10 ++++++++-- ...tractCasProtocolUrlBasedTicketValidator.java | 1 + .../AbstractTicketValidationFilter.java | 7 +++++-- .../AbstractUrlBasedTicketValidator.java | 1 + .../validation/Cas10TicketValidationFilter.java | 1 + .../client/validation/Cas10TicketValidator.java | 2 ++ ...s20ProxyReceivingTicketValidationFilter.java | 5 +++++ .../validation/Cas20ProxyTicketValidator.java | 1 + .../validation/Cas20ServiceTicketValidator.java | 3 +++ .../cas/client/validation/ProxyListEditor.java | 1 + .../jasig/cas/client/PublicTestHttpServer.java | 1 + .../AuthenticationFilterTests.java | 10 ++++++++++ .../ConfigurationStrategyNameTests.java | 1 + .../cas/client/proxy/CleanUpTimerTaskTest.java | 3 +++ .../jasig/cas/client/util/CasFilterTests.java | 1 + .../HttpServletRequestWrapperFilterTests.java | 1 + ...oxyReceivingTicketValidationFilterTests.java | 4 ++++ .../Cas20ProxyTicketValidatorTests.java | 1 + .../Cas20ServiceTicketValidatorTests.java | 1 + .../Cas30ServiceTicketValidatorTests.java | 1 + .../Cas30JsonServiceTicketValidatorTests.java | 1 + .../authentication/WebAuthenticationFilter.java | 3 ++- .../client/tomcat/AbstractLogoutHandler.java | 1 + .../tomcat/AssertionCasRealmDelegate.java | 3 +++ .../tomcat/PropertiesCasRealmDelegate.java | 3 +++ .../client/tomcat/RegexUriLogoutHandler.java | 1 + .../client/tomcat/StaticUriLogoutHandler.java | 1 + .../tomcat/PropertiesCasRealmDelegateTests.java | 1 + .../client/tomcat/v6/AbstractAuthenticator.java | 4 ++++ .../tomcat/v6/AbstractCasAuthenticator.java | 2 ++ .../cas/client/tomcat/v6/AbstractCasRealm.java | 7 +++++++ .../tomcat/v6/AbstractLifecycleValve.java | 5 +++++ .../client/tomcat/v6/AbstractLogoutValve.java | 1 + .../cas/client/tomcat/v6/AssertionCasRealm.java | 2 ++ .../client/tomcat/v6/Cas10CasAuthenticator.java | 4 ++++ .../client/tomcat/v6/Cas20CasAuthenticator.java | 4 ++++ .../tomcat/v6/Cas20ProxyCasAuthenticator.java | 4 ++++ .../client/tomcat/v6/PropertiesCasRealm.java | 2 ++ .../client/tomcat/v6/ProxyCallbackValve.java | 3 +++ .../client/tomcat/v6/RegexUriLogoutValve.java | 3 +++ .../client/tomcat/v6/Saml11Authenticator.java | 6 ++++++ .../client/tomcat/v6/SingleSignOutValve.java | 4 ++++ .../client/tomcat/v6/StaticUriLogoutValve.java | 3 +++ .../client/tomcat/v7/AbstractAuthenticator.java | 10 ++++++++-- .../tomcat/v7/AbstractCasAuthenticator.java | 2 ++ .../cas/client/tomcat/v7/AbstractCasRealm.java | 8 ++++++++ .../client/tomcat/v7/AbstractLogoutValve.java | 1 + .../cas/client/tomcat/v7/AssertionCasRealm.java | 1 + .../client/tomcat/v7/Cas10CasAuthenticator.java | 4 ++++ .../client/tomcat/v7/Cas20CasAuthenticator.java | 4 ++++ .../tomcat/v7/Cas20ProxyCasAuthenticator.java | 4 ++++ .../client/tomcat/v7/PropertiesCasRealm.java | 2 ++ .../client/tomcat/v7/ProxyCallbackValve.java | 2 ++ .../client/tomcat/v7/RegexUriLogoutValve.java | 2 ++ .../client/tomcat/v7/Saml11Authenticator.java | 6 ++++++ .../client/tomcat/v7/SingleSignOutValve.java | 3 +++ .../client/tomcat/v7/StaticUriLogoutValve.java | 2 ++ .../client/tomcat/v8/AbstractAuthenticator.java | 17 +++++++++++++---- .../tomcat/v8/AbstractCasAuthenticator.java | 2 ++ .../cas/client/tomcat/v8/AbstractCasRealm.java | 7 +++++++ .../client/tomcat/v8/AbstractLogoutValve.java | 1 + .../cas/client/tomcat/v8/AssertionCasRealm.java | 1 + .../client/tomcat/v8/Cas10CasAuthenticator.java | 4 ++++ .../client/tomcat/v8/Cas20CasAuthenticator.java | 4 ++++ .../tomcat/v8/Cas20ProxyCasAuthenticator.java | 4 ++++ .../client/tomcat/v8/PropertiesCasRealm.java | 2 ++ .../client/tomcat/v8/ProxyCallbackValve.java | 2 ++ .../client/tomcat/v8/RegexUriLogoutValve.java | 2 ++ .../client/tomcat/v8/Saml11Authenticator.java | 6 ++++++ .../client/tomcat/v8/SingleSignOutValve.java | 3 +++ .../client/tomcat/v8/StaticUriLogoutValve.java | 2 ++ .../tomcat/v85/AbstractAuthenticator.java | 4 ++++ .../tomcat/v85/AbstractCasAuthenticator.java | 2 ++ .../cas/client/tomcat/v85/AbstractCasRealm.java | 7 +++++++ .../client/tomcat/v85/AbstractLogoutValve.java | 1 + .../client/tomcat/v85/AssertionCasRealm.java | 1 + .../tomcat/v85/Cas10CasAuthenticator.java | 4 ++++ .../tomcat/v85/Cas20CasAuthenticator.java | 4 ++++ .../tomcat/v85/Cas20ProxyCasAuthenticator.java | 4 ++++ .../client/tomcat/v85/PropertiesCasRealm.java | 2 ++ .../client/tomcat/v85/ProxyCallbackValve.java | 2 ++ .../client/tomcat/v85/RegexUriLogoutValve.java | 2 ++ .../client/tomcat/v85/Saml11Authenticator.java | 6 ++++++ .../client/tomcat/v85/SingleSignOutValve.java | 3 +++ .../client/tomcat/v85/StaticUriLogoutValve.java | 2 ++ ...cheBackedProxyGrantingTicketStorageImpl.java | 3 +++ ...hedBackedProxyGrantingTicketStorageImpl.java | 3 +++ .../Saml11TicketValidationFilter.java | 1 + .../validation/Saml11TicketValidator.java | 4 ++++ 130 files changed, 376 insertions(+), 18 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AttributePrincipalImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AttributePrincipalImpl.java index d4f7d61..9230b56 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AttributePrincipalImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AttributePrincipalImpl.java @@ -96,10 +96,12 @@ public class AttributePrincipalImpl extends SimplePrincipal implements Attribute CommonUtils.assertNotNull(this.attributes, "attributes cannot be null."); } + @Override public Map getAttributes() { return this.attributes; } + @Override public String getProxyTicketFor(String service) { if (proxyGrantingTicket != null) { return this.proxyRetriever.getProxyTicketIdFor(this.proxyGrantingTicket, service); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java index c69cf2a..2a2a1a3 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/AuthenticationFilter.java @@ -100,6 +100,7 @@ public class AuthenticationFilter extends AbstractCasFilter { super(protocol); } + @Override protected void initInternal(final FilterConfig filterConfig) throws ServletException { if (!isIgnoreInitConfiguration()) { super.initInternal(filterConfig); @@ -149,6 +150,7 @@ public class AuthenticationFilter extends AbstractCasFilter { } } + @Override public void init() { super.init(); @@ -160,6 +162,7 @@ public class AuthenticationFilter extends AbstractCasFilter { CommonUtils.assertNotNull(this.casServerLoginUrl, message); } + @Override public final void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain filterChain) throws IOException, ServletException { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ContainsPatternUrlPatternMatcherStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ContainsPatternUrlPatternMatcherStrategy.java index 48c9f5f..771f93e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ContainsPatternUrlPatternMatcherStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ContainsPatternUrlPatternMatcherStrategy.java @@ -28,10 +28,12 @@ public final class ContainsPatternUrlPatternMatcherStrategy implements UrlPatter private String pattern; + @Override public boolean matches(final String url) { return url.contains(this.pattern); } + @Override public void setPattern(final String pattern) { this.pattern = pattern; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultAuthenticationRedirectStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultAuthenticationRedirectStrategy.java index d38daed..c738566 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultAuthenticationRedirectStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultAuthenticationRedirectStrategy.java @@ -30,8 +30,9 @@ import javax.servlet.http.HttpServletResponse; */ public final class DefaultAuthenticationRedirectStrategy implements AuthenticationRedirectStrategy { + @Override public void redirect(final HttpServletRequest request, final HttpServletResponse response, - final String potentialRedirectUrl) throws IOException { + final String potentialRedirectUrl) throws IOException { response.sendRedirect(potentialRedirectUrl); } } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImpl.java index ca4c0c8..e0dd00e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImpl.java @@ -25,6 +25,7 @@ public final class DefaultGatewayResolverImpl implements GatewayResolver { public static final String CONST_CAS_GATEWAY = "_const_cas_gateway_"; + @Override public boolean hasGatewayedAlready(final HttpServletRequest request, final String serviceUrl) { final HttpSession session = request.getSession(false); @@ -36,6 +37,7 @@ public final class DefaultGatewayResolverImpl implements GatewayResolver { return result; } + @Override public String storeGatewayInformation(final HttpServletRequest request, final String serviceUrl) { request.getSession(true).setAttribute(CONST_CAS_GATEWAY, "yes"); return serviceUrl; diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/EntireRegionRegexUrlPatternMatcherStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/EntireRegionRegexUrlPatternMatcherStrategy.java index af35b74..3f20a16 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/EntireRegionRegexUrlPatternMatcherStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/EntireRegionRegexUrlPatternMatcherStrategy.java @@ -41,10 +41,12 @@ public final class EntireRegionRegexUrlPatternMatcherStrategy implements UrlPatt this.setPattern(pattern); } + @Override public boolean matches(final String url) { return this.pattern.matcher(url).matches(); } + @Override public void setPattern(final String pattern) { this.pattern = Pattern.compile(pattern); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ExactUrlPatternMatcherStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ExactUrlPatternMatcherStrategy.java index 9fd0ddf..3d8b691 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ExactUrlPatternMatcherStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/ExactUrlPatternMatcherStrategy.java @@ -35,10 +35,12 @@ public final class ExactUrlPatternMatcherStrategy implements UrlPatternMatcherSt this.setPattern(pattern); } + @Override public boolean matches(final String url) { return url.equals(this.pattern); } + @Override public void setPattern(final String pattern) { this.pattern = pattern; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/FacesCompatibleAuthenticationRedirectStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/FacesCompatibleAuthenticationRedirectStrategy.java index 29dce2f..d676ac5 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/FacesCompatibleAuthenticationRedirectStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/FacesCompatibleAuthenticationRedirectStrategy.java @@ -34,8 +34,9 @@ public final class FacesCompatibleAuthenticationRedirectStrategy implements Auth private static final String FACES_PARTIAL_AJAX_PARAMETER = "javax.faces.partial.ajax"; + @Override public void redirect(final HttpServletRequest request, final HttpServletResponse response, - final String potentialRedirectUrl) throws IOException { + final String potentialRedirectUrl) throws IOException { if (CommonUtils.isNotBlank(request.getParameter(FACES_PARTIAL_AJAX_PARAMETER))) { // this is an ajax request - redirect ajaxly diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/RegexUrlPatternMatcherStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/RegexUrlPatternMatcherStrategy.java index eae72a3..21bf68d 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/RegexUrlPatternMatcherStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/RegexUrlPatternMatcherStrategy.java @@ -45,10 +45,12 @@ public final class RegexUrlPatternMatcherStrategy implements UrlPatternMatcherSt this.setPattern(pattern); } + @Override public boolean matches(final String url) { return this.pattern.matcher(url).find(); } + @Override public void setPattern(final String pattern) { this.pattern = Pattern.compile(pattern); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimpleGroup.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimpleGroup.java index 37e7f59..120222c 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimpleGroup.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimpleGroup.java @@ -49,18 +49,22 @@ public final class SimpleGroup extends SimplePrincipal implements Group { super(name); } + @Override public boolean addMember(final Principal user) { return this.members.add(user); } + @Override public boolean isMember(final Principal member) { return this.members.contains(member); } + @Override public Enumeration members() { return Collections.enumeration(this.members); } + @Override public boolean removeMember(final Principal user) { return this.members.remove(user); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimplePrincipal.java b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimplePrincipal.java index 4f73a73..27e2ec0 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimplePrincipal.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/authentication/SimplePrincipal.java @@ -47,6 +47,7 @@ public class SimplePrincipal implements Principal, Serializable { CommonUtils.assertNotNull(this.name, "name cannot be null."); } + @Override public final String getName() { return this.name; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/BaseConfigurationStrategy.java b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/BaseConfigurationStrategy.java index 0ae9d97..ac51ff8 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/BaseConfigurationStrategy.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/BaseConfigurationStrategy.java @@ -33,40 +33,50 @@ public abstract class BaseConfigurationStrategy implements ConfigurationStrategy protected final Logger logger = LoggerFactory.getLogger(getClass()); + @Override public final boolean getBoolean(final ConfigurationKey configurationKey) { return getValue(configurationKey, new Parser() { + @Override public Boolean parse(final String value) { return CommonUtils.toBoolean(value); } }); } + @Override public final long getLong(final ConfigurationKey configurationKey) { return getValue(configurationKey, new Parser() { + @Override public Long parse(final String value) { return CommonUtils.toLong(value, configurationKey.getDefaultValue()); } }); } + @Override public final int getInt(final ConfigurationKey configurationKey) { return getValue(configurationKey, new Parser() { + @Override public Integer parse(final String value) { return CommonUtils.toInt(value, configurationKey.getDefaultValue()); } }); } + @Override public final String getString(final ConfigurationKey configurationKey) { return getValue(configurationKey, new Parser() { + @Override public String parse(final String value) { return value; } }); } + @Override public Class getClass(final ConfigurationKey> configurationKey) { return getValue(configurationKey, new Parser>() { + @Override public Class parse(final String value) { try { return ReflectUtils.loadClass(value); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/JndiConfigurationStrategyImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/JndiConfigurationStrategyImpl.java index 6fcaa11..639572d 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/JndiConfigurationStrategyImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/JndiConfigurationStrategyImpl.java @@ -82,6 +82,7 @@ public class JndiConfigurationStrategyImpl extends BaseConfigurationStrategy { } + @Override public final void init(final FilterConfig filterConfig, final Class clazz) { this.simpleFilterName = clazz.getSimpleName(); try { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/LegacyConfigurationStrategyImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/LegacyConfigurationStrategyImpl.java index a9af77c..f69ed2c 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/LegacyConfigurationStrategyImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/LegacyConfigurationStrategyImpl.java @@ -36,11 +36,13 @@ public final class LegacyConfigurationStrategyImpl extends BaseConfigurationStra private final JndiConfigurationStrategyImpl jndiConfigurationStrategy = new JndiConfigurationStrategyImpl(); + @Override public void init(FilterConfig filterConfig, Class filterClazz) { this.webXmlConfigurationStrategy.init(filterConfig, filterClazz); this.jndiConfigurationStrategy.init(filterConfig, filterClazz); } + @Override protected String get(final ConfigurationKey key) { final String value1 = this.webXmlConfigurationStrategy.get(key); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java index 64acea2..7682434 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/PropertiesConfigurationStrategyImpl.java @@ -65,6 +65,7 @@ public final class PropertiesConfigurationStrategyImpl extends BaseConfiguration return this.properties.getProperty(property); } + @Override public void init(final FilterConfig filterConfig, final Class filterClazz) { this.simpleFilterName = filterClazz.getSimpleName(); final String fileLocationFromFilterConfig = filterConfig.getInitParameter(CONFIGURATION_FILE_LOCATION); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/SystemPropertiesConfigurationStrategyImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/SystemPropertiesConfigurationStrategyImpl.java index 49be2c5..9792882 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/SystemPropertiesConfigurationStrategyImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/SystemPropertiesConfigurationStrategyImpl.java @@ -29,6 +29,7 @@ import javax.servlet.FilterConfig; */ public class SystemPropertiesConfigurationStrategyImpl extends BaseConfigurationStrategy { + @Override public void init(FilterConfig filterConfig, Class filterClazz) { } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/WebXmlConfigurationStrategyImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/WebXmlConfigurationStrategyImpl.java index 634b9f1..69a8856 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/configuration/WebXmlConfigurationStrategyImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/configuration/WebXmlConfigurationStrategyImpl.java @@ -34,6 +34,7 @@ public final class WebXmlConfigurationStrategyImpl extends BaseConfigurationStra private FilterConfig filterConfig; + @Override protected String get(final ConfigurationKey configurationKey) { final String value = this.filterConfig.getInitParameter(configurationKey.getName()); @@ -54,6 +55,7 @@ public final class WebXmlConfigurationStrategyImpl extends BaseConfigurationStra return null; } + @Override public void init(final FilterConfig filterConfig, final Class clazz) { this.filterConfig = filterConfig; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java index 666b41f..908e389 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java @@ -203,8 +203,9 @@ public class CasLoginModule implements LoginModule { * names, e.g. DAYS, HOURS, MINUTES, SECONDS, MILLISECONDS. Default unit is MINUTES. * */ + @Override public final void initialize(final Subject subject, final CallbackHandler handler, final Map state, - final Map options) { + final Map options) { this.assertion = null; this.callbackHandler = handler; @@ -277,6 +278,7 @@ public class CasLoginModule implements LoginModule { // template method } + @Override public final boolean login() throws LoginException { logger.debug("Performing login."); @@ -341,6 +343,7 @@ public class CasLoginModule implements LoginModule { return result; } + @Override public final boolean abort() throws LoginException { if (this.ticket != null) { this.ticket = null; @@ -369,6 +372,7 @@ public class CasLoginModule implements LoginModule { // template method } + @Override public final boolean commit() throws LoginException { if (!preCommit()) { @@ -439,6 +443,7 @@ public class CasLoginModule implements LoginModule { return result; } + @Override public final boolean logout() throws LoginException { logger.debug("Performing logout."); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/ServiceAndTicketCallbackHandler.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/ServiceAndTicketCallbackHandler.java index 7fc88ef..df8be99 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/ServiceAndTicketCallbackHandler.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/ServiceAndTicketCallbackHandler.java @@ -50,6 +50,7 @@ public class ServiceAndTicketCallbackHandler implements CallbackHandler { this.ticket = ticket; } + @Override public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException { for (final Callback callback : callbacks) { if (callback instanceof NameCallback) { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/Servlet3AuthenticationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/Servlet3AuthenticationFilter.java index e64b578..d3a8380 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/Servlet3AuthenticationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/Servlet3AuthenticationFilter.java @@ -55,8 +55,9 @@ public final class Servlet3AuthenticationFilter extends AbstractCasFilter { super(Protocol.CAS2); } + @Override public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, - final FilterChain chain) throws IOException, ServletException { + final FilterChain chain) throws IOException, ServletException { final HttpServletRequest request = (HttpServletRequest) servletRequest; final HttpServletResponse response = (HttpServletResponse) servletResponse; final HttpSession session = request.getSession(); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java index 91f2c0d..2dae541 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/TicketCredential.java @@ -44,6 +44,7 @@ public final class TicketCredential implements Principal { this.ticket = ticket; } + @Override public String getName() { return this.ticket; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java index 24826cf..db0ff42 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java @@ -60,10 +60,12 @@ public abstract class AbstractEncryptedProxyGrantingTicketStorageImpl implements this.cipherAlgorithm = cipherAlgorithm; } + @Override public final void save(final String proxyGrantingTicketIou, final String proxyGrantingTicket) { saveInternal(proxyGrantingTicketIou, encrypt(proxyGrantingTicket)); } + @Override public final String retrieve(final String proxyGrantingTicketIou) { return decrypt(retrieveInternal(proxyGrantingTicketIou)); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java index 21c770b..070198c 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java @@ -75,6 +75,7 @@ public final class Cas20ProxyRetriever implements ProxyRetriever { this.urlConnectionFactory = urlFactory; } + @Override public String getProxyTicketIdFor(final String proxyGrantingTicketId, final String targetService) { CommonUtils.assertNotNull(proxyGrantingTicketId, "proxyGrantingTicketId cannot be null."); CommonUtils.assertNotNull(targetService, "targetService cannot be null."); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/CleanUpTimerTask.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/CleanUpTimerTask.java index ce31b4b..cdd8e73 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/CleanUpTimerTask.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/CleanUpTimerTask.java @@ -39,6 +39,7 @@ public final class CleanUpTimerTask extends TimerTask { this.proxyGrantingTicketStorage = proxyGrantingTicketStorage; } + @Override public void run() { this.proxyGrantingTicketStorage.cleanUp(); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java index 1b6b2d0..29c2f62 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java @@ -79,6 +79,7 @@ public final class ProxyGrantingTicketStorageImpl implements ProxyGrantingTicket * NOTE: you can only retrieve a ProxyGrantingTicket once with this method. * Its removed after retrieval. */ + @Override public String retrieve(final String proxyGrantingTicketIou) { if (CommonUtils.isBlank(proxyGrantingTicketIou)) { return null; @@ -97,6 +98,7 @@ public final class ProxyGrantingTicketStorageImpl implements ProxyGrantingTicket return holder.getProxyGrantingTicket(); } + @Override public void save(final String proxyGrantingTicketIou, final String proxyGrantingTicket) { final ProxyGrantingTicketHolder holder = new ProxyGrantingTicketHolder(proxyGrantingTicket); @@ -109,6 +111,7 @@ public final class ProxyGrantingTicketStorageImpl implements ProxyGrantingTicket * Cleans up old, expired proxy tickets. This method must be * called regularly via an external thread or timer. */ + @Override public void cleanUp() { for (final Map.Entry holder : this.cache.entrySet()) { if (holder.getValue().isExpired(this.timeout)) { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/HashMapBackedSessionMappingStorage.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/HashMapBackedSessionMappingStorage.java index 27a6c60..57d25fa 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/HashMapBackedSessionMappingStorage.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/HashMapBackedSessionMappingStorage.java @@ -46,12 +46,14 @@ public final class HashMapBackedSessionMappingStorage implements SessionMappingS private final Logger logger = LoggerFactory.getLogger(getClass()); + @Override public synchronized void addSessionById(String mappingId, HttpSession session) { ID_TO_SESSION_KEY_MAPPING.put(session.getId(), mappingId); MANAGED_SESSIONS.put(mappingId, session); } + @Override public synchronized void removeBySessionById(final String sessionId) { logger.debug("Attempting to remove Session=[{}]", sessionId); @@ -68,6 +70,7 @@ public final class HashMapBackedSessionMappingStorage implements SessionMappingS ID_TO_SESSION_KEY_MAPPING.remove(sessionId); } + @Override public synchronized HttpSession removeSessionByMappingId(String mappingId) { final HttpSession session = MANAGED_SESSIONS.get(mappingId); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java index 72eea2e..84c6318 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java @@ -41,6 +41,7 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { private final AtomicBoolean handlerInitialized = new AtomicBoolean(false); + @Override public void init(final FilterConfig filterConfig) throws ServletException { super.init(filterConfig); if (!isIgnoreInitConfiguration()) { @@ -75,8 +76,9 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { HANDLER.setSessionMappingStorage(storage); } + @Override public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, - final FilterChain filterChain) throws IOException, ServletException { + final FilterChain filterChain) throws IOException, ServletException { final HttpServletRequest request = (HttpServletRequest) servletRequest; final HttpServletResponse response = (HttpServletResponse) servletResponse; @@ -93,6 +95,7 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { } } + @Override public void destroy() { // nothing to do } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java index 4835d58..683604a 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java @@ -313,6 +313,7 @@ public final class SingleSignOutHandler { private class Servlet25LogoutStrategy implements LogoutStrategy { + @Override public void logout(final HttpServletRequest request) { // nothing additional to do here } @@ -320,6 +321,7 @@ public final class SingleSignOutHandler { private class Servlet30LogoutStrategy implements LogoutStrategy { + @Override public void logout(final HttpServletRequest request) { try { request.logout(); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHttpSessionListener.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHttpSessionListener.java index d1f3b5d..37e09a0 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHttpSessionListener.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHttpSessionListener.java @@ -36,10 +36,12 @@ public final class SingleSignOutHttpSessionListener implements HttpSessionListen private SessionMappingStorage sessionMappingStorage; + @Override public void sessionCreated(final HttpSessionEvent event) { // nothing to do at the moment } + @Override public void sessionDestroyed(final HttpSessionEvent event) { if (sessionMappingStorage == null) { sessionMappingStorage = getSessionMappingStorage(); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/AnyHostnameVerifier.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/AnyHostnameVerifier.java index c9672ce..06f480f 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/AnyHostnameVerifier.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/AnyHostnameVerifier.java @@ -32,6 +32,7 @@ import javax.net.ssl.SSLSession; public final class AnyHostnameVerifier implements HostnameVerifier { /** {@inheritDoc} */ + @Override public boolean verify(final String hostname, final SSLSession session) { return true; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/HttpsURLConnectionFactory.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/HttpsURLConnectionFactory.java index cede908..5a44c1b 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/HttpsURLConnectionFactory.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/HttpsURLConnectionFactory.java @@ -78,6 +78,7 @@ public final class HttpsURLConnectionFactory implements HttpURLConnectionFactory this.hostnameVerifier = verifier; } + @Override public HttpURLConnection buildHttpURLConnection(final URLConnection url) { return this.configureHttpsConnectionIfNeeded(url); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java index 14088ef..932a4ad 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/RegexHostnameVerifier.java @@ -50,6 +50,7 @@ public final class RegexHostnameVerifier implements HostnameVerifier, Serializab } /** {@inheritDoc} */ + @Override public boolean verify(final String hostname, final SSLSession session) { return pattern.matcher(hostname).matches(); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java index 93740d3..c522455 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/ssl/WhitelistHostnameVerifier.java @@ -56,6 +56,7 @@ public final class WhitelistHostnameVerifier implements HostnameVerifier, Serial } /** {@inheritDoc} */ + @Override public boolean verify(final String hostname, final SSLSession session) { for (final String allowedHost : this.allowedHosts) { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java index 77fef14..c9ce3ac 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java @@ -63,6 +63,7 @@ public abstract class AbstractCasFilter extends AbstractConfigurationFilter { this.protocol = protocol; } + @Override public final void init(final FilterConfig filterConfig) throws ServletException { super.init(filterConfig); if (!isIgnoreInitConfiguration()) { @@ -97,6 +98,7 @@ public abstract class AbstractCasFilter extends AbstractConfigurationFilter { } // empty implementation as most filters won't need this. + @Override public void destroy() { // nothing to do } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java index 9d3e542..220efa5 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractConfigurationFilter.java @@ -45,6 +45,7 @@ public abstract class AbstractConfigurationFilter implements Filter { private ConfigurationStrategy configurationStrategy; + @Override public void init(FilterConfig filterConfig) throws ServletException { final String configurationStrategyName = filterConfig.getServletContext().getInitParameter(CONFIGURATION_STRATEGY_KEY); this.configurationStrategy = ReflectUtils.newInstance(ConfigurationStrategyName.resolveToConfigurationStrategy(configurationStrategyName)); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java index 49b17c8..301b8c7 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AssertionThreadLocalFilter.java @@ -32,12 +32,14 @@ import org.jasig.cas.client.validation.Assertion; */ public final class AssertionThreadLocalFilter implements Filter { + @Override public void init(final FilterConfig filterConfig) throws ServletException { // nothing to do here } + @Override public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, - final FilterChain filterChain) throws IOException, ServletException { + final FilterChain filterChain) throws IOException, ServletException { final HttpServletRequest request = (HttpServletRequest) servletRequest; final HttpSession session = request.getSession(false); final Assertion assertion = (Assertion) (session == null ? request @@ -52,6 +54,7 @@ public final class AssertionThreadLocalFilter implements Filter { } } + @Override public void destroy() { // nothing to do } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java index 12d0c31..d1576df 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java @@ -77,10 +77,12 @@ public final class DelegatingFilter implements Filter { this.exactMatch = exactMatch; } + @Override public void destroy() { // nothing to do here } + @Override public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain filterChain) throws IOException, ServletException { @@ -107,6 +109,7 @@ public final class DelegatingFilter implements Filter { } } + @Override public void init(final FilterConfig filterConfig) throws ServletException { // nothing to do here. } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/ErrorRedirectFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/ErrorRedirectFilter.java index b1425a4..b35a49a 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/ErrorRedirectFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/ErrorRedirectFilter.java @@ -49,10 +49,12 @@ public final class ErrorRedirectFilter implements Filter { private String defaultErrorRedirectPage; + @Override public void destroy() { // nothing to do here } + @Override public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain filterChain) throws IOException, ServletException { final HttpServletResponse httpResponse = (HttpServletResponse) response; @@ -94,6 +96,7 @@ public final class ErrorRedirectFilter implements Filter { return throwable; } + @Override public void init(final FilterConfig filterConfig) throws ServletException { this.defaultErrorRedirectPage = filterConfig.getInitParameter("defaultErrorRedirectPage"); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java index 3c19670..925130e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilter.java @@ -54,6 +54,7 @@ public final class HttpServletRequestWrapperFilter extends AbstractConfiguration /** Whether or not to ignore case in role membership queries */ private boolean ignoreCase; + @Override public void destroy() { // nothing to do } @@ -63,8 +64,9 @@ public final class HttpServletRequestWrapperFilter extends AbstractConfiguration * request.getRemoteUser to the underlying Assertion object * stored in the user session. */ + @Override public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, - final FilterChain filterChain) throws IOException, ServletException { + final FilterChain filterChain) throws IOException, ServletException { final AttributePrincipal principal = retrievePrincipalFromSessionOrRequest(servletRequest); filterChain.doFilter(new CasHttpServletRequestWrapper((HttpServletRequest) servletRequest, principal), @@ -81,6 +83,7 @@ public final class HttpServletRequestWrapperFilter extends AbstractConfiguration return assertion == null ? null : assertion.getPrincipal(); } + @Override public void init(final FilterConfig filterConfig) throws ServletException { super.init(filterConfig); this.roleAttribute = getString(ConfigurationKeys.ROLE_ATTRIBUTE); @@ -96,14 +99,17 @@ public final class HttpServletRequestWrapperFilter extends AbstractConfiguration this.principal = principal; } + @Override public Principal getUserPrincipal() { return this.principal; } + @Override public String getRemoteUser() { return principal != null ? this.principal.getName() : null; } + @Override public boolean isUserInRole(final String role) { if (CommonUtils.isBlank(role)) { logger.debug("No valid role provided. Returning false."); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/MapNamespaceContext.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/MapNamespaceContext.java index 0afac39..2ede6ba 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/MapNamespaceContext.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/MapNamespaceContext.java @@ -61,10 +61,12 @@ public class MapNamespaceContext implements NamespaceContext { this.namespaceMap = namespaceMap; } + @Override public String getNamespaceURI(final String prefix) { return namespaceMap.get(prefix); } + @Override public String getPrefix(final String namespaceURI) { for (final Map.Entry entry : namespaceMap.entrySet()) { if (entry.getValue().equalsIgnoreCase(namespaceURI)) { @@ -74,6 +76,7 @@ public class MapNamespaceContext implements NamespaceContext { return null; } + @Override public Iterator getPrefixes(final String namespaceURI) { return Collections.singleton(getPrefix(namespaceURI)).iterator(); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/ThreadLocalXPathExpression.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/ThreadLocalXPathExpression.java index e0d9b5d..2e2c9fe 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/ThreadLocalXPathExpression.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/ThreadLocalXPathExpression.java @@ -50,18 +50,22 @@ public class ThreadLocalXPathExpression extends ThreadLocal imp this.context = context; } + @Override public Object evaluate(final Object o, final QName qName) throws XPathExpressionException { return get().evaluate(o, qName); } + @Override public String evaluate(final Object o) throws XPathExpressionException { return get().evaluate(o); } + @Override public Object evaluate(final InputSource inputSource, final QName qName) throws XPathExpressionException { return get().evaluate(inputSource, qName); } + @Override public String evaluate(final InputSource inputSource) throws XPathExpressionException { return get().evaluate(inputSource); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java index 6d8bb65..74260e2 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java @@ -118,13 +118,15 @@ public final class XmlUtils { private StringBuilder buffer = new StringBuilder(); + @Override public void startElement(final String uri, final String localName, final String qName, - final Attributes attributes) throws SAXException { + final Attributes attributes) throws SAXException { if (localName.equals(element)) { this.foundElement = true; } } + @Override public void endElement(final String uri, final String localName, final String qName) throws SAXException { if (localName.equals(element)) { this.foundElement = false; @@ -133,6 +135,7 @@ public final class XmlUtils { } } + @Override public void characters(char[] ch, int start, int length) throws SAXException { if (this.foundElement) { this.buffer.append(ch, start, length); @@ -169,19 +172,22 @@ public final class XmlUtils { private boolean foundElement = false; + @Override public void startElement(final String uri, final String localName, final String qName, - final Attributes attributes) throws SAXException { + final Attributes attributes) throws SAXException { if (localName.equals(element)) { this.foundElement = true; } } + @Override public void endElement(final String uri, final String localName, final String qName) throws SAXException { if (localName.equals(element)) { this.foundElement = false; } } + @Override public void characters(char[] ch, int start, int length) throws SAXException { if (this.foundElement) { builder.append(ch, start, length); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractCasProtocolUrlBasedTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractCasProtocolUrlBasedTicketValidator.java index 146280d..33000ef 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractCasProtocolUrlBasedTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractCasProtocolUrlBasedTicketValidator.java @@ -37,6 +37,7 @@ public abstract class AbstractCasProtocolUrlBasedTicketValidator extends Abstrac /** * Retrieves the response from the server by opening a connection and merely reading the response. */ + @Override protected final String retrieveResponseFromServer(final URL validationUrl, final String ticket) { return CommonUtils.getResponseFromServer(validationUrl, getURLConnectionFactory(), getEncoding()); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java index 51df207..3372f17 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractTicketValidationFilter.java @@ -127,6 +127,7 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { return null; } + @Override protected void initInternal(final FilterConfig filterConfig) throws ServletException { setExceptionOnValidationFailure(getBoolean(ConfigurationKeys.EXCEPTION_ON_VALIDATION_FAILURE)); setRedirectAfterValidation(getBoolean(ConfigurationKeys.REDIRECT_AFTER_VALIDATION)); @@ -141,6 +142,7 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { super.initInternal(filterConfig); } + @Override public void init() { super.init(); CommonUtils.assertNotNull(this.ticketValidator, "ticketValidator cannot be null."); @@ -186,8 +188,9 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { // nothing to do here. } + @Override public final void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, - final FilterChain filterChain) throws IOException, ServletException { + final FilterChain filterChain) throws IOException, ServletException { if (!preFilter(servletRequest, servletResponse, filterChain)) { return; @@ -252,4 +255,4 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { public final void setUseSession(final boolean useSession) { this.useSession = useSession; } -} \ No newline at end of file +} diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java index 2c9dd94..ce8e5f3 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java @@ -181,6 +181,7 @@ public abstract class AbstractUrlBasedTicketValidator implements TicketValidator protected abstract String retrieveResponseFromServer(URL validationUrl, String ticket); + @Override public final Assertion validate(final String ticket, final String service) throws TicketValidationException { final String validationUrl = constructValidationUrl(ticket, service); logger.debug("Constructing validation url: {}", validationUrl); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java index aca0dee..66ee5ca 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidationFilter.java @@ -40,6 +40,7 @@ public class Cas10TicketValidationFilter extends AbstractTicketValidationFilter super(Protocol.CAS1); } + @Override protected final TicketValidator getTicketValidator(final FilterConfig filterConfig) { final String casServerUrlPrefix = getString(ConfigurationKeys.CAS_SERVER_URL_PREFIX); final Cas10TicketValidator validator = new Cas10TicketValidator(casServerUrlPrefix); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidator.java index dce9a50..225baea 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidator.java @@ -35,10 +35,12 @@ public final class Cas10TicketValidator extends AbstractCasProtocolUrlBasedTicke super(casServerUrlPrefix); } + @Override protected String getUrlSuffix() { return "validate"; } + @Override protected Assertion parseResponseFromServer(final String response) throws TicketValidationException { if (!response.startsWith("yes")) { throw new TicketValidationException("CAS Server could not validate ticket."); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java index abd7056..0178759 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java @@ -91,6 +91,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal super(protocol); } + @Override protected void initInternal(final FilterConfig filterConfig) throws ServletException { setProxyReceptorUrl(getString(ConfigurationKeys.PROXY_RECEPTOR_URL)); @@ -122,6 +123,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal super.initInternal(filterConfig); } + @Override public void init() { super.init(); CommonUtils.assertNotNull(this.proxyGrantingTicketStorage, "proxyGrantingTicketStorage cannot be null."); @@ -158,6 +160,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal * @param filterConfig the Filter Configuration object. * @return a fully constructed TicketValidator. */ + @Override protected final TicketValidator getTicketValidator(final FilterConfig filterConfig) { final boolean allowAnyProxy = getBoolean(ConfigurationKeys.ACCEPT_ANY_PROXY); final String allowedProxyChains = getString(ConfigurationKeys.ALLOWED_PROXY_CHAINS); @@ -203,6 +206,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal return validator; } + @Override public void destroy() { super.destroy(); this.timer.cancel(); @@ -211,6 +215,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal /** * This processes the ProxyReceptor request before the ticket validation code executes. */ + @Override protected final boolean preFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain filterChain) throws IOException, ServletException { final HttpServletRequest request = (HttpServletRequest) servletRequest; diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java index 7bdf0d7..646cdca 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java @@ -46,6 +46,7 @@ public class Cas20ProxyTicketValidator extends Cas20ServiceTicketValidator { return this.allowedProxyChains; } + @Override protected String getUrlSuffix() { return "proxyValidate"; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java index 4c9b3d1..019bd13 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java @@ -78,14 +78,17 @@ public class Cas20ServiceTicketValidator extends AbstractCasProtocolUrlBasedTick * * @param urlParameters the Map containing the existing parameters to send to the server. */ + @Override protected final void populateUrlAttributeMap(final Map urlParameters) { urlParameters.put("pgtUrl", this.proxyCallbackUrl); } + @Override protected String getUrlSuffix() { return "serviceValidate"; } + @Override protected Assertion parseResponseFromServer(final String response) throws TicketValidationException { final String error = parseAuthenticationFailureFromResponse(response); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/ProxyListEditor.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/ProxyListEditor.java index dd5ce68..128f3bb 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/ProxyListEditor.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/ProxyListEditor.java @@ -36,6 +36,7 @@ import org.jasig.cas.client.util.CommonUtils; */ public final class ProxyListEditor extends PropertyEditorSupport { + @Override public void setAsText(final String text) throws IllegalArgumentException { final BufferedReader reader = new BufferedReader(new StringReader(text)); final List proxyChains = new ArrayList(); diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java b/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java index 2e831cb..b47c367 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java @@ -100,6 +100,7 @@ public final class PublicTestHttpServer extends Thread { httpServer = null; } + @Override public void run() { try { diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java index 77e74ce..cfe4cb2 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java @@ -94,6 +94,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { // nothing to do } @@ -116,6 +117,7 @@ public final class AuthenticationFilterTests { request.setSecure(true); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { // nothing to do } @@ -146,6 +148,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { // nothing to do } @@ -165,6 +168,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { // nothing to do } @@ -185,6 +189,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { // nothing to do } @@ -267,6 +272,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { } }; @@ -296,6 +302,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { } }; @@ -330,6 +337,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { } }; @@ -359,6 +367,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { } }; @@ -388,6 +397,7 @@ public final class AuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { } }; diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/configuration/ConfigurationStrategyNameTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/configuration/ConfigurationStrategyNameTests.java index 449ace5..b8aba11 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/configuration/ConfigurationStrategyNameTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/configuration/ConfigurationStrategyNameTests.java @@ -50,6 +50,7 @@ public final class ConfigurationStrategyNameTests { return null; } + @Override public void init(FilterConfig filterConfig, Class filterClazz) { } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/proxy/CleanUpTimerTaskTest.java b/cas-client-core/src/test/java/org/jasig/cas/client/proxy/CleanUpTimerTaskTest.java index 2b86502..31eb233 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/proxy/CleanUpTimerTaskTest.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/proxy/CleanUpTimerTaskTest.java @@ -51,14 +51,17 @@ public class CleanUpTimerTaskTest extends TestCase { return cleanUpCalled; } + @Override public void cleanUp() { cleanUpCalled = true; } + @Override public String retrieve(String proxyGrantingTicketIou) { return null; } + @Override public void save(String proxyGrantingTicketIou, String proxyGrantingTicket) { } } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/util/CasFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/util/CasFilterTests.java index 8960870..bc5c10d 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/util/CasFilterTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/util/CasFilterTests.java @@ -61,6 +61,7 @@ public final class CasFilterTests { public TestCasFilter() { super(Protocol.CAS2); } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { // nothing to do diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java index 76b7964..312259d 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java @@ -119,6 +119,7 @@ public final class HttpServletRequestWrapperFilterTests extends TestCase { private FilterChain createFilterChain() { return new FilterChain() { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { HttpServletRequestWrapperFilterTests.this.mockRequest = (HttpServletRequest) request; } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilterTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilterTests.java index 7c11042..5aece5d 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilterTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilterTests.java @@ -47,6 +47,7 @@ public class Cas20ProxyReceivingTicketValidationFilterTests extends TestCase { final Cas20ProxyReceivingTicketValidationFilter filter = newCas20ProxyReceivingTicketValidationFilter(); final Timer timer = new Timer(true) { + @Override public void schedule(TimerTask task, long delay, long period) { scheduleMethodFlag.setCalled(); } @@ -66,6 +67,7 @@ public class Cas20ProxyReceivingTicketValidationFilterTests extends TestCase { final Cas20ProxyReceivingTicketValidationFilter filter = newCas20ProxyReceivingTicketValidationFilter(); final Timer timer = new Timer(true) { + @Override public void cancel() { cancelMethodFlag.setCalled(); super.cancel(); @@ -87,6 +89,7 @@ public class Cas20ProxyReceivingTicketValidationFilterTests extends TestCase { final Cas20ProxyReceivingTicketValidationFilter filter = newCas20ProxyReceivingTicketValidationFilter(); final TimerTask timerTask = new TimerTask() { + @Override public void run() { timerTaskFlag.setCalled(); } @@ -112,6 +115,7 @@ public class Cas20ProxyReceivingTicketValidationFilterTests extends TestCase { final Cas20ProxyReceivingTicketValidationFilter filter = newCas20ProxyReceivingTicketValidationFilter(); final TimerTask timerTask = new TimerTask() { + @Override public void run() { timerTaskFlag.setCalled(); } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java index 59d630b..e044f15 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java @@ -75,6 +75,7 @@ public final class Cas20ProxyTicketValidatorTests extends AbstractTicketValidato /** Unique Id For serialization. */ private static final long serialVersionUID = 1L; + @Override public String getProxyTicketIdFor(String proxyGrantingTicketId, String targetService) { return "test"; } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java index 4100db4..f36f939 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java @@ -74,6 +74,7 @@ public final class Cas20ServiceTicketValidatorTests extends AbstractTicketValida /** Unique Id for serialization. */ private static final long serialVersionUID = 1L; + @Override public String getProxyTicketIdFor(String proxyGrantingTicketId, String targetService) { return "test"; } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java index fa87e57..11c4507 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas30ServiceTicketValidatorTests.java @@ -68,6 +68,7 @@ public final class Cas30ServiceTicketValidatorTests extends AbstractTicketValida /** Unique Id for serialization. */ private static final long serialVersionUID = 1L; + @Override public String getProxyTicketIdFor(String proxyGrantingTicketId, String targetService) { return "test"; } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/json/Cas30JsonServiceTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/json/Cas30JsonServiceTicketValidatorTests.java index 1163331..5634723 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/json/Cas30JsonServiceTicketValidatorTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/json/Cas30JsonServiceTicketValidatorTests.java @@ -37,6 +37,7 @@ public class Cas30JsonServiceTicketValidatorTests extends AbstractTicketValidato /** Unique Id for serialization. */ private static final long serialVersionUID = 1L; + @Override public String getProxyTicketIdFor(final String proxyGrantingTicketId, final String targetService) { return "test"; } diff --git a/cas-client-integration-jboss/src/main/java/org/jasig/cas/client/jboss/authentication/WebAuthenticationFilter.java b/cas-client-integration-jboss/src/main/java/org/jasig/cas/client/jboss/authentication/WebAuthenticationFilter.java index 597d495..0f05890 100644 --- a/cas-client-integration-jboss/src/main/java/org/jasig/cas/client/jboss/authentication/WebAuthenticationFilter.java +++ b/cas-client-integration-jboss/src/main/java/org/jasig/cas/client/jboss/authentication/WebAuthenticationFilter.java @@ -56,8 +56,9 @@ public final class WebAuthenticationFilter extends AbstractCasFilter { super(Protocol.CAS2); } + @Override public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, - final FilterChain chain) throws IOException, ServletException { + final FilterChain chain) throws IOException, ServletException { final HttpServletRequest request = (HttpServletRequest) servletRequest; final HttpServletResponse response = (HttpServletResponse) servletResponse; final HttpSession session = request.getSession(); 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 37af218..1f9d427 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 @@ -45,6 +45,7 @@ public abstract class AbstractLogoutHandler implements LogoutHandler { } /** {@inheritDoc} */ + @Override public void logout(final HttpServletRequest request, final HttpServletResponse response) { logger.debug("Processing logout request from CAS server."); diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java index f2cce31..b13bbc2 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java @@ -54,11 +54,13 @@ public class AssertionCasRealmDelegate implements CasRealm { } /** {@inheritDoc} */ + @Override public Principal authenticate(final Principal p) { return p; } /** {@inheritDoc} */ + @Override public String[] getRoles(final Principal p) { CommonUtils.assertTrue(p instanceof AttributePrincipal, "Expected instance of AttributePrincipal but got " + p.getClass()); @@ -70,6 +72,7 @@ public class AssertionCasRealmDelegate implements CasRealm { } /** {@inheritDoc} */ + @Override public boolean hasRole(final Principal principal, final String role) { if ("*".equals(role)) { return true; 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 dab417d..03e07c0 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 @@ -91,6 +91,7 @@ public class PropertiesCasRealmDelegate implements CasRealm { } /** {@inheritDoc} */ + @Override public Principal authenticate(final Principal p) { if (this.roleMap.containsKey(p.getName())) { return p; @@ -100,12 +101,14 @@ public class PropertiesCasRealmDelegate implements CasRealm { } /** {@inheritDoc} */ + @Override public String[] getRoles(final Principal p) { final Set roleSet = this.roleMap.get(p.getName()); return roleSet.toArray(new String[roleSet.size()]); } /** {@inheritDoc} */ + @Override public boolean hasRole(final Principal principal, final String role) { if ("*".equals(role)) { return true; 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 f4a33b1..8999ced 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 @@ -52,6 +52,7 @@ public final class RegexUriLogoutHandler extends AbstractLogoutHandler { } /** {@inheritDoc} */ + @Override public boolean isLogoutRequest(final HttpServletRequest request) { return this.logoutUriPattern.matcher(request.getRequestURI()).matches(); } 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 8f2a0f3..615906b 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 @@ -52,6 +52,7 @@ public final class StaticUriLogoutHandler extends AbstractLogoutHandler { } /** {@inheritDoc} */ + @Override public boolean isLogoutRequest(final HttpServletRequest request) { return this.logoutUri.equals(request.getRequestURI()); } diff --git a/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java b/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java index d4ee60a..9da1377 100644 --- a/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java +++ b/cas-client-integration-tomcat-common/src/test/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegateTests.java @@ -35,6 +35,7 @@ public class PropertiesCasRealmDelegateTests extends TestCase { private final PropertiesCasRealmDelegate realm = new PropertiesCasRealmDelegate(); /** {@inheritDoc} */ + @Override protected void setUp() throws Exception { super.setUp(); realm.setPropertiesFilePath("src/test/resources/org/jasig/cas/client/tomcat/user-roles.properties"); diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractAuthenticator.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractAuthenticator.java index 313de03..d246d3c 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractAuthenticator.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractAuthenticator.java @@ -80,6 +80,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements */ protected abstract TicketValidator getTicketValidator(); + @Override public void start() throws LifecycleException { super.start(); logger.debug("{} starting.", getName()); @@ -144,6 +145,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public final boolean authenticate(final Request request, final Response response, final LoginConfig loginConfig) throws IOException { Principal principal = request.getUserPrincipal(); @@ -162,6 +164,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public void lifecycleEvent(final LifecycleEvent event) { if (AFTER_START_EVENT.equals(event.getType())) { logger.debug("{} processing lifecycle event {}", getName(), AFTER_START_EVENT); @@ -172,6 +175,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public String getInfo() { return getName() + "/1.0"; } diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasAuthenticator.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasAuthenticator.java index b0fccc8..c756a81 100644 --- a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasAuthenticator.java +++ b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/AbstractCasAuthenticator.java @@ -37,10 +37,12 @@ public abstract class AbstractCasAuthenticator extends AbstractAuthenticator { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override protected final String getArtifactParameterName() { return "ticket"; } + @Override protected final String getServiceParameterName() { return "service"; } 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 083db69..c5c18a5 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 @@ -37,16 +37,19 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { protected final Logger logger = LoggerFactory.getLogger(getClass()); /** {@inheritDoc} */ + @Override public Principal authenticate(final Principal p) { return getDelegate().authenticate(p); } /** {@inheritDoc} */ + @Override public String[] getRoles(final Principal p) { return getDelegate().getRoles(p); } /** {@inheritDoc} */ + @Override public boolean hasRole(final Principal principal, final String role) { return getDelegate().hasRole(principal, role); } @@ -57,21 +60,25 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { } /** {@inheritDoc} */ + @Override public String getInfo() { return getClass().getName() + "/1.0"; } /** {@inheritDoc} */ + @Override protected String getName() { return getClass().getSimpleName(); } /** {@inheritDoc} */ + @Override protected String getPassword(final String username) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ + @Override 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 2ccb215..22baa0b 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 @@ -43,26 +43,31 @@ public abstract class AbstractLifecycleValve extends ValveBase implements Lifecy private final LifecycleSupport lifecycle = new LifecycleSupport(this); /** {@inheritDoc} */ + @Override public void addLifecycleListener(final LifecycleListener listener) { lifecycle.addLifecycleListener(listener); } /** {@inheritDoc} */ + @Override public LifecycleListener[] findLifecycleListeners() { return lifecycle.findLifecycleListeners(); } /** {@inheritDoc} */ + @Override public void removeLifecycleListener(final LifecycleListener listener) { lifecycle.removeLifecycleListener(listener); } /** {@inheritDoc} */ + @Override public void start() throws LifecycleException { logger.debug("{} starting.", getName()); } /** {@inheritDoc} */ + @Override public void stop() throws LifecycleException { logger.debug("{} stopping.", getName()); } 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 f893a21..cde9be0 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 @@ -34,6 +34,7 @@ import org.jasig.cas.client.tomcat.LogoutHandler; * @since 3.1.12 */ public abstract class AbstractLogoutValve extends AbstractLifecycleValve { + @Override public final void invoke(final Request request, final Response response) throws IOException, ServletException { if (getLogoutHandler().isLogoutRequest(request)) { getLogoutHandler().logout(request, response); 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 eee4cf9..6cd08a0 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 @@ -37,6 +37,7 @@ public class AssertionCasRealm extends AbstractCasRealm { private final AssertionCasRealmDelegate delegate = new AssertionCasRealmDelegate(); /** {@inheritDoc} */ + @Override public void start() throws LifecycleException { super.start(); logger.info("Startup completed."); @@ -50,6 +51,7 @@ public class AssertionCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return this.delegate; } 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 0c6a127..fad33de 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 @@ -37,18 +37,22 @@ public class Cas10CasAuthenticator extends AbstractCasAuthenticator { private Cas10TicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override public void start() throws LifecycleException { super.start(); this.ticketValidator = new Cas10TicketValidator(getCasServerUrlPrefix()); 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 03ceb29..efc02b2 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 @@ -37,18 +37,22 @@ public final class Cas20CasAuthenticator extends AbstractCasAuthenticator { private Cas20ServiceTicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override public void start() throws LifecycleException { super.start(); this.ticketValidator = new Cas20ServiceTicketValidator(getCasServerUrlPrefix()); 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 fe64d72..b5844e4 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 @@ -50,18 +50,22 @@ public final class Cas20ProxyCasAuthenticator extends AbstractCasAuthenticator { this.allowedProxyChains = allowedProxyChains; } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override public void start() throws LifecycleException { super.start(); this.ticketValidator = new Cas20ProxyTicketValidator(getCasServerUrlPrefix()); 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 88dcbb3..31a9207 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 @@ -50,6 +50,7 @@ public class PropertiesCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override public void start() throws LifecycleException { super.start(); this.delegate.readProperties(); @@ -57,6 +58,7 @@ public class PropertiesCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return this.delegate; } 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 d695fd8..a50e158 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 @@ -60,6 +60,7 @@ public final class ProxyCallbackValve extends AbstractLifecycleValve { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override public void start() throws LifecycleException { super.start(); @@ -74,6 +75,7 @@ public final class ProxyCallbackValve extends AbstractLifecycleValve { logger.info("Startup completed."); } + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.proxyCallbackUrl.equals(request.getRequestURI())) { logger.debug("Processing proxy callback request."); @@ -85,6 +87,7 @@ public final class ProxyCallbackValve extends AbstractLifecycleValve { } /** {@inheritDoc} */ + @Override protected String getName() { return NAME; } 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 87545dd..7b777ee 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 @@ -44,6 +44,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUriRegex(regex); } + @Override public void start() throws LifecycleException { super.start(); this.logoutHandler.init(); @@ -51,11 +52,13 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected String getName() { return NAME; } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } 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 c24bc0d..1dbf527 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 @@ -48,6 +48,7 @@ public class Saml11Authenticator extends AbstractAuthenticator { this.tolerance = ms; } + @Override public void start() throws LifecycleException { super.start(); this.ticketValidator = new Saml11TicketValidator(getCasServerUrlPrefix()); @@ -62,24 +63,29 @@ public class Saml11Authenticator extends AbstractAuthenticator { logger.info("Startup completed."); } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } /** {@inheritDoc} */ + @Override protected String getArtifactParameterName() { return "SAMLart"; } /** {@inheritDoc} */ + @Override protected String getServiceParameterName() { return "TARGET"; } + @Override protected String getName() { return NAME; } 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 7c20216..a2510eb 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 @@ -65,6 +65,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio } /** {@inheritDoc} */ + @Override public void start() throws LifecycleException { super.start(); this.handler.init(); @@ -72,6 +73,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio } /** {@inheritDoc} */ + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.handler.process(request, response)) { getNext().invoke(request, response); @@ -79,6 +81,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio } /** {@inheritDoc} */ + @Override public void sessionEvent(final SessionEvent event) { if (Session.SESSION_DESTROYED_EVENT.equals(event.getType())) { logger.debug("Cleaning up SessionMappingStorage on destroySession event"); @@ -87,6 +90,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio } /** {@inheritDoc} */ + @Override protected String getName() { return NAME; } 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 4e877ba..8d2e898 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 @@ -44,6 +44,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUri(logoutUri); } + @Override public void start() throws LifecycleException { super.start(); this.logoutHandler.init(); @@ -51,11 +52,13 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected String getName() { return NAME; } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } 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 96a56c8..21484af 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 @@ -60,6 +60,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements * * @return the authentication method. */ + @Override protected String getAuthMethod() { return getAuthenticationMethod(); } @@ -86,6 +87,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements */ protected abstract TicketValidator getTicketValidator(); + @Override protected void startInternal() throws LifecycleException { super.startInternal(); logger.debug("{} starting.", getName()); @@ -150,8 +152,9 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public final boolean authenticate(final Request request, final HttpServletResponse response, - final LoginConfig loginConfig) throws IOException { + final LoginConfig loginConfig) throws IOException { Principal principal = request.getUserPrincipal(); boolean result = false; if (principal == null) { @@ -168,6 +171,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public void lifecycleEvent(final LifecycleEvent event) { if (AFTER_START_EVENT.equals(event.getType())) { logger.debug("{} processing lifecycle event {}", getName(), AFTER_START_EVENT); @@ -178,12 +182,14 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public String getInfo() { return getName() + "/1.0"; } /** {@inheritDoc} */ - protected synchronized void setState(LifecycleState state, Object data) { + @Override + protected synchronized void setState(LifecycleState state, Object data) throws LifecycleException { super.setState(state, data); if (LifecycleState.STARTED.equals(state)) { logger.info("{} started.", getName()); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasAuthenticator.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasAuthenticator.java index 7f451e8..e058c5a 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasAuthenticator.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractCasAuthenticator.java @@ -37,10 +37,12 @@ public abstract class AbstractCasAuthenticator extends AbstractAuthenticator { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override protected final String getArtifactParameterName() { return "ticket"; } + @Override protected final String getServiceParameterName() { return "service"; } 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 3ffd729..55615ae 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 @@ -33,15 +33,18 @@ import org.jasig.cas.client.tomcat.CasRealm; public abstract class AbstractCasRealm extends RealmBase implements CasRealm { /** {@inheritDoc} */ + @Override public Principal authenticate(final Principal p) { return getDelegate().authenticate(p); } /** {@inheritDoc} */ + @Override public String[] getRoles(final Principal p) { return getDelegate().getRoles(p); } + @Override public boolean hasRole(final Principal principal, final String role) { return getDelegate().hasRole(principal, role); } @@ -49,6 +52,7 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { /** * Tomcat 7.0.8 changed their APIs so {@link #hasRole(java.security.Principal, String)} is only valid for 7.0.7 and below. */ + @Override public boolean hasRole(final Wrapper wrapper, final Principal principal, final String role) { return hasRole(principal, role); } @@ -59,21 +63,25 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { } /** {@inheritDoc} */ + @Override public String getInfo() { return getClass().getName() + "/1.0"; } /** {@inheritDoc} */ + @Override protected String getName() { return getClass().getSimpleName(); } /** {@inheritDoc} */ + @Override protected String getPassword(final String userName) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ + @Override protected Principal getPrincipal(final String userName) { throw new UnsupportedOperationException(); } 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 550bf2a..4bfb74a 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 @@ -40,6 +40,7 @@ public abstract class AbstractLogoutValve extends ValveBase { protected final Logger logger = LoggerFactory.getLogger(getClass()); + @Override public final void invoke(final Request request, final Response response) throws IOException, ServletException { if (getLogoutHandler().isLogoutRequest(request)) { getLogoutHandler().logout(request, response); 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 43bd27c..288b733 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 @@ -43,6 +43,7 @@ public class AssertionCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return delegate; } 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 a6211ab..02c5760 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 @@ -37,18 +37,22 @@ public final class Cas10CasAuthenticator extends AbstractCasAuthenticator { private Cas10TicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas10TicketValidator(getCasServerUrlPrefix()); 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 5b69c43..a1b5ead 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 @@ -37,18 +37,22 @@ public final class Cas20CasAuthenticator extends AbstractCasAuthenticator { private Cas20ServiceTicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas20ServiceTicketValidator(getCasServerUrlPrefix()); 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 11fc536..b7004a1 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 @@ -50,18 +50,22 @@ public final class Cas20ProxyCasAuthenticator extends AbstractCasAuthenticator { this.allowedProxyChains = allowedProxyChains; } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas20ProxyTicketValidator(getCasServerUrlPrefix()); 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 e3f4b12..adef775 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 @@ -50,12 +50,14 @@ public class PropertiesCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.delegate.readProperties(); } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return this.delegate; } diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/ProxyCallbackValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/ProxyCallbackValve.java index f0c2afe..ecc2ab7 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/ProxyCallbackValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/ProxyCallbackValve.java @@ -64,6 +64,7 @@ public final class ProxyCallbackValve extends ValveBase { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); @@ -78,6 +79,7 @@ public final class ProxyCallbackValve extends ValveBase { logger.info("Startup completed."); } + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.proxyCallbackUrl.equals(request.getRequestURI())) { logger.debug("Processing proxy callback request."); 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 40f086b..cd758e0 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 @@ -42,6 +42,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUriRegex(regex); } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); @@ -49,6 +50,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Saml11Authenticator.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Saml11Authenticator.java index b3b5b88..1953b71 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Saml11Authenticator.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/Saml11Authenticator.java @@ -48,6 +48,7 @@ public final class Saml11Authenticator extends AbstractAuthenticator { this.tolerance = ms; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Saml11TicketValidator(getCasServerUrlPrefix()); @@ -60,24 +61,29 @@ public final class Saml11Authenticator extends AbstractAuthenticator { this.ticketValidator.setRenew(isRenew()); } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } /** {@inheritDoc} */ + @Override protected String getArtifactParameterName() { return "SAMLart"; } /** {@inheritDoc} */ + @Override protected String getServiceParameterName() { return "TARGET"; } + @Override protected String getName() { return NAME; } 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 66f2853..e62d9ac 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 @@ -69,6 +69,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.handler.process(request, response)) { getNext().invoke(request, response); @@ -76,6 +77,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override public void sessionEvent(final SessionEvent event) { if (Session.SESSION_DESTROYED_EVENT.equals(event.getType())) { logger.debug("Cleaning up SessionMappingStorage on destroySession event"); @@ -84,6 +86,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override protected void startInternal() throws LifecycleException { super.startInternal(); logger.info("Starting..."); 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 4585719..aa964ca 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 @@ -42,6 +42,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUri(logoutUri); } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); @@ -49,6 +50,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractAuthenticator.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractAuthenticator.java index 6ad0d4b..cd1e04c 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractAuthenticator.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractAuthenticator.java @@ -23,7 +23,11 @@ import java.security.Principal; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.*; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LifecycleState; +import org.apache.catalina.Realm; import org.apache.catalina.authenticator.AuthenticatorBase; import org.apache.catalina.connector.Request; import org.jasig.cas.client.tomcat.AuthenticatorDelegate; @@ -61,6 +65,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements * * @return the authentication method. */ + @Override protected String getAuthMethod() { return getAuthenticationMethod(); } @@ -87,10 +92,11 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements */ protected abstract TicketValidator getTicketValidator(); + @Override protected void startInternal() throws LifecycleException { super.startInternal(); logger.debug("{} starting.", getName()); - final Realm realm = this.context.getRealm(); + final Realm realm = getContainer().getRealm(); try { CommonUtils.assertTrue(realm instanceof CasRealm, "Expected CasRealm but got " + realm.getClass()); CommonUtils.assertNotNull(this.casServerUrlPrefix, "casServerUrlPrefix cannot be null."); @@ -151,7 +157,8 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ - public final boolean authenticate(final Request request, final HttpServletResponse response) throws IOException { + @Override + public final boolean doAuthenticate(final Request request, final HttpServletResponse response) throws IOException { Principal principal = request.getUserPrincipal(); boolean result = false; if (principal == null) { @@ -168,6 +175,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public void lifecycleEvent(final LifecycleEvent event) { if (AFTER_START_EVENT.equals(event.getType())) { logger.debug("{} processing lifecycle event {}", getName(), AFTER_START_EVENT); @@ -184,7 +192,8 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements /** {@inheritDoc} * @throws LifecycleException */ - protected synchronized void setState(LifecycleState state, Object data) throws LifecycleException { + @Override + protected synchronized void setState(final LifecycleState state, final Object data) throws LifecycleException { super.setState(state, data); if (LifecycleState.STARTED.equals(state)) { logger.info("{} started.", getName()); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasAuthenticator.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasAuthenticator.java index 3be3db8..99ba43e 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasAuthenticator.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasAuthenticator.java @@ -37,10 +37,12 @@ public abstract class AbstractCasAuthenticator extends AbstractAuthenticator { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override protected final String getArtifactParameterName() { return "ticket"; } + @Override protected final String getServiceParameterName() { return "service"; } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasRealm.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasRealm.java index c3b2144..60f1004 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasRealm.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractCasRealm.java @@ -33,15 +33,18 @@ import org.jasig.cas.client.tomcat.CasRealm; public abstract class AbstractCasRealm extends RealmBase implements CasRealm { /** {@inheritDoc} */ + @Override public Principal authenticate(final Principal p) { return getDelegate().authenticate(p); } /** {@inheritDoc} */ + @Override public String[] getRoles(final Principal p) { return getDelegate().getRoles(p); } + @Override public boolean hasRole(final Principal principal, final String role) { return getDelegate().hasRole(principal, role); } @@ -49,6 +52,7 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { /** * Tomcat 7.0.8 changed their APIs so {@link #hasRole(java.security.Principal, String)} is only valid for 7.0.7 and below. */ + @Override public boolean hasRole(final Wrapper wrapper, final Principal principal, final String role) { return hasRole(principal, role); } @@ -64,16 +68,19 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { } /** {@inheritDoc} */ + @Override protected String getName() { return getClass().getSimpleName(); } /** {@inheritDoc} */ + @Override protected String getPassword(final String userName) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ + @Override protected Principal getPrincipal(final String userName) { throw new UnsupportedOperationException(); } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractLogoutValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractLogoutValve.java index 4264c0d..f5b169a 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractLogoutValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AbstractLogoutValve.java @@ -40,6 +40,7 @@ public abstract class AbstractLogoutValve extends ValveBase { protected final Logger logger = LoggerFactory.getLogger(getClass()); + @Override public final void invoke(final Request request, final Response response) throws IOException, ServletException { if (getLogoutHandler().isLogoutRequest(request)) { getLogoutHandler().logout(request, response); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AssertionCasRealm.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AssertionCasRealm.java index 422f48a..37a8ab9 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AssertionCasRealm.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/AssertionCasRealm.java @@ -43,6 +43,7 @@ public class AssertionCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return delegate; } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas10CasAuthenticator.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas10CasAuthenticator.java index a518343..917d6e2 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas10CasAuthenticator.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas10CasAuthenticator.java @@ -37,18 +37,22 @@ public final class Cas10CasAuthenticator extends AbstractCasAuthenticator { private Cas10TicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas10TicketValidator(getCasServerUrlPrefix()); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20CasAuthenticator.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20CasAuthenticator.java index 86d40b4..b07972d 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20CasAuthenticator.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20CasAuthenticator.java @@ -37,18 +37,22 @@ public final class Cas20CasAuthenticator extends AbstractCasAuthenticator { private Cas20ServiceTicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas20ServiceTicketValidator(getCasServerUrlPrefix()); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20ProxyCasAuthenticator.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20ProxyCasAuthenticator.java index b5fa702..78f771e 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20ProxyCasAuthenticator.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Cas20ProxyCasAuthenticator.java @@ -50,18 +50,22 @@ public final class Cas20ProxyCasAuthenticator extends AbstractCasAuthenticator { this.allowedProxyChains = allowedProxyChains; } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas20ProxyTicketValidator(getCasServerUrlPrefix()); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/PropertiesCasRealm.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/PropertiesCasRealm.java index 9cbe8ea..afe3f3d 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/PropertiesCasRealm.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/PropertiesCasRealm.java @@ -50,12 +50,14 @@ public class PropertiesCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.delegate.readProperties(); } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return this.delegate; } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/ProxyCallbackValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/ProxyCallbackValve.java index adc98cc..ea53598 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/ProxyCallbackValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/ProxyCallbackValve.java @@ -64,6 +64,7 @@ public final class ProxyCallbackValve extends ValveBase { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); @@ -78,6 +79,7 @@ public final class ProxyCallbackValve extends ValveBase { logger.info("Startup completed."); } + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.proxyCallbackUrl.equals(request.getRequestURI())) { logger.debug("Processing proxy callback request."); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java index 914df6a..a69776b 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/RegexUriLogoutValve.java @@ -42,6 +42,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUriRegex(regex); } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); @@ -49,6 +50,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Saml11Authenticator.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Saml11Authenticator.java index fc44569..5cebb82 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Saml11Authenticator.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/Saml11Authenticator.java @@ -48,6 +48,7 @@ public final class Saml11Authenticator extends AbstractAuthenticator { this.tolerance = ms; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Saml11TicketValidator(getCasServerUrlPrefix()); @@ -60,24 +61,29 @@ public final class Saml11Authenticator extends AbstractAuthenticator { this.ticketValidator.setRenew(isRenew()); } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } /** {@inheritDoc} */ + @Override protected String getArtifactParameterName() { return "SAMLart"; } /** {@inheritDoc} */ + @Override protected String getServiceParameterName() { return "TARGET"; } + @Override protected String getName() { return NAME; } diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java index e1be82d..c66faee 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/SingleSignOutValve.java @@ -69,6 +69,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.handler.process(request, response)) { getNext().invoke(request, response); @@ -76,6 +77,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override public void sessionEvent(final SessionEvent event) { if (Session.SESSION_DESTROYED_EVENT.equals(event.getType())) { logger.debug("Cleaning up SessionMappingStorage on destroySession event"); @@ -84,6 +86,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override protected void startInternal() throws LifecycleException { super.startInternal(); logger.info("Starting..."); diff --git a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java index 83a49ea..3e9cc72 100644 --- a/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v8/src/main/java/org/jasig/cas/client/tomcat/v8/StaticUriLogoutValve.java @@ -42,6 +42,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUri(logoutUri); } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); @@ -49,6 +50,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractAuthenticator.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractAuthenticator.java index 8c40a57..96f1136 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractAuthenticator.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractAuthenticator.java @@ -61,6 +61,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements * * @return the authentication method. */ + @Override protected String getAuthMethod() { return getAuthenticationMethod(); } @@ -87,6 +88,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements */ protected abstract TicketValidator getTicketValidator(); + @Override protected void startInternal() throws LifecycleException { super.startInternal(); logger.debug("{} starting.", getName()); @@ -170,6 +172,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements } /** {@inheritDoc} */ + @Override public void lifecycleEvent(final LifecycleEvent event) { if (AFTER_START_EVENT.equals(event.getType())) { logger.debug("{} processing lifecycle event {}", getName(), AFTER_START_EVENT); @@ -186,6 +189,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements /** {@inheritDoc} * @throws LifecycleException */ + @Override protected synchronized void setState(final LifecycleState state, final Object data) throws LifecycleException { super.setState(state, data); if (LifecycleState.STARTED.equals(state)) { diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasAuthenticator.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasAuthenticator.java index 5b232b9..c69aa98 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasAuthenticator.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasAuthenticator.java @@ -37,10 +37,12 @@ public abstract class AbstractCasAuthenticator extends AbstractAuthenticator { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override protected final String getArtifactParameterName() { return "ticket"; } + @Override protected final String getServiceParameterName() { return "service"; } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasRealm.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasRealm.java index 39bf0ef..ea35953 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasRealm.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractCasRealm.java @@ -33,15 +33,18 @@ import org.jasig.cas.client.tomcat.CasRealm; public abstract class AbstractCasRealm extends RealmBase implements CasRealm { /** {@inheritDoc} */ + @Override public Principal authenticate(final Principal p) { return getDelegate().authenticate(p); } /** {@inheritDoc} */ + @Override public String[] getRoles(final Principal p) { return getDelegate().getRoles(p); } + @Override public boolean hasRole(final Principal principal, final String role) { return getDelegate().hasRole(principal, role); } @@ -49,6 +52,7 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { /** * Tomcat 7.0.8 changed their APIs so {@link #hasRole(java.security.Principal, String)} is only valid for 7.0.7 and below. */ + @Override public boolean hasRole(final Wrapper wrapper, final Principal principal, final String role) { return hasRole(principal, role); } @@ -64,16 +68,19 @@ public abstract class AbstractCasRealm extends RealmBase implements CasRealm { } /** {@inheritDoc} */ + @Override protected String getName() { return getClass().getSimpleName(); } /** {@inheritDoc} */ + @Override protected String getPassword(final String userName) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ + @Override protected Principal getPrincipal(final String userName) { throw new UnsupportedOperationException(); } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractLogoutValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractLogoutValve.java index 7a51981..cc2156f 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractLogoutValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AbstractLogoutValve.java @@ -40,6 +40,7 @@ public abstract class AbstractLogoutValve extends ValveBase { protected final Logger logger = LoggerFactory.getLogger(getClass()); + @Override public final void invoke(final Request request, final Response response) throws IOException, ServletException { if (getLogoutHandler().isLogoutRequest(request)) { getLogoutHandler().logout(request, response); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AssertionCasRealm.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AssertionCasRealm.java index 0ccded7..8eae728 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AssertionCasRealm.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/AssertionCasRealm.java @@ -43,6 +43,7 @@ public class AssertionCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return delegate; } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas10CasAuthenticator.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas10CasAuthenticator.java index ec280b9..7cb99ed 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas10CasAuthenticator.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas10CasAuthenticator.java @@ -37,18 +37,22 @@ public final class Cas10CasAuthenticator extends AbstractCasAuthenticator { private Cas10TicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas10TicketValidator(getCasServerUrlPrefix()); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20CasAuthenticator.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20CasAuthenticator.java index 39c056d..d9991a8 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20CasAuthenticator.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20CasAuthenticator.java @@ -37,18 +37,22 @@ public final class Cas20CasAuthenticator extends AbstractCasAuthenticator { private Cas20ServiceTicketValidator ticketValidator; + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas20ServiceTicketValidator(getCasServerUrlPrefix()); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20ProxyCasAuthenticator.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20ProxyCasAuthenticator.java index b2d4da0..13faa05 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20ProxyCasAuthenticator.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Cas20ProxyCasAuthenticator.java @@ -50,18 +50,22 @@ public final class Cas20ProxyCasAuthenticator extends AbstractCasAuthenticator { this.allowedProxyChains = allowedProxyChains; } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } + @Override protected String getName() { return NAME; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Cas20ProxyTicketValidator(getCasServerUrlPrefix()); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/PropertiesCasRealm.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/PropertiesCasRealm.java index 60deaf9..2993f48 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/PropertiesCasRealm.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/PropertiesCasRealm.java @@ -50,12 +50,14 @@ public class PropertiesCasRealm extends AbstractCasRealm { } /** {@inheritDoc} */ + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.delegate.readProperties(); } /** {@inheritDoc} */ + @Override protected CasRealm getDelegate() { return this.delegate; } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/ProxyCallbackValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/ProxyCallbackValve.java index 6f85842..ccdcd71 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/ProxyCallbackValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/ProxyCallbackValve.java @@ -64,6 +64,7 @@ public final class ProxyCallbackValve extends ValveBase { this.proxyCallbackUrl = proxyCallbackUrl; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); @@ -78,6 +79,7 @@ public final class ProxyCallbackValve extends ValveBase { logger.info("Startup completed."); } + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.proxyCallbackUrl.equals(request.getRequestURI())) { logger.debug("Processing proxy callback request."); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java index 7caaec0..ee22587 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/RegexUriLogoutValve.java @@ -42,6 +42,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUriRegex(regex); } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); @@ -49,6 +50,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java index c1a07dd..3aa3e56 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/Saml11Authenticator.java @@ -48,6 +48,7 @@ public final class Saml11Authenticator extends AbstractAuthenticator { this.tolerance = ms; } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.ticketValidator = new Saml11TicketValidator(getCasServerUrlPrefix()); @@ -60,24 +61,29 @@ public final class Saml11Authenticator extends AbstractAuthenticator { this.ticketValidator.setRenew(isRenew()); } + @Override protected TicketValidator getTicketValidator() { return this.ticketValidator; } + @Override protected String getAuthenticationMethod() { return AUTH_METHOD; } /** {@inheritDoc} */ + @Override protected String getArtifactParameterName() { return "SAMLart"; } /** {@inheritDoc} */ + @Override protected String getServiceParameterName() { return "TARGET"; } + @Override protected String getName() { return NAME; } diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java index 8d27e05..02e3e30 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/SingleSignOutValve.java @@ -69,6 +69,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.handler.process(request, response)) { getNext().invoke(request, response); @@ -76,6 +77,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override public void sessionEvent(final SessionEvent event) { if (Session.SESSION_DESTROYED_EVENT.equals(event.getType())) { logger.debug("Cleaning up SessionMappingStorage on destroySession event"); @@ -84,6 +86,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { } /** {@inheritDoc} */ + @Override protected void startInternal() throws LifecycleException { super.startInternal(); logger.info("Starting..."); diff --git a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java index dbaf150..bcdfe92 100644 --- a/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java +++ b/cas-client-integration-tomcat-v85/src/main/java/org/jasig/cas/client/tomcat/v85/StaticUriLogoutValve.java @@ -42,6 +42,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { this.logoutHandler.setLogoutUri(logoutUri); } + @Override protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); @@ -49,6 +50,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { } /** {@inheritDoc} */ + @Override protected LogoutHandler getLogoutHandler() { return this.logoutHandler; } diff --git a/cas-client-support-distributed-ehcache/src/main/java/org/jasig/cas/client/proxy/EhcacheBackedProxyGrantingTicketStorageImpl.java b/cas-client-support-distributed-ehcache/src/main/java/org/jasig/cas/client/proxy/EhcacheBackedProxyGrantingTicketStorageImpl.java index 362a828..f48818b 100644 --- a/cas-client-support-distributed-ehcache/src/main/java/org/jasig/cas/client/proxy/EhcacheBackedProxyGrantingTicketStorageImpl.java +++ b/cas-client-support-distributed-ehcache/src/main/java/org/jasig/cas/client/proxy/EhcacheBackedProxyGrantingTicketStorageImpl.java @@ -48,6 +48,7 @@ public final class EhcacheBackedProxyGrantingTicketStorageImpl extends AbstractE this.cache = cache; } + @Override public void saveInternal(final String proxyGrantingTicketIou, final String proxyGrantingTicket) { final Element element = new Element(proxyGrantingTicketIou, proxyGrantingTicket); try { @@ -57,6 +58,7 @@ public final class EhcacheBackedProxyGrantingTicketStorageImpl extends AbstractE } } + @Override public String retrieveInternal(final String proxyGrantingTicketIou) { final Element element = this.cache.get(proxyGrantingTicketIou); @@ -67,6 +69,7 @@ public final class EhcacheBackedProxyGrantingTicketStorageImpl extends AbstractE return (String) element.getValue(); } + @Override public void cleanUp() { // nothing to do } diff --git a/cas-client-support-distributed-memcached/src/main/java/org/jasig/cas/client/proxy/MemcachedBackedProxyGrantingTicketStorageImpl.java b/cas-client-support-distributed-memcached/src/main/java/org/jasig/cas/client/proxy/MemcachedBackedProxyGrantingTicketStorageImpl.java index 42cd866..da871b1 100644 --- a/cas-client-support-distributed-memcached/src/main/java/org/jasig/cas/client/proxy/MemcachedBackedProxyGrantingTicketStorageImpl.java +++ b/cas-client-support-distributed-memcached/src/main/java/org/jasig/cas/client/proxy/MemcachedBackedProxyGrantingTicketStorageImpl.java @@ -95,14 +95,17 @@ public final class MemcachedBackedProxyGrantingTicketStorageImpl extends } } + @Override public void saveInternal(final String proxyGrantingTicketIou, final String proxyGrantingTicket) { handleSynchronousRequest(this.client.add(proxyGrantingTicketIou, 120, proxyGrantingTicket)); } + @Override public String retrieveInternal(final String proxyGrantingTicketIou) { return (String) this.client.get(proxyGrantingTicketIou); } + @Override public void cleanUp() { // we actually don't have anything to do here, yay! } diff --git a/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java b/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java index 2d2e18f..bf6da4f 100644 --- a/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java +++ b/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java @@ -42,6 +42,7 @@ public class Saml11TicketValidationFilter extends AbstractTicketValidationFilter super(Protocol.SAML11); } + @Override protected final TicketValidator getTicketValidator(final FilterConfig filterConfig) { final Saml11TicketValidator validator = new Saml11TicketValidator(getString(ConfigurationKeys.CAS_SERVER_URL_PREFIX)); final long tolerance = getLong(ConfigurationKeys.TOLERANCE); diff --git a/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java b/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java index 8e9561a..2f8a7e5 100644 --- a/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java +++ b/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java @@ -106,10 +106,12 @@ public final class Saml11TicketValidator extends AbstractUrlBasedTicketValidator } } + @Override protected String getUrlSuffix() { return "samlValidate"; } + @Override protected void populateUrlAttributeMap(final Map urlParameters) { final String service = urlParameters.get("service"); urlParameters.remove("service"); @@ -117,6 +119,7 @@ public final class Saml11TicketValidator extends AbstractUrlBasedTicketValidator urlParameters.put("TARGET", service); } + @Override protected Assertion parseResponseFromServer(final String response) throws TicketValidationException { try { final Document document = XmlUtils.newDocument(response); @@ -187,6 +190,7 @@ public final class Saml11TicketValidator extends AbstractUrlBasedTicketValidator return false; } + @Override protected String retrieveResponseFromServer(final URL validationUrl, final String ticket) { final String request = String.format( SAML_REQUEST_TEMPLATE,