X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FSecureThreadBoundSession.java;h=dce6e549683281b8179be8868b6788c370c61df5;hb=b7fd6f22cd58401024391c53ff1887e4eb2710b1;hp=c83f3b5943d862b5b1d6a9f1481ec28aac95acb0;hpb=2745f0c8c57d9468855179d56f858fb2448f779c;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 c83f3b594..dce6e5496 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,11 +4,16 @@ import javax.jcr.Session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.jcr.ThreadBoundJcrSessionFactory;
+import org.argeo.jcr.spring.ThreadBoundSession;
 import org.springframework.security.Authentication;
 import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.userdetails.UserDetails;
 
-public class SecureThreadBoundSession extends ThreadBoundJcrSessionFactory {
+/**
+ * Thread bounded JCR session factory which checks authentication and is
+ * autoconfigured in Spring.
+ */
+public class SecureThreadBoundSession extends ThreadBoundSession {
 	private final static Log log = LogFactory
 			.getLog(SecureThreadBoundSession.class);
 
@@ -17,12 +22,17 @@ public class SecureThreadBoundSession extends ThreadBoundJcrSessionFactory {
 		Authentication authentication = SecurityContextHolder.getContext()
 				.getAuthentication();
 		if (authentication != null) {
-			if (!session.getUserID().equals(
-					authentication.getPrincipal().toString())) {
-				log.warn("Current session has user ID " + session.getUserID()
-						+ " while authentication is " + authentication
-						+ ". Re-login.");
-				return login();
+			String userID = session.getUserID();
+			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);