Add dep folder

[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..b39877420296ca37b5fa8c2360aedb9216cb212c 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
@@ -1,14 +1,33 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.jcr;
 
 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;
 
-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 +36,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();
+                       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();
+                               }
                        }
                }
                return super.preCall(session);