Author: markt
Date: Fri Dec 19 14:54:45 2014
New Revision: 1646759
URL: http://svn.apache.org/r1646759
Log:
Refactor to use a serializable session listener to do the removal from the SSO
cache when the session expires.
Added:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
- copied unchanged from r1646722,
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSessionListener.java
- copied unchanged from r1646722,
tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSessionListener.java
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 14:54:45 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646721
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646722
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1646759&r1=1646758&r2=1646759&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Fri Dec 19 14:54:45 2014
@@ -22,6 +22,7 @@ import org.apache.catalina.Container;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Session;
+import org.apache.catalina.SessionListener;
import org.apache.catalina.authenticator.SingleSignOn;
import org.apache.catalina.authenticator.SingleSignOnEntry;
import org.apache.catalina.ha.CatalinaCluster;
@@ -113,6 +114,11 @@ public class ClusterSingleSignOn extends
return result;
}
+ @Override
+ protected SessionListener getSessionListener(String ssoId) {
+ return new ClusterSingleSignOnListener(ssoId);
+ }
+
// -------------------------------------------------------- MapOwner
Methods
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=1646759&r1=1646758&r2=1646759&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
Fri Dec 19 14:54:45 2014
@@ -31,6 +31,7 @@ import java.io.ObjectOutputStream;
import java.security.Principal;
import java.util.LinkedList;
+import org.apache.catalina.SessionListener;
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.tomcat.util.res.StringManager;
@@ -51,6 +52,7 @@ public class DeltaRequest implements Ext
public static final int TYPE_ISNEW = 2;
public static final int TYPE_MAXINTERVAL = 3;
public static final int TYPE_AUTHTYPE = 4;
+ public static final int TYPE_LISTENER = 5;
public static final int ACTION_SET = 0;
public static final int ACTION_REMOVE = 1;
@@ -59,6 +61,7 @@ public class DeltaRequest implements Ext
public static final String NAME_MAXINTERVAL = "__SET__MAXINTERVAL__";
public static final String NAME_ISNEW = "__SET__ISNEW__";
public static final String NAME_AUTHTYPE = "__SET__AUTHTYPE__";
+ public static final String NAME_LISTENER = "__SET__LISTENER__";
private String sessionId;
private LinkedList<AttributeInfo> actions = new LinkedList<>();
@@ -122,6 +125,14 @@ public class DeltaRequest implements Ext
addAction(TYPE_AUTHTYPE,action,NAME_AUTHTYPE, authType);
}
+ public void addSessionListener(SessionListener listener) {
+ addAction(TYPE_LISTENER, ACTION_SET, NAME_LISTENER ,listener);
+ }
+
+ public void removeSessionListener(SessionListener listener) {
+ addAction(TYPE_LISTENER, ACTION_REMOVE, NAME_LISTENER ,listener);
+ }
+
protected void addAction(int type,
int action,
String name,
@@ -190,6 +201,14 @@ public class DeltaRequest implements Ext
}
session.setAuthType(authType,false);
break;
+ case TYPE_LISTENER:
+ SessionListener listener = (SessionListener)
info.getValue();
+ if (info.getAction() == ACTION_SET) {
+ session.addSessionListener(listener);
+ } else {
+ session.removeSessionListener(listener);
+ }
+ break;
default :
throw new java.lang.IllegalArgumentException("Invalid
attribute info type="+info);
}//switch
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1646759&r1=1646758&r2=1646759&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Fri Dec 19 14:54:45 2014
@@ -500,6 +500,33 @@ public class DeltaSession extends Standa
return (sb.toString());
}
+ @Override
+ public void addSessionListener(SessionListener listener) {
+ lock();
+ try {
+ super.addSessionListener(listener);
+ if (deltaRequest != null && listener instanceof
ReplicatedSessionListener) {
+ deltaRequest.addSessionListener(listener);
+ }
+ } finally {
+ unlock();
+ }
+ }
+
+ @Override
+ public void removeSessionListener(SessionListener listener) {
+ lock();
+ try {
+ super.removeSessionListener(listener);
+ if (deltaRequest != null && listener instanceof
ReplicatedSessionListener) {
+ deltaRequest.removeSessionListener(listener);
+ }
+ } finally {
+ unlock();
+ }
+ }
+
+
// ------------------------------------------------ Session Package Methods
@Override
@@ -741,9 +768,14 @@ public class DeltaSession extends Standa
}
isValid = isValidSave;
- if (listeners == null) {
- ArrayList<SessionListener> arrayList = new ArrayList<>();
- listeners = arrayList;
+ // Session listeners
+ n = ((Integer) stream.readObject()).intValue();
+ if (listeners == null || n > 0) {
+ listeners = new ArrayList<>();
+ }
+ for (int i = 0; i < n; i++) {
+ SessionListener listener = (SessionListener) stream.readObject();
+ listeners.add(listener);
}
if (notes == null) {
@@ -835,6 +867,17 @@ public class DeltaSession extends Standa
}
}
+ // Serializable listeners
+ ArrayList<SessionListener> saveListeners = new ArrayList<>();
+ for (SessionListener listener : listeners) {
+ if (listener instanceof ReplicatedSessionListener) {
+ saveListeners.add(listener);
+ }
+ }
+ stream.writeObject(Integer.valueOf(saveListeners.size()));
+ for (SessionListener listener : saveListeners) {
+ stream.writeObject(listener);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
