diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml index 8a13a67..849bceb 100644 --- a/cas-client-core/pom.xml +++ b/cas-client-core/pom.xml @@ -77,6 +77,13 @@ test + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + test + + log4j log4j 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 a9c8504..cc8ff71 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 @@ -72,7 +72,7 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { // Do not continue up filter chain return; } else { - log.trace("Ignoring URI " + request.getRequestURI()); + logger.trace("Ignoring URI {}", request.getRequestURI()); } filterChain.doFilter(servletRequest, servletResponse); 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 04cceeb..e6f09db 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 @@ -137,7 +137,7 @@ public final class SingleSignOutHandler { final HttpSession session = request.getSession(this.eagerlyCreateSessions); if (session == null) { - log.debug("No session currently exists (and none created). Cannot record session information for single sign out."); + logger.debug("No session currently exists (and none created). Cannot record session information for single sign out."); return; } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java index 733393f..a88c0dd 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java @@ -19,11 +19,11 @@ package org.jasig.cas.client.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage; import org.jasig.cas.client.validation.ProxyList; import org.jasig.cas.client.validation.ProxyListEditor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; @@ -52,8 +52,7 @@ import java.util.*; */ public final class CommonUtils { - /** Instance of Commons Logging. */ - private static final Log LOG = LogFactory.getLog(CommonUtils.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CommonUtils.class); /** * Constant representing the ProxyGrantingTicket IOU Request Parameter. @@ -189,20 +188,12 @@ public final class CommonUtils { return; } - if (LOG.isDebugEnabled()) { - LOG.debug("Received proxyGrantingTicketId [" - + proxyGrantingTicket + "] for proxyGrantingTicketIou [" - + proxyGrantingTicketIou + "]"); - } + LOGGER.debug("Received proxyGrantingTicketId [{}] for proxyGrantingTicketIou [{}]", proxyGrantingTicket, proxyGrantingTicketIou); proxyGrantingTicketStorage.save(proxyGrantingTicketIou, proxyGrantingTicket); - if (LOG.isDebugEnabled()) { - LOG.debug("Successfully saved proxyGrantingTicketId [" - + proxyGrantingTicket + "] for proxyGrantingTicketIou [" - + proxyGrantingTicketIou + "]"); - } - + LOGGER.debug("Successfully saved proxyGrantingTicketId [{}] for proxyGrantingTicketIou [{}]", proxyGrantingTicket, proxyGrantingTicketIou); + response.getWriter().write(""); response.getWriter().write(""); } @@ -275,9 +266,7 @@ public final class CommonUtils { if (location == 0) { final String returnValue = encode ? response.encodeURL(buffer.toString()): buffer.toString(); - if (LOG.isDebugEnabled()) { - LOG.debug("serviceUrl generated: " + returnValue); - } + LOGGER.debug("serviceUrl generated: {}", returnValue); return returnValue; } @@ -299,9 +288,7 @@ public final class CommonUtils { } final String returnValue = encode ? response.encodeURL(buffer.toString()) : buffer.toString(); - if (LOG.isDebugEnabled()) { - LOG.debug("serviceUrl generated: " + returnValue); - } + LOGGER.debug("serviceUrl generated: {}", returnValue); return returnValue; } @@ -323,7 +310,7 @@ public final class CommonUtils { */ public static String safeGetParameter(final HttpServletRequest request, final String parameter, final List parameters) { if ("POST".equals(request.getMethod()) && parameters.contains(parameter)) { - LOG.debug("safeGetParameter called on a POST HttpServletRequest for Restricted Parameters. Cannot complete check safely. Reverting to standard behavior for this Parameter"); + LOGGER.debug("safeGetParameter called on a POST HttpServletRequest for Restricted Parameters. Cannot complete check safely. Reverting to standard behavior for this Parameter"); return request.getParameter(parameter); } return request.getQueryString() == null || !request.getQueryString().contains(parameter) ? null : request.getParameter(parameter); @@ -376,7 +363,7 @@ public final class CommonUtils { } return stringBuffer.toString(); } catch (final Exception e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } finally { if (conn != null && conn instanceof HttpURLConnection) { @@ -420,7 +407,7 @@ public final class CommonUtils { try { response.sendRedirect(url); } catch (final Exception e) { - LOG.warn(e.getMessage(), e); + LOGGER.warn(e.getMessage(), e); } } 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 6c71ef8..4dfd5f6 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 @@ -19,8 +19,8 @@ package org.jasig.cas.client.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -46,7 +46,7 @@ public final class DelegatingFilter implements Filter { /** * Instance of Commons Logging. */ - private final Log log = LogFactory.getLog(this.getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); /** * The request parameter to look for in the Request object. @@ -95,19 +95,14 @@ public final class DelegatingFilter implements Filter { for (final String key : this.delegators.keySet()) { if ((parameter.equals(key) && this.exactMatch) || (parameter.matches(key) && !this.exactMatch)) { final Filter filter = this.delegators.get(key); - if (log.isDebugEnabled()) { - log.debug("Match found for parameter [" - + this.requestParameterName + "] with value [" - + parameter + "]. Delegating to filter [" - + filter.getClass().getName() + "]"); - } + logger.debug("Match found for parameter [{}] with value [{}]. Delegating to filter [{}]", this.requestParameterName, parameter, filter.getClass().getName()); filter.doFilter(request, response, filterChain); return; } } } - log.debug("No match found for parameter [" + this.requestParameterName + "] with value [" + parameter + "]"); + logger.debug("No match found for parameter [{}] with value [{}]", this.requestParameterName , parameter); if (this.defaultFilter != null) { this.defaultFilter.doFilter(request, response, filterChain); 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 9ad2862..f630a56 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 @@ -32,8 +32,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Filters that redirects to the supplied url based on an exception. Exceptions and the urls are configured via @@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFactory; */ public final class ErrorRedirectFilter implements Filter { - private final Log log = LogFactory.getLog(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); private final List errors = new ArrayList(); @@ -97,7 +97,7 @@ public final class ErrorRedirectFilter implements Filter { this.errors.add(new ErrorHolder(className, filterConfig.getInitParameter(className))); } } catch (final ClassNotFoundException e) { - log.warn("Class [" + className + "] cannot be found in ClassLoader. Ignoring."); + logger.warn("Class [{}] cannot be found in ClassLoader. Ignoring.", className); } } } 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 56920b0..c63a04c 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 @@ -107,17 +107,17 @@ public final class HttpServletRequestWrapperFilter extends AbstractConfiguration public boolean isUserInRole(final String role) { if (CommonUtils.isBlank(role)) { - log.debug("No valid role provided. Returning false."); + logger.debug("No valid role provided. Returning false."); return false; } if (this.principal == null) { - log.debug("No Principal in Request. Returning false."); + logger.debug("No Principal in Request. Returning false."); return false; } if (CommonUtils.isBlank(roleAttribute)) { - log.debug("No Role Attribute Configured. Returning false."); + logger.debug("No Role Attribute Configured. Returning false."); return false; } @@ -126,14 +126,14 @@ public final class HttpServletRequestWrapperFilter extends AbstractConfiguration if (value instanceof Collection) { for (final Object o : (Collection) value) { if (rolesEqual(role, o)) { - log.debug("User [" + getRemoteUser() + "] is in role [" + role + "]: " + true); + logger.debug("User [{}] is in role [{}]: true", getRemoteUser(), role); return true; } } } final boolean isMember = rolesEqual(role, value); - log.debug("User [" + getRemoteUser() + "] is in role [" + role + "]: " + isMember); + logger.debug("User [{}] is in role [{}]: {}", getRemoteUser(), role, isMember); return isMember; } 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 62abfdf..3fd1cf1 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 @@ -19,8 +19,8 @@ package org.jasig.cas.client.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.Attributes; @@ -50,7 +50,7 @@ public final class XmlUtils { /** * Static instance of Commons Logging. */ - private final static Log LOG = LogFactory.getLog(XmlUtils.class); + private final static Logger LOGGER = LoggerFactory.getLogger(XmlUtils.class); /** * Get an instance of an XML reader from the XMLReaderFactory. @@ -118,7 +118,7 @@ public final class XmlUtils { try { reader.parse(new InputSource(new StringReader(xmlAsString))); } catch (final Exception e) { - LOG.error(e, e); + LOGGER.error(e.getMessage(), e); return null; } @@ -171,33 +171,10 @@ public final class XmlUtils { try { reader.parse(new InputSource(new StringReader(xmlAsString))); } catch (final Exception e) { - LOG.error(e, e); + LOGGER.error(e.getMessage(), e); return null; } return builder.toString(); } - - /** - * Retrieve the child nodes from xml string, for a specific element. - * - * @param xmlAsString the xml response - * @param tagName the element to look for - * @return the {@link org.w3c.dom.NodeList NodeList} containing the child nodes. - * @throws ParserConfigurationException - * @throws IOException - * @throws SAXException - */ - public static NodeList getNodeListForElements(final String xmlAsString, final String tagName) - throws ParserConfigurationException, - IOException, - SAXException { - - final DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - final InputSource inStream = new InputSource(); - inStream.setCharacterStream(new StringReader(xmlAsString)); - final Document document = documentBuilder.parse(inStream); - - return document.getElementsByTagName(tagName).item(0).getChildNodes(); - } } 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 7f65046..594becc 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 @@ -90,9 +90,9 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { */ protected HostnameVerifier getHostnameVerifier(final FilterConfig filterConfig) { final String className = getPropertyFromInitParams(filterConfig, "hostnameVerifier", null); - log.trace("Using hostnameVerifier parameter: " + className); + logger.trace("Using hostnameVerifier parameter: {}", className); final String config = getPropertyFromInitParams(filterConfig, "hostnameVerifierConfig", null); - log.trace("Using hostnameVerifierConfig parameter: " + config); + logger.trace("Using hostnameVerifierConfig parameter: {}", config); if (className != null) { if (config != null) { return ReflectUtils.newInstance(className, config); @@ -105,14 +105,14 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { protected void initInternal(final FilterConfig filterConfig) throws ServletException { setExceptionOnValidationFailure(parseBoolean(getPropertyFromInitParams(filterConfig, "exceptionOnValidationFailure", "true"))); - log.trace("Setting exceptionOnValidationFailure parameter: " + this.exceptionOnValidationFailure); + logger.trace("Setting exceptionOnValidationFailure parameter: {}", this.exceptionOnValidationFailure); setRedirectAfterValidation(parseBoolean(getPropertyFromInitParams(filterConfig, "redirectAfterValidation", "true"))); - log.trace("Setting redirectAfterValidation parameter: " + this.redirectAfterValidation); + logger.trace("Setting redirectAfterValidation parameter: {}", this.redirectAfterValidation); setUseSession(parseBoolean(getPropertyFromInitParams(filterConfig, "useSession", "true"))); - log.trace("Setting useSession parameter: " + this.useSession); + logger.trace("Setting useSession parameter: {}", this.useSession); if (!this.useSession && this.redirectAfterValidation) { - log.warn("redirectAfterValidation parameter may not be true when useSession parameter is false. Resetting it to false in order to prevent infinite redirects."); + logger.warn("redirectAfterValidation parameter may not be true when useSession parameter is false. Resetting it to false in order to prevent infinite redirects."); setRedirectAfterValidation(false); } @@ -174,16 +174,12 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { final String ticket = retrieveTicketFromRequest(request); if (CommonUtils.isNotBlank(ticket)) { - if (log.isDebugEnabled()) { - log.debug("Attempting to validate ticket: " + ticket); - } + logger.debug("Attempting to validate ticket: {}", ticket); try { final Assertion assertion = this.ticketValidator.validate(ticket, constructServiceUrl(request, response)); - if (log.isDebugEnabled()) { - log.debug("Successfully authenticated user: " + assertion.getPrincipal().getName()); - } + logger.debug("Successfully authenticated user: {}", assertion.getPrincipal().getName()); request.setAttribute(CONST_CAS_ASSERTION, assertion); @@ -193,13 +189,13 @@ public abstract class AbstractTicketValidationFilter extends AbstractCasFilter { onSuccessfulValidation(request, response, assertion); if (this.redirectAfterValidation) { - log. debug("Redirecting after successful ticket validation."); + logger. debug("Redirecting after successful ticket validation."); response.sendRedirect(constructServiceUrl(request, response)); return; } } catch (final TicketValidationException e) { response.setStatus(HttpServletResponse.SC_FORBIDDEN); - log.warn(e, e); + logger.warn(e.getMessage(), e); onFailedValidation(request, response); 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 9bddb68..0b3cad7 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 @@ -41,9 +41,6 @@ import javax.net.ssl.HostnameVerifier; */ public abstract class AbstractUrlBasedTicketValidator implements TicketValidator { - /** - * Commons Logging instance. - */ protected final Logger logger = LoggerFactory.getLogger(getClass()); /** 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 894bfef..90ca228 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 @@ -94,7 +94,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal } } - log.trace("Setting proxyReceptorUrl parameter: " + this.proxyReceptorUrl); + logger.trace("Setting proxyReceptorUrl parameter: {}", this.proxyReceptorUrl); this.millisBetweenCleanUps = Integer.parseInt(getPropertyFromInitParams(filterConfig, "millisBetweenCleanUps", Integer.toString(DEFAULT_MILLIS_BETWEEN_CLEANUPS))); super.initInternal(filterConfig); } @@ -185,7 +185,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal try { CommonUtils.readAndRespondToProxyReceptorRequest(request, response, this.proxyGrantingTicketStorage); } catch (final RuntimeException e) { - log.error(e.getMessage(), e); + logger.error(e.getMessage(), e); throw e; } 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 99637ac..642afcc 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 @@ -145,7 +145,7 @@ public class Cas20ServiceTicketValidator extends AbstractCasProtocolUrlBasedTick xmlReader.parse(new InputSource(new StringReader(xml))); return handler.getAttributes(); } catch (final Exception e) { - log.error(e.getMessage(), e); + logger.error(e.getMessage(), e); return Collections.emptyMap(); } } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java index 26a2f74..f768a39 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java @@ -42,8 +42,8 @@ public class Saml11TicketValidationFilter extends AbstractTicketValidationFilter protected final void initInternal(final FilterConfig filterConfig) throws ServletException { super.initInternal(filterConfig); - log.warn("SAML1.1 compliance requires the [artifactParameterName] and [serviceParameterName] to be set to specified values."); - log.warn("This filter will overwrite any user-provided values (if any are provided)"); + logger.warn("SAML1.1 compliance requires the [artifactParameterName] and [serviceParameterName] to be set to specified values."); + logger.warn("This filter will overwrite any user-provided values (if any are provided)"); setArtifactParameterName("SAMLart"); setServiceParameterName("TARGET"); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java index 624aea5..2482bc4 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java @@ -176,7 +176,7 @@ public final class Saml11TicketValidator extends AbstractUrlBasedTicketValidator final DateTime notOnOrAfter = assertion.getConditions().getNotOnOrAfter(); if (notBefore == null || notOnOrAfter == null) { - log.debug("Assertion has no bounding dates. Will not process."); + logger.debug("Assertion has no bounding dates. Will not process."); return false; } @@ -184,16 +184,16 @@ public final class Saml11TicketValidator extends AbstractUrlBasedTicketValidator final Interval validityRange = new Interval(notBefore.minus(this.tolerance), notOnOrAfter.plus(this.tolerance)); if (validityRange.contains(currentTime)) { - log.debug("Current time is within the interval validity."); + logger.debug("Current time is within the interval validity."); return true; } if (currentTime.isBefore(validityRange.getStart())) { - log.debug("skipping assertion that's not yet valid..."); + logger.debug("skipping assertion that's not yet valid..."); return false; } - log.debug("skipping expired assertion..."); + logger.debug("skipping expired assertion..."); return false; } diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml index beb9c43..17f64d3 100644 --- a/cas-client-integration-atlassian/pom.xml +++ b/cas-client-integration-atlassian/pom.xml @@ -36,6 +36,12 @@ provided jar true + + + commons-logging + commons-logging + + diff --git a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java index 689561d..3ba8991 100644 --- a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java +++ b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java @@ -26,6 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.util.AbstractCasFilter; import org.jasig.cas.client.validation.Assertion; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,15 +49,13 @@ public final class Jira44CasAuthenticator extends JiraSeraphAuthenticator { /** Jira43CasAuthenticator.java */ private static final long serialVersionUID = 3852011252741183166L; - private static final Log LOG = LogFactory.getLog(Jira44CasAuthenticator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Jira44CasAuthenticator.class); public Principal getUser(final HttpServletRequest request, final HttpServletResponse response) { // First, check to see if this session has already been authenticated during a previous request. Principal existingUser = getUserFromSession(request); if (existingUser != null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Session found; user already logged in."); - } + LOGGER.debug("Session found; user already logged in."); } final HttpSession session = request.getSession(); @@ -69,13 +69,9 @@ public final class Jira44CasAuthenticator extends JiraSeraphAuthenticator { putPrincipalInSessionContext(request, user); getElevatedSecurityGuard().onSuccessfulLoginAttempt(request, username); LoginReason.OK.stampRequestResponse(request, response); - if (LOG.isDebugEnabled()) { - LOG.debug("Logging in [" + username + "] from CAS."); - } + LOGGER.debug("Logging in [{}] from CAS.", username); } else { - if (LOG.isDebugEnabled()) { - LOG.debug("Failed logging [" + username + "] from CAS."); - } + LOGGER.debug("Failed logging [{}] from CAS.", username); getElevatedSecurityGuard().onFailedLoginAttempt(request, username); } return user; @@ -88,8 +84,8 @@ public final class Jira44CasAuthenticator extends JiraSeraphAuthenticator { final HttpSession session = request.getSession(); final Principal p = (Principal) session.getAttribute(LOGGED_IN_KEY); - if (LOG.isDebugEnabled() && p != null) { - LOG.debug("Logging out [" + p.getName() + "] from CAS."); + if (p != null) { + LOGGER.debug("Logging out [{}] from CAS.", p.getName()); } removePrincipalFromSessionContext(request); diff --git a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java index aeb48f1..9cd1976 100644 --- a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java +++ b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java @@ -28,6 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.util.AbstractCasFilter; import org.jasig.cas.client.validation.Assertion; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -48,7 +50,7 @@ public final class JiraCasAuthenticator extends DefaultAuthenticator { /** JiraCasAuthenticator.java */ private static final long serialVersionUID = 3452011252741183166L; - private static final Log LOG = LogFactory.getLog(JiraCasAuthenticator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(JiraCasAuthenticator.class); @Override protected boolean authenticate(final Principal principal, final String password) throws AuthenticatorException { @@ -60,7 +62,7 @@ public final class JiraCasAuthenticator extends DefaultAuthenticator { try { return UserManager.getInstance().getUser(username); } catch (final EntityNotFoundException e) { - LOG.warn("Could not find user '" + username + "' in UserManager : " + e); + LOGGER.warn("Could not find user '{}' in UserManager : {}", username, e); } return null; } @@ -70,9 +72,7 @@ public final class JiraCasAuthenticator extends DefaultAuthenticator { // user already exists if (session.getAttribute(LOGGED_IN_KEY) != null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Session found; user already logged in."); - } + LOGGER.debug("Session found; user already logged in."); return (Principal) session.getAttribute(LOGGED_IN_KEY); } @@ -81,9 +81,7 @@ public final class JiraCasAuthenticator extends DefaultAuthenticator { if (assertion != null) { final Principal p = getUser(assertion.getPrincipal().getName()); - if (LOG.isDebugEnabled()) { - LOG.debug("Logging in [" + p.getName() + "] from CAS."); - } + LOGGER.debug("Logging in [{}] from CAS.", p.getName()); session.setAttribute(LOGGED_IN_KEY, p); session.setAttribute(LOGGED_OUT_KEY, null); @@ -97,9 +95,7 @@ public final class JiraCasAuthenticator extends DefaultAuthenticator { final HttpSession session = request.getSession(); final Principal p = (Principal) session.getAttribute(LOGGED_IN_KEY); - if (LOG.isDebugEnabled()) { - LOG.debug("Logging out [" + p.getName() + "] from CAS."); - } + LOGGER.debug("Logging out [{}] from CAS.", p.getName()); session.setAttribute(LOGGED_OUT_KEY, p); session.setAttribute(LOGGED_IN_KEY, null); diff --git a/cas-client-integration-jboss/pom.xml b/cas-client-integration-jboss/pom.xml index b631df1..1e98f1d 100644 --- a/cas-client-integration-jboss/pom.xml +++ b/cas-client-integration-jboss/pom.xml @@ -47,6 +47,10 @@ javax.security jacc + + commons-logging + commons-logging + 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 9eefd67..7a7870d 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 @@ -63,17 +63,17 @@ public final class WebAuthenticationFilter extends AbstractCasFilter { if (session != null && session.getAttribute(CONST_CAS_ASSERTION) == null && ticket != null) { try { final String service = constructServiceUrl(request, response); - log.debug("Attempting CAS ticket validation with service=" + service + " and ticket=" + ticket); + logger.debug("Attempting CAS ticket validation with service={} and ticket={}", service, ticket); if (!new WebAuthentication().login(service, ticket)) { - log.debug("JBoss Web authentication failed."); + logger.debug("JBoss Web authentication failed."); throw new GeneralSecurityException("JBoss Web authentication failed."); } if (request.getUserPrincipal() instanceof AssertionPrincipal) { final AssertionPrincipal principal = (AssertionPrincipal) request.getUserPrincipal(); - log.debug("Installing CAS assertion into session."); + logger.debug("Installing CAS assertion into session."); request.getSession().setAttribute(CONST_CAS_ASSERTION, principal.getAssertion()); } else { - log.debug("Aborting -- principal is not of type AssertionPrincipal"); + logger.debug("Aborting -- principal is not of type AssertionPrincipal"); throw new GeneralSecurityException("JBoss Web authentication did not produce CAS AssertionPrincipal."); } } catch (final GeneralSecurityException e) { @@ -83,7 +83,7 @@ public final class WebAuthenticationFilter extends AbstractCasFilter { // There is evidence that in some cases the principal can disappear // in JBoss despite a valid session. // This block forces consistency between principal and assertion. - log.info("User principal not found. Removing CAS assertion from session to force re-authentication."); + logger.info("User principal not found. Removing CAS assertion from session to force re-authentication."); session.removeAttribute(CONST_CAS_ASSERTION); } chain.doFilter(request, response); 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 bc86606..681a041 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 @@ -23,11 +23,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.util.AbstractCasFilter; import org.jasig.cas.client.util.CommonUtils; import org.jasig.cas.client.validation.Assertion; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base class for all logout handlers. @@ -38,7 +38,7 @@ import org.jasig.cas.client.validation.Assertion; */ public abstract class AbstractLogoutHandler implements LogoutHandler { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); protected String redirectUrl; @@ -48,20 +48,20 @@ public abstract class AbstractLogoutHandler implements LogoutHandler { /** {@inheritDoc} */ public void logout(final HttpServletRequest request, final HttpServletResponse response) { - log.debug("Processing logout request from CAS server."); + logger.debug("Processing logout request from CAS server."); final Assertion assertion; final HttpSession httpSession = request.getSession(false); if (httpSession != null && (assertion = (Assertion) httpSession.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION)) != null) { httpSession.removeAttribute(AbstractCasFilter.CONST_CAS_ASSERTION); - log.info("Successfully logged out " + assertion.getPrincipal()); + logger.info("Successfully logged out {}", assertion.getPrincipal()); } else { - log.info("Session already ended."); + logger.info("Session already ended."); } final String redirectUrl = constructRedirectUrl(request); if (redirectUrl != null) { - log.debug("Redirecting to " + redirectUrl); + logger.debug("Redirecting to {}", redirectUrl); CommonUtils.sendRedirect(response, redirectUrl); } } diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java index 3b26601..dcb9401 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AuthenticatorDelegate.java @@ -26,13 +26,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.util.AbstractCasFilter; import org.jasig.cas.client.util.CommonUtils; import org.jasig.cas.client.validation.Assertion; import org.jasig.cas.client.validation.TicketValidationException; import org.jasig.cas.client.validation.TicketValidator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Version-agnostic authenticator which encapsulates the core CAS workflow of @@ -49,7 +49,7 @@ import org.jasig.cas.client.validation.TicketValidator; public final class AuthenticatorDelegate { /** Log instance */ - private final Log log = LogFactory.getLog(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); private String serviceUrl; @@ -86,19 +86,19 @@ public final class AuthenticatorDelegate { assertion = (Assertion) session.getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION); } if (assertion == null) { - log.debug("CAS assertion not found in session -- authentication required."); + logger.debug("CAS assertion not found in session -- authentication required."); final String token = request.getParameter(this.artifactParameterName); final String service = CommonUtils.constructServiceUrl(request, response, this.serviceUrl, this.serverName, this.artifactParameterName, true); if (CommonUtils.isBlank(token)) { final String redirectUrl = CommonUtils.constructRedirectUrl(this.casServerLoginUrl, this.serviceParameterName, service, false, false); - log.debug("Redirecting to " + redirectUrl); + logger.debug("Redirecting to {}", redirectUrl); CommonUtils.sendRedirect(response, redirectUrl); return null; } try { - log.debug("Attempting to validate " + token + " for " + service); + logger.debug("Attempting to validate {} for {}", token, service); assertion = this.ticketValidator.validate(token, service); - log.debug("CAS authentication succeeded."); + logger.debug("CAS authentication succeeded."); if (session == null) { session = request.getSession(true); } @@ -110,7 +110,7 @@ public final class AuthenticatorDelegate { } Principal p = realm.authenticate(assertion.getPrincipal()); if (p == null) { - log.debug(assertion.getPrincipal().getName() + " failed to authenticate to " + realm); + logger.debug("{} failed to authenticate to {}", assertion.getPrincipal().getName(), realm); setUnauthorized(response, null); } return p; 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 9512cad..f34f4d3 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 @@ -26,9 +26,9 @@ import java.io.IOException; import java.security.Principal; import java.util.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.util.CommonUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link CasRealm} implementation with users and roles defined by a properties @@ -49,7 +49,7 @@ import org.jasig.cas.client.util.CommonUtils; public class PropertiesCasRealmDelegate implements CasRealm { /** Log instance */ - private final Log log = LogFactory.getLog(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); /** Path to backing properties file */ private String propertiesFilePath; @@ -73,7 +73,7 @@ public class PropertiesCasRealmDelegate implements CasRealm { } CommonUtils.assertTrue(file.exists(), "File not found " + file); CommonUtils.assertTrue(file.canRead(), "Cannot read " + file); - log.debug("Loading users/roles from " + file); + logger.debug("Loading users/roles from {}", file); final Properties properties = new Properties(); try { properties.load(new BufferedInputStream(new FileInputStream(file))); 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 4e1c7cc..83d6a72 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 @@ -27,12 +27,12 @@ import org.apache.catalina.authenticator.AuthenticatorBase; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.tomcat.AuthenticatorDelegate; import org.jasig.cas.client.tomcat.CasRealm; import org.jasig.cas.client.util.CommonUtils; import org.jasig.cas.client.validation.TicketValidator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.security.Principal; @@ -46,7 +46,7 @@ import java.security.Principal; */ public abstract class AbstractAuthenticator extends AuthenticatorBase implements LifecycleListener { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); private final AuthenticatorDelegate delegate = new AuthenticatorDelegate(); @@ -84,7 +84,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements public void start() throws LifecycleException { super.start(); - this.log.debug(getName() + " starting."); + logger.debug("{} starting.", getName()); final Realm realm = this.context.getRealm(); try { CommonUtils.assertTrue(realm instanceof CasRealm, "Expected CasRealm but got " + realm.getInfo()); @@ -166,7 +166,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements /** {@inheritDoc} */ public void lifecycleEvent(final LifecycleEvent event) { if (AFTER_START_EVENT.equals(event.getType())) { - this.log.debug(getName() + " processing lifecycle event " + AFTER_START_EVENT); + logger.debug("{} processing lifecycle event {}", getName(), AFTER_START_EVENT); this.delegate.setTicketValidator(getTicketValidator()); this.delegate.setArtifactParameterName(getArtifactParameterName()); this.delegate.setServiceParameterName(getServiceParameterName()); 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 a08cebc..5394a73 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 @@ -22,9 +22,9 @@ package org.jasig.cas.client.tomcat.v6; import java.security.Principal; import org.apache.catalina.realm.RealmBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.tomcat.CasRealm; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base Realm implementation for all CAS realms. @@ -36,7 +36,7 @@ import org.jasig.cas.client.tomcat.CasRealm; public abstract class AbstractCasRealm extends RealmBase implements CasRealm { /** Logger instance */ - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); /** {@inheritDoc} */ 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 50a0984..3580190 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 @@ -24,8 +24,8 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base Valve implementation for valves that need Catalina lifecycle @@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFactory; public abstract class AbstractLifecycleValve extends ValveBase implements Lifecycle { /** Logger instance */ - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); /** Lifecycle listeners */ private LifecycleSupport lifecycle = new LifecycleSupport(this); @@ -61,12 +61,12 @@ public abstract class AbstractLifecycleValve extends ValveBase implements Lifecy /** {@inheritDoc} */ public void start() throws LifecycleException { - log.debug(getName() + " starting."); + logger.debug("{} starting.", getName()); } /** {@inheritDoc} */ public void stop() throws LifecycleException { - log.debug(getName() + " stopping."); + 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 8a9d8ee..d01f1a8 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 @@ -43,7 +43,7 @@ public abstract class AbstractLogoutValve extends AbstractLifecycleValve { return; } - this.log.debug("URI is not a logout request: " + request.getRequestURI()); + logger.debug("URI is not a logout request: {}", request.getRequestURI()); getNext().invoke(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 9dcbc15..42652d6 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 @@ -40,7 +40,7 @@ public class AssertionCasRealm extends AbstractCasRealm { /** {@inheritDoc} */ public void start() throws LifecycleException { super.start(); - log.info("Startup completed."); + logger.info("Startup completed."); } /** diff --git a/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas10CasAuthenticator.java b/cas-client-integration-tomcat-v6/src/main/java/org/jasig/cas/client/tomcat/v6/Cas10CasAuthenticator.java index b30bdb4..362cba4 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 @@ -54,6 +54,6 @@ public class Cas10CasAuthenticator extends AbstractCasAuthenticator { super.start(); this.ticketValidator = new Cas10TicketValidator(getCasServerUrlPrefix()); lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null); - log.info("Startup completed."); + logger.info("Startup completed."); } } 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 462094d..07392cb 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 @@ -60,6 +60,6 @@ public final class Cas20CasAuthenticator extends AbstractCasAuthenticator { this.ticketValidator.setProxyGrantingTicketStorage(ProxyCallbackValve.getProxyGrantingTicketStorage()); this.ticketValidator.setRenew(isRenew()); lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null); - this.log.info("Startup completed."); + logger.info("Startup completed."); } } 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 cc577f0..387f10a 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 @@ -75,6 +75,6 @@ public final class Cas20ProxyCasAuthenticator extends AbstractCasAuthenticator { this.ticketValidator.setEncoding(getEncoding()); } lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null); - this.log.info("Startup completed."); + logger.info("Startup completed."); } } 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 080d1ac..81eada9 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 @@ -54,7 +54,7 @@ public class PropertiesCasRealm extends AbstractCasRealm { public void start() throws LifecycleException { super.start(); this.delegate.readProperties(); - this.log.info("Startup completed."); + logger.info("Startup completed."); } /** {@inheritDoc} */ 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 3d1dc16..1fb291c 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 @@ -73,12 +73,12 @@ public final class ProxyCallbackValve extends AbstractLifecycleValve { } catch (final Exception e) { throw new LifecycleException(e); } - this.log.info("Startup completed."); + logger.info("Startup completed."); } public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.proxyCallbackUrl.equals(request.getRequestURI())) { - this.log.debug("Processing proxy callback request."); + logger.debug("Processing proxy callback request."); CommonUtils.readAndRespondToProxyReceptorRequest(request, response, PROXY_GRANTING_TICKET_STORAGE); return; } 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 150e377..2d3691a 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 @@ -48,7 +48,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { public void start() throws LifecycleException { super.start(); this.logoutHandler.init(); - this.log.info("Startup completed."); + logger.info("Startup completed."); } /** {@inheritDoc} */ 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 9247985..19b7f50 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 @@ -60,7 +60,7 @@ public class Saml11Authenticator extends AbstractAuthenticator { } this.ticketValidator.setRenew(isRenew()); lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null); - this.log.info("Startup completed."); + logger.info("Startup completed."); } protected TicketValidator getTicketValidator() { 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 d7c5d12..6588d56 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 @@ -64,7 +64,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio public void start() throws LifecycleException { super.start(); handler.init(); - log.info("Startup completed."); + logger.info("Startup completed."); } /** {@inheritDoc} */ @@ -78,7 +78,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio // Do not proceed up valve chain return; } else { - log.debug("Ignoring URI " + request.getRequestURI()); + logger.debug("Ignoring URI {}", request.getRequestURI()); } getNext().invoke(request, response); } @@ -87,7 +87,7 @@ public class SingleSignOutValve extends AbstractLifecycleValve implements Sessio /** {@inheritDoc} */ public void sessionEvent(final SessionEvent event) { if (Session.SESSION_DESTROYED_EVENT.equals(event.getType())) { - this.log.debug("Cleaning up SessionMappingStorage on destroySession event"); + logger.debug("Cleaning up SessionMappingStorage on destroySession event"); this.handler.getSessionMappingStorage().removeBySessionById(event.getSession().getId()); } } 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 0ddbd09..91757e9 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 @@ -48,7 +48,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { public void start() throws LifecycleException { super.start(); this.logoutHandler.init(); - this.log.info("Startup completed."); + logger.info("Startup completed."); } /** {@inheritDoc} */ 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 1373676..b733a3d 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 @@ -27,12 +27,12 @@ import org.apache.catalina.Realm; import org.apache.catalina.authenticator.AuthenticatorBase; import org.apache.catalina.connector.Request; import org.apache.catalina.deploy.LoginConfig; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.tomcat.AuthenticatorDelegate; import org.jasig.cas.client.tomcat.CasRealm; import org.jasig.cas.client.util.CommonUtils; import org.jasig.cas.client.validation.TicketValidator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -47,7 +47,7 @@ import java.security.Principal; */ public abstract class AbstractAuthenticator extends AuthenticatorBase implements LifecycleListener { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); private final AuthenticatorDelegate delegate = new AuthenticatorDelegate(); @@ -94,7 +94,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements protected void startInternal() throws LifecycleException { super.startInternal(); - this.log.debug(getName() + " starting."); + logger.debug("{} starting.", getName()); final Realm realm = this.context.getRealm(); try { CommonUtils.assertTrue(realm instanceof CasRealm, "Expected CasRealm but got " + realm.getInfo()); @@ -175,7 +175,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements /** {@inheritDoc} */ public void lifecycleEvent(final LifecycleEvent event) { if (AFTER_START_EVENT.equals(event.getType())) { - this.log.debug(getName() + " processing lifecycle event " + AFTER_START_EVENT); + logger.debug("{} processing lifecycle event {}", getName(), AFTER_START_EVENT); this.delegate.setTicketValidator(getTicketValidator()); this.delegate.setArtifactParameterName(getArtifactParameterName()); this.delegate.setServiceParameterName(getServiceParameterName()); @@ -191,7 +191,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements protected synchronized void setState(LifecycleState state, Object data) { super.setState(state, data); if (LifecycleState.STARTED.equals(state)) { - this.log.info(getName() + " started."); + logger.info("{} started.", getName()); } } 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 dd24e28..aba02c3 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 @@ -22,9 +22,9 @@ package org.jasig.cas.client.tomcat.v7; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.tomcat.LogoutHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.ServletException; import java.io.IOException; @@ -40,7 +40,7 @@ import java.io.IOException; */ public abstract class AbstractLogoutValve extends ValveBase { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); public final void invoke(final Request request, final Response response) throws IOException, ServletException { if (getLogoutHandler().isLogoutRequest(request)) { @@ -49,7 +49,7 @@ public abstract class AbstractLogoutValve extends ValveBase { return; } - this.log.debug("URI is not a logout request: " + request.getRequestURI()); + logger.debug("URI is not a logout request: {}", request.getRequestURI()); getNext().invoke(request, response); } 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 5966ba1..bd54cb2 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 @@ -23,11 +23,11 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage; import org.jasig.cas.client.util.CommonUtils; import org.jasig.cas.client.util.ReflectUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.ServletException; import java.io.IOException; @@ -48,7 +48,7 @@ public final class ProxyCallbackValve extends ValveBase { private static ProxyGrantingTicketStorage PROXY_GRANTING_TICKET_STORAGE; /** Logger instance */ - private final Log log = LogFactory.getLog(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); private String proxyGrantingTicketStorageClass; @@ -77,12 +77,12 @@ public final class ProxyCallbackValve extends ValveBase { } catch (final Exception e) { throw new LifecycleException(e); } - this.log.info("Startup completed."); + logger.info("Startup completed."); } public void invoke(final Request request, final Response response) throws IOException, ServletException { if (this.proxyCallbackUrl.equals(request.getRequestURI())) { - this.log.debug("Processing proxy callback request."); + logger.debug("Processing proxy callback request."); CommonUtils.readAndRespondToProxyReceptorRequest(request, response, PROXY_GRANTING_TICKET_STORAGE); return; } 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 c87ad7f..5e63a1a 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 @@ -46,7 +46,7 @@ public final class RegexUriLogoutValve extends AbstractLogoutValve { protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); - this.log.info("Startup completed."); + logger.info("Startup completed."); } /** {@inheritDoc} */ 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 f1b0249..66068d5 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 @@ -30,11 +30,11 @@ import org.apache.catalina.SessionListener; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.session.SessionMappingStorage; import org.jasig.cas.client.session.SingleSignOutHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Handles logout request messages sent from the CAS server by ending the current @@ -48,7 +48,7 @@ import org.jasig.cas.client.session.SingleSignOutHandler; public class SingleSignOutValve extends ValveBase implements SessionListener { /** Logger instance */ - private final Log log = LogFactory.getLog(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); private final SingleSignOutHandler handler = new SingleSignOutHandler(); @@ -76,7 +76,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { // Do not proceed up valve chain return; } else { - this.log.debug("Ignoring URI " + request.getRequestURI()); + logger.debug("Ignoring URI {}", request.getRequestURI()); } getNext().invoke(request, response); } @@ -85,7 +85,7 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { /** {@inheritDoc} */ public void sessionEvent(final SessionEvent event) { if (Session.SESSION_DESTROYED_EVENT.equals(event.getType())) { - this.log.debug("Cleaning up SessionMappingStorage on destroySession event"); + logger.debug("Cleaning up SessionMappingStorage on destroySession event"); this.handler.getSessionMappingStorage().removeBySessionById(event.getSession().getId()); } } @@ -93,8 +93,8 @@ public class SingleSignOutValve extends ValveBase implements SessionListener { /** {@inheritDoc} */ protected void startInternal() throws LifecycleException { super.startInternal(); - this.log.info("Starting..."); + logger.info("Starting..."); handler.init(); - this.log.info("Startup completed."); + logger.info("Startup completed."); } } 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 aaf5502..8127322 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 @@ -46,7 +46,7 @@ public final class StaticUriLogoutValve extends AbstractLogoutValve { protected void startInternal() throws LifecycleException { super.startInternal(); this.logoutHandler.init(); - this.log.info("Startup completed."); + logger.info("Startup completed."); } /** {@inheritDoc} */ diff --git a/cas-client-support-distributed-ehcache/pom.xml b/cas-client-support-distributed-ehcache/pom.xml index 43c22fa..8d01ace 100644 --- a/cas-client-support-distributed-ehcache/pom.xml +++ b/cas-client-support-distributed-ehcache/pom.xml @@ -24,21 +24,11 @@ - net.sf.ehcache ehcache-core ${ehcache.version} compile jar - - - org.slf4j - slf4j-api - 1.6.1 - test - - - \ No newline at end of file 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 5731292..71b1e52 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 @@ -23,12 +23,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; import net.sf.ehcache.CacheManager; import net.sf.ehcache.distribution.RemoteCacheException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.spec.InvalidKeySpecException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Scott Battaglia @@ -39,13 +35,13 @@ public final class EhcacheBackedProxyGrantingTicketStorageImpl extends AbstractE public static final String EHCACHE_CACHE_NAME = "org.jasig.cas.client.proxy.EhcacheBackedProxyGrantingTicketStorageImpl.cache"; - private static final Log log = LogFactory.getLog(EhcacheBackedProxyGrantingTicketStorageImpl.class); + private static final Logger logger = LoggerFactory.getLogger(EhcacheBackedProxyGrantingTicketStorageImpl.class); final Cache cache; public EhcacheBackedProxyGrantingTicketStorageImpl() { this(CacheManager.getInstance().getCache(EHCACHE_CACHE_NAME)); - log.info("Created cache with name: " + this.cache.getName()); + logger.info("Created cache with name: {}", this.cache.getName()); } public EhcacheBackedProxyGrantingTicketStorageImpl(final Cache cache) { @@ -58,7 +54,7 @@ public final class EhcacheBackedProxyGrantingTicketStorageImpl extends AbstractE try { this.cache.put(element); } catch (final RemoteCacheException e) { - log.warn("Exception accessing one of the remote servers: " + e.getMessage(), e); + logger.warn("Exception accessing one of the remote servers: {}", e.getMessage(), e); } } diff --git a/pom.xml b/pom.xml index f21d182..bdd2bad 100644 --- a/pom.xml +++ b/pom.xml @@ -151,6 +151,30 @@ NwXMoqnmqmUUnosrspqmmmmmmUUnosrspqmmmmmmUUA1jJ --> + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0 + + + enforce-banned-dependencies + + enforce + + + + + + commons-logging + cglib:cglib + + + + true + + + +