Introduce OSAuthentication

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / jcr / SecureThreadBoundSession.java

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 c83f3b5943d862b5b1d6a9f1481ec28aac95acb0..db2cfccbc692abd434386638d09b6ce6b06d47e5 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
@@ -5,24 +5,46 @@ 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.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 ThreadBoundJcrSessionFactory
+               implements FactoryBean, InitializingBean, DisposableBean {
        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) {
-                       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);