diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml index 1346b04..420f2ae 100644 --- a/cas-client-core/pom.xml +++ b/cas-client-core/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> org.jasig.cas - 3.0-rc1 + 3.0-rc2 cas-client 4.0.0 @@ -10,7 +10,7 @@ cas-client-core jar JA-SIG CAS Client for Java - Core - 3.0-rc1 + 3.0-rc2 src/main/java @@ -79,6 +79,13 @@ compile + + org.springframework + spring-context + 2.0 + compile + + org.springframework spring-mock @@ -90,11 +97,6 @@ spring-beans - - org.springframework - spring-context - - org.springframework spring-core diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AbstractCasFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AbstractCasFilter.java index fcabf46..9db575e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AbstractCasFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AbstractCasFilter.java @@ -86,6 +86,8 @@ public abstract class AbstractCasFilter implements Filter { this.serverName = serverName; this.serviceUrl = serviceUrl; this.useSession = useSession; + + log.info("Service Name set to: " + this.serverName + "; Service Url set to: " + this.serviceUrl + "Use Session set to: " + this.useSession); } public final void destroy() { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthenticationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthenticationFilter.java index 4154246..e5d7a13 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthenticationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthenticationFilter.java @@ -69,7 +69,9 @@ public final class AuthenticationFilter extends AbstractCasFilter { && session.getAttribute(CONST_GATEWAY) != null; if (CommonUtils.isBlank(ticket) && assertion == null && !wasGatewayed) { + log.debug("no ticket and no assertion found"); if (this.gateway && session != null) { + log.debug("setting gateway attribute in session"); session.setAttribute(CONST_GATEWAY, "yes"); } @@ -78,11 +80,17 @@ public final class AuthenticationFilter extends AbstractCasFilter { + URLEncoder.encode(serviceUrl, "UTF-8") + (this.renew ? "&renew=true" : "") + (this.gateway ? "&gateway=true" : ""); + + if (log.isDebugEnabled()) { + log.debug("redirecting to \"" + urlToRedirectTo + "\""); + } + response.sendRedirect(urlToRedirectTo); return; } if (session != null) { + log.debug("removing gateway attribute from session"); session.setAttribute(CONST_GATEWAY, null); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthorizationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthorizationFilter.java index 40a581b..0436b87 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthorizationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AuthorizationFilter.java @@ -11,6 +11,8 @@ import org.jasig.cas.client.authorization.AuthorizedDecider; import org.jasig.cas.client.util.CommonUtils; import org.jasig.cas.client.validation.Assertion; import org.springframework.web.util.WebUtils; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -40,6 +42,12 @@ import java.io.IOException; */ public final class AuthorizationFilter implements Filter { + + /** + * Instance of Commons Logging. + */ + private final Log log = LogFactory.getLog(this.getClass()); + /** * Decider that determines whether a specified principal has access to the * resource or not. @@ -71,11 +79,13 @@ public final class AuthorizationFilter implements Filter { .isAuthorizedToUseApplication(principal); if (!authorized) { + log.debug("User not authorized to access application."); response.setStatus(HttpServletResponse.SC_FORBIDDEN); throw new AuthorizationException(principal.getId() + " is not authorized to use this application."); } + log.debug("User successfully authorized."); filterChain.doFilter(servletRequest, servletResponse); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/TicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/TicketValidationFilter.java index 9394423..9ea55af 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/TicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/TicketValidationFilter.java @@ -71,6 +71,10 @@ public final class TicketValidationFilter extends AbstractCasFilter { "ticketValidator cannot be null."); this.ticketValidator = ticketValidator; this.redirectAfterValidation = redirectAfterValidation; + + log.info("Initialized with the following properties: " + + "ticketValidator=" + this.ticketValidator.getClass().getName() + "; " + + "redirectAfterValidation=" + this.redirectAfterValidation); } protected void doFilterInternal(final HttpServletRequest request, diff --git a/cas-client-uportal/pom.xml b/cas-client-uportal/pom.xml index e49f4a0..2f24695 100644 --- a/cas-client-uportal/pom.xml +++ b/cas-client-uportal/pom.xml @@ -3,13 +3,13 @@ org.jasig.cas cas-client - 3.0-rc1 + 3.0-rc2 4.0.0 org.jasig.cas cas-client-uportal jar - 3.0-rc1 + 3.0-rc2 JA-SIG CAS Client for Java - uPortal Integration http://www.ja-sig.org/products/cas/ @@ -67,7 +67,7 @@ org.jasig.cas cas-client-core - 3.0-rc1 + 3.0-rc2 diff --git a/pom.xml b/pom.xml index dca3e84..0eb4b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.jasig.cas - 3.0-rc1 + 3.0-rc2 cas-client pom JA-SIG CAS Client for Java