diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml
index 9f7923a..27855f6 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.1.9
+ 3.1.10
cas-client
4.0.0
@@ -124,6 +124,6 @@
- 2.5.4
+ 2.5.6.SEC01
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 9b546f0..152f681 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
@@ -87,14 +87,14 @@ public class AuthenticationFilter extends AbstractCasFilter {
final HttpServletRequest request = (HttpServletRequest) servletRequest;
final HttpServletResponse response = (HttpServletResponse) servletResponse;
final HttpSession session = request.getSession(false);
- final String serviceUrl = constructServiceUrl(request, response);
- final Assertion assertion = session != null ? (Assertion) session.getAttribute(CONST_CAS_ASSERTION) : null;
+ final Assertion assertion = session != null ? (Assertion) session.getAttribute(CONST_CAS_ASSERTION) : null;
if (assertion != null) {
filterChain.doFilter(request, response);
return;
}
+ final String serviceUrl = constructServiceUrl(request, response);
final String ticket = CommonUtils.safeGetParameter(request,getArtifactParameterName());
final boolean wasGatewayed = this.gatewayStorage.hasGatewayedAlready(request, serviceUrl);
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 9e5d53a..d09ab1d 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
@@ -88,22 +88,22 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter {
}
} else {
final String artifact = CommonUtils.safeGetParameter(request, this.artifactParameterName);
- final HttpSession session = request.getSession(false);
- if (session != null) {
+ if (CommonUtils.isNotBlank(artifact)) {
+ final HttpSession session = request.getSession(true);
+
if (log.isDebugEnabled()) {
log.debug("Storing session identifier for " + session.getId());
}
- if (CommonUtils.isNotBlank(artifact)) {
- try {
- SESSION_MAPPING_STORAGE.removeBySessionById(session.getId());
- } catch (final Exception e) {
- // ignore if the session is already marked as invalid. Nothing we can do!
- }
- SESSION_MAPPING_STORAGE.addSessionById(artifact, session);
+
+ try {
+ SESSION_MAPPING_STORAGE.removeBySessionById(session.getId());
+ } catch (final Exception e) {
+ // ignore if the session is already marked as invalid. Nothing we can do!
}
+ SESSION_MAPPING_STORAGE.addSessionById(artifact, session);
} else {
- log.debug("No Session Found, so ignoring.");
+ log.debug("No Artifact Provided; no action taking place.");
}
}
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 3323791..fcfcfc8 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
@@ -111,12 +111,12 @@ public abstract class AbstractUrlBasedTicketValidator implements TicketValidator
buffer.append(suffix);
for (final Iterator iter = urlParameters.entrySet().iterator(); iter.hasNext();) {
- buffer.append(i++ == 0 ? "?" : "&");
final Map.Entry entry = (Map.Entry) iter.next();
final String key = (String) entry.getKey();
final String value = (String) entry.getValue();
if (value != null) {
+ buffer.append(i++ == 0 ? "?" : "&");
buffer.append(key);
buffer.append("=");
buffer.append(value);
diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml
index a47baf8..344d933 100644
--- a/cas-client-integration-atlassian/pom.xml
+++ b/cas-client-integration-atlassian/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.1.9
+ 3.1.10
cas-client
4.0.0
diff --git a/cas-client-support-distributed-ehcache/pom.xml b/cas-client-support-distributed-ehcache/pom.xml
index f0e6db8..8526939 100644
--- a/cas-client-support-distributed-ehcache/pom.xml
+++ b/cas-client-support-distributed-ehcache/pom.xml
@@ -5,12 +5,13 @@
cas-client
org.jasig.cas
- 3.1.9
+ 3.1.10
4.0.0
+ Jasig CAS Client for Java - Distributed Proxy Storage Support: EhCache
org.jasig.cas
- cas-client-support-distributed
+ cas-client-support-distributed-ehcache
jar
diff --git a/cas-client-support-distributed-memcached/pom.xml b/cas-client-support-distributed-memcached/pom.xml
index d43cf7a..d4dc705 100644
--- a/cas-client-support-distributed-memcached/pom.xml
+++ b/cas-client-support-distributed-memcached/pom.xml
@@ -5,7 +5,7 @@
cas-client
org.jasig.cas
- 3.1.9
+ 3.1.10
4.0.0
@@ -27,7 +27,7 @@
spy
memcached
- 2.4
+ 2.4.2
jar
provided
diff --git a/pom.xml b/pom.xml
index 29197e1..9505754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
4.0.0
org.jasig.cas
- 3.1.9
+ 3.1.10
cas-client
pom
JA-SIG CAS Client for Java