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=9e16f3f643ce099467eeabfb90771c1fbedb84b5;hb=571e877fb974988d07527d4bb5b7e7c5e16ca4fb;hp=aa3b156795f0796b351cd06d8d4015c8ed364548;hpb=8b78007039ccb1f19d498742a64cf62435e8b093;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 aa3b15679..9e16f3f64 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
@@ -1,15 +1,33 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * 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;
-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);
 
@@ -19,14 +37,14 @@ public class SecureThreadBoundSession extends ThreadBoundJcrSessionFactory {
 				.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();
 				}
 			}