Make secure thread bound JCR session more generic (deal with web user details)

git-svn-id: https://svn.argeo.org/commons/trunk@4746 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 dce6e549683281b8179be8868b6788c370c61df5..1220eb381e931a1c4bb46a233f350a1deeafed2b 100644 (file)
--- 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
@@ -7,7 +7,6 @@ import org.apache.commons.logging.LogFactory;
 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
@@ -23,17 +22,29 @@ public class SecureThreadBoundSession extends ThreadBoundSession {
                                .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);
        }