X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FSecureThreadBoundSession.java;h=1220eb381e931a1c4bb46a233f350a1deeafed2b;hb=0d8a9149227c52245ff9eb20f29ad2b81a99b3e2;hp=db2cfccbc692abd434386638d09b6ce6b06d47e5;hpb=149023e5969377045847bbecf24b0898b18a67a9;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java
index db2cfccbc..1220eb381 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java
@@ -4,48 +4,47 @@ import javax.jcr.Session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.jcr.ThreadBoundJcrSessionFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
+import org.argeo.jcr.spring.ThreadBoundSession;
 import org.springframework.security.Authentication;
 import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.userdetails.UserDetails;
 
 /**
  * Thread bounded JCR session factory which checks authentication and is
  * autoconfigured in Spring.
  */
-public class SecureThreadBoundSession extends ThreadBoundJcrSessionFactory
-		implements FactoryBean, InitializingBean, DisposableBean {
+public class SecureThreadBoundSession extends ThreadBoundSession {
 	private final static Log log = LogFactory
 			.getLog(SecureThreadBoundSession.class);
 
-	public void afterPropertiesSet() throws Exception {
-		init();
-	}
-
-	public void destroy() throws Exception {
-		dispose();
-	}
-
 	@Override
 	protected Session preCall(Session session) {
 		Authentication authentication = SecurityContextHolder.getContext()
 				.getAuthentication();
 		if (authentication != null) {
 			String userID = session.getUserID();
-			UserDetails userDetails = (UserDetails) authentication.getDetails();
-			if (userDetails != null) {
-				String currentUserName = userDetails.getUsername();
+			String currentUserName = authentication.getName();
+			if (currentUserName != null) {
 				if (!userID.equals(currentUserName)) {
 					log.warn("Current session has user ID " + userID
 							+ " while logged is user is " + currentUserName
 							+ "(authentication=" + authentication + ")"
 							+ ". Re-login.");
+					// TODO throw an exception
 					return login();
 				}
 			}
+			// UserDetails userDetails = (UserDetails)
+			// authentication.getDetails();
+			// if (userDetails != null) {
+			// String currentUserName = userDetails.getUsername();
+			// if (!userID.equals(currentUserName)) {
+			// log.warn("Current session has user ID " + userID
+			// + " while logged is user is " + currentUserName
+			// + "(authentication=" + authentication + ")"
+			// + ". Re-login.");
+			// return login();
+			// }
+			// }
 		}
 		return super.preCall(session);
 	}