This commit is contained in:
Misagh Moayyed 2019-01-31 01:43:33 -07:00
parent cc756cb72d
commit 86b93cbb26
43 changed files with 27 additions and 60 deletions

View File

@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
@ -50,7 +49,7 @@ public final class PropertiesConfigurationStrategyImpl extends BaseConfiguration
private String simpleFilterName;
private Properties properties = new Properties();
private final Properties properties = new Properties();
@Override
protected String get(final ConfigurationKey configurationKey) {

View File

@ -36,7 +36,7 @@ public class AssertionPrincipal extends SimplePrincipal implements Serializable
private static final long serialVersionUID = 2288520214366461693L;
/** CAS assertion describing authenticated state */
private Assertion assertion;
private final Assertion assertion;
/**
* Creates a new principal containing the CAS assertion.

View File

@ -162,7 +162,7 @@ public class CasLoginModule implements LoginModule {
protected String[] defaultRoles;
/** Names of attributes in the CAS assertion that should be used for role data */
protected Set<String> roleAttributeNames = new HashSet<String>();
protected final Set<String> roleAttributeNames = new HashSet<String>();
/** Name of JAAS Group containing caller principal */
protected String principalGroupName = DEFAULT_PRINCIPAL_GROUP_NAME;
@ -292,10 +292,10 @@ public class CasLoginModule implements LoginModule {
try {
this.callbackHandler.handle(new Callback[] { ticketCallback, serviceCallback });
} catch (final IOException e) {
logger.info("Login failed due to IO exception in callback handler: {}", e);
logger.info("Login failed due to IO exception in callback handler", e);
throw (LoginException) new LoginException("IO exception in callback handler: " + e).initCause(e);
} catch (final UnsupportedCallbackException e) {
logger.info("Login failed due to unsupported callback: {}", e);
logger.info("Login failed due to unsupported callback", e);
throw (LoginException) new LoginException(
"Callback handler does not support PasswordCallback and TextInputCallback.").initCause(e);
}
@ -325,7 +325,7 @@ public class CasLoginModule implements LoginModule {
this.assertion = this.ticketValidator.validate(this.ticket.getName(), service);
} catch (final Exception e) {
logger.info("Login failed due to CAS ticket validation failure: {}", e);
logger.info("Login failed due to CAS ticket validation failure", e);
throw (LoginException) new LoginException("CAS ticket validation failed: " + e).initCause(e);
}
}

View File

@ -34,7 +34,7 @@ public final class TicketCredential implements Principal {
private static final int HASHCODE_SEED = 17;
/** Ticket ID string */
private String ticket;
private final String ticket;
/**
* Creates a new instance that wraps the given ticket.

View File

@ -23,7 +23,6 @@ package org.jasig.cas.client.proxy;
* them to a specific ProxyGrantingTicketIou.
*
* @author Scott Battaglia
* @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public interface ProxyGrantingTicketStorage {

View File

@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;
*
* @author Scott Battaglia
* @author Brad Cupit (brad [at] lsu {dot} edu)
* @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public final class ProxyGrantingTicketStorageImpl implements ProxyGrantingTicketStorage {
@ -57,7 +56,7 @@ public final class ProxyGrantingTicketStorageImpl implements ProxyGrantingTicket
*
* @see ProxyGrantingTicketStorageImpl#DEFAULT_TIMEOUT
*/
private long timeout;
private final long timeout;
/**
* Constructor set the timeout to the default value.

View File

@ -25,7 +25,6 @@ import java.io.Serializable;
* implementation a black box to the client.
*
* @author Scott Battaglia
* @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public interface ProxyRetriever extends Serializable {

View File

@ -39,7 +39,7 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter {
private static final SingleSignOutHandler HANDLER = new SingleSignOutHandler();
private AtomicBoolean handlerInitialized = new AtomicBoolean(false);
private final AtomicBoolean handlerInitialized = new AtomicBoolean(false);
public void init(final FilterConfig filterConfig) throws ServletException {
super.init(filterConfig);

View File

@ -38,7 +38,7 @@ public final class RegexHostnameVerifier implements HostnameVerifier, Serializab
private static final long serialVersionUID = 1L;
/** Allowed hostname pattern */
private Pattern pattern;
private final Pattern pattern;
/**
* Creates a new instance using the given regular expression.

View File

@ -35,7 +35,7 @@ public final class WhitelistHostnameVerifier implements HostnameVerifier, Serial
private static final long serialVersionUID = 1L;
/** Allowed hosts */
private String[] allowedHosts;
private final String[] allowedHosts;
/**
* Creates a new instance using the given array of allowed hosts.

View File

@ -45,7 +45,7 @@ public abstract class AbstractCasFilter extends AbstractConfigurationFilter {
/** Represents the constant for where the assertion will be located in memory. */
public static final String CONST_CAS_ASSERTION = "_const_cas_assertion_";
private Protocol protocol;
private final Protocol protocol;
/** Sets where response.encodeUrl should be called on service urls when constructed. */
private boolean encodeServiceUrl = true;

View File

@ -24,7 +24,6 @@ import org.jasig.cas.client.validation.Assertion;
* Static holder that places Assertion in a ThreadLocal.
*
* @author Scott Battaglia
* @version $Revision: 11728 $ $Date: 2007-09-26 14:20:43 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public class AssertionHolder {

View File

@ -28,7 +28,6 @@ import org.jasig.cas.client.validation.Assertion;
* Places the assertion in a ThreadLocal such that other resources can access it that do not have access to the web tier session.
*
* @author Scott Battaglia
* @version $Revision: 11728 $ $Date: 2007-09-26 14:20:43 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public final class AssertionThreadLocalFilter implements Filter {

View File

@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory;
* Common utilities so that we don't need to include Commons Lang.
*
* @author Scott Battaglia
* @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public final class CommonUtils {

View File

@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory;
* the associated filter is executed. Otherwise, the normal chain is executed.
*
* @author Scott Battaglia
* @version $Revision: 11729 $ $Date: 2006-09-26 14:22:30 -0400 (Tue, 26 Sep 2006) $
* @since 3.0
*/
public final class DelegatingFilter implements Filter {

View File

@ -44,7 +44,6 @@ import org.jasig.cas.client.validation.Assertion;
*
* @author Scott Battaglia
* @author Marvin S. Addison
* @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public final class HttpServletRequestWrapperFilter extends AbstractConfigurationFilter {

View File

@ -39,7 +39,6 @@ import javax.xml.parsers.SAXParserFactory;
* Common utilities for easily parsing XML without duplicating logic.
*
* @author Scott Battaglia
* @version $Revision: 11729 $ $Date: 2007-09-26 14:22:30 -0400 (Tue, 26 Sep 2007) $
* @since 3.0
*/
public final class XmlUtils {

View File

@ -24,7 +24,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;

View File

@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
/**
* @author Scott Battaglia
* @version $Revision: 11721 $ $Date: 2007-08-09 15:17:44 -0400 (Wed, 09 Aug 2007) $
* @since 3.0
*/
public final class PublicTestHttpServer extends Thread {
@ -47,7 +46,7 @@ public final class PublicTestHttpServer extends Thread {
private final CountDownLatch ready = new CountDownLatch(1);
private static Map<Integer, PublicTestHttpServer> serverMap = new HashMap<Integer, PublicTestHttpServer>();
private static final Map<Integer, PublicTestHttpServer> serverMap = new HashMap<Integer, PublicTestHttpServer>();
private PublicTestHttpServer(String data, String encoding, String MIMEType, int port)
throws UnsupportedEncodingException {

View File

@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
public class DefaultGatewayResolverImplTests {

View File

@ -30,7 +30,7 @@ public class ProxyGrantingTicketStorageImplTest {
private static final int TIME_OUT = 250;
private ProxyGrantingTicketStorage storage = new ProxyGrantingTicketStorageImpl(TIME_OUT);
private final ProxyGrantingTicketStorage storage = new ProxyGrantingTicketStorageImpl(TIME_OUT);
@Test
public void cleanUp() throws Exception {

View File

@ -22,7 +22,6 @@ import junit.framework.TestCase;
import org.jasig.cas.client.Protocol;
import org.jasig.cas.client.PublicTestHttpServer;
import org.jasig.cas.client.ssl.HttpsURLConnectionFactory;
import org.junit.Ignore;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@ -34,7 +33,6 @@ import java.util.Collection;
* Tests for the CommonUtils.
*
* @author Scott Battaglia
* @version $Revision: 11731 $ $Date: 2007-09-27 11:27:21 -0400 (Wed, 27 Sep 2007) $
* @since 3.0
*/
public final class CommonUtilsTests extends TestCase {

View File

@ -40,7 +40,6 @@ import org.springframework.mock.web.MockHttpSession;
* Tests for the HttpServletRequestWrapperFilter.
*
* @author Scott Battaglia
* @version $Revision: 11742 $ $Date: 2007-10-05 14:03:58 -0400 (Thu, 05 Oct 2007) $
* @since 3.0
*/

View File

@ -43,7 +43,6 @@ import org.junit.Test;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;

View File

@ -22,7 +22,6 @@ package org.jasig.cas.client.validation;
* Base class for all TicketValidator tests to inherit from.
*
* @author Scott Battaglia
* @version $Revision: 11731 $ $Date: 2007-09-27 11:27:21 -0400 (Wed, 27 Sep 2007) $
* @since 3.0
*/
public abstract class AbstractTicketValidatorTests {

View File

@ -29,7 +29,6 @@ import org.jasig.cas.client.authentication.AttributePrincipalImpl;
* Test cases for the {@link AssertionImpl}.
*
* @author Scott Battaglia
* @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $
* @since 3.0
*/
public final class AssertionImplTests extends TestCase {

View File

@ -21,7 +21,6 @@ package org.jasig.cas.client.validation;
import static org.junit.Assert.*;
import java.io.UnsupportedEncodingException;
import org.jasig.cas.client.PublicTestHttpServer;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
@ -29,7 +28,6 @@ import org.junit.Test;
* Test cases for the {@link Cas10TicketValidator}.
*
* @author Scott Battaglia
* @version $Revision: 11731 $ $Date: 2007-09-27 11:27:21 -0400 (Wed, 27 Sep 2007) $
* @since 3.0
*/
public final class Cas10TicketValidatorTests extends AbstractTicketValidatorTests {

View File

@ -35,7 +35,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
* Test cases for the {@link Cas20ProxyTicketValidator}.
*
* @author Scott Battaglia
* @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $
* @since 3.0
*/
public final class Cas20ProxyTicketValidatorTests extends AbstractTicketValidatorTests {

View File

@ -32,7 +32,6 @@ import org.junit.Test;
* Test cases for the {@link Cas20ServiceTicketValidator}.
*
* @author Scott Battaglia
* @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $
* @since 3.0
*/
public final class Cas20ServiceTicketValidatorTests extends AbstractTicketValidatorTests {

View File

@ -34,7 +34,6 @@ import static org.junit.Assert.*;
* Test cases for the {@link Cas20ServiceTicketValidator}.
*
* @author Scott Battaglia
* @version $Revision: 11737 $ $Date: 2007-10-03 09:14:02 -0400 (Tue, 03 Oct 2007) $
* @since 3.0
*/
public final class Cas30ServiceTicketValidatorTests extends AbstractTicketValidatorTests {
@ -49,11 +48,6 @@ public final class Cas30ServiceTicketValidatorTests extends AbstractTicketValida
super();
}
/*@AfterClass
public static void classCleanUp() {
server.shutdown();
} */
@Before
public void setUp() throws Exception {
this.proxyGrantingTicketStorage = getProxyGrantingTicketStorage();

View File

@ -241,7 +241,7 @@ public class CasAuthenticator extends AbstractLifeCycle implements Authenticator
logger.debug("Redirecting to {}", redirectUrl);
response.sendRedirect(redirectUrl);
} catch (IOException e) {
logger.debug("Redirect to CAS failed with error: {}", e);
logger.debug("Redirect to CAS failed with error", e);
throw new ServerAuthException("Redirect to CAS failed", e);
}
}

View File

@ -17,10 +17,10 @@ import java.util.Collection;
public class CasUserIdentity implements UserIdentity {
/** CAS principal. */
private AttributePrincipal principal;
private final AttributePrincipal principal;
/** Assertion attribute containing role data. */
private String roleAttribute;
private final String roleAttribute;
/**

View File

@ -32,7 +32,7 @@ import org.jasig.cas.client.authentication.AttributePrincipalImpl;
*
*/
public class PropertiesCasRealmDelegateTests extends TestCase {
private PropertiesCasRealmDelegate realm = new PropertiesCasRealmDelegate();
private final PropertiesCasRealmDelegate realm = new PropertiesCasRealmDelegate();
/** {@inheritDoc} */
protected void setUp() throws Exception {

View File

@ -40,7 +40,7 @@ public abstract class AbstractLifecycleValve extends ValveBase implements Lifecy
protected final Logger logger = LoggerFactory.getLogger(getClass());
/** Lifecycle listeners */
private LifecycleSupport lifecycle = new LifecycleSupport(this);
private final LifecycleSupport lifecycle = new LifecycleSupport(this);
/** {@inheritDoc} */
public void addLifecycleListener(final LifecycleListener listener) {

View File

@ -34,7 +34,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve {
private static final String NAME = RegexUriLogoutValve.class.getName();
private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);

View File

@ -34,7 +34,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve {
private static final String NAME = StaticUriLogoutValve.class.getName();
private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);

View File

@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler;
*/
public final class RegexUriLogoutValve extends AbstractLogoutValve {
private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);

View File

@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler;
*/
public final class StaticUriLogoutValve extends AbstractLogoutValve {
private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);

View File

@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler;
*/
public final class RegexUriLogoutValve extends AbstractLogoutValve {
private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);

View File

@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler;
*/
public final class StaticUriLogoutValve extends AbstractLogoutValve {
private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);

View File

@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.RegexUriLogoutHandler;
*/
public final class RegexUriLogoutValve extends AbstractLogoutValve {
private RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
private final RegexUriLogoutHandler logoutHandler = new RegexUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);

View File

@ -19,13 +19,9 @@
package org.jasig.cas.client.tomcat.v85;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Request;
import org.jasig.cas.client.validation.Saml11TicketValidator;
import org.jasig.cas.client.validation.TicketValidator;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* CAS authenticator that uses the SAML 1.1 protocol.
*

View File

@ -32,7 +32,7 @@ import org.jasig.cas.client.tomcat.StaticUriLogoutHandler;
*/
public final class StaticUriLogoutValve extends AbstractLogoutValve {
private StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
private final StaticUriLogoutHandler logoutHandler = new StaticUriLogoutHandler();
public void setRedirectUrl(final String redirectUrl) {
this.logoutHandler.setRedirectUrl(redirectUrl);