X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjackrabbit%2FArgeoSecurityManager.java;fp=security%2Fruntime%2Forg.argeo.security.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjackrabbit%2FArgeoSecurityManager.java;h=8f2632d0ff0ccf0445c968a86f8b4e771c36c58b;hb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;hp=a38f42541507dff6300a808ce1deab1a4797aa11;hpb=a3aed6b17b3a5de5f37170bf88a939fb8aae6e68;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
index a38f42541..8f2632d0f 100644
--- a/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
+++ b/security/runtime/org.argeo.security.jackrabbit/src/main/java/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
@@ -46,6 +46,7 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
 			throws RepositoryException {
 		long begin = System.currentTimeMillis();
 
+		// skip Jackrabbit system user
 		if (!subject.getPrincipals(SystemPrincipal.class).isEmpty())
 			return super.getUserID(subject, workspaceName);
 
@@ -58,6 +59,10 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
 		else
 			authen = authens.iterator().next();
 
+		// skip argeo system authenticated
+		// if (authen instanceof SystemAuthentication)
+		// return super.getUserID(subject, workspaceName);
+
 		UserManager systemUm = getSystemUserManager(workspaceName);
 
 		String userId = authen.getName();
@@ -68,7 +73,7 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
 			log.info(userId + " added as " + user);
 		}
 
-		setHomeNodeAuthorizations(user);
+		//setHomeNodeAuthorizations(user);
 
 		// process groups
 		List<String> userGroupIds = new ArrayList<String>();
@@ -81,7 +86,6 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
 			if (!group.isMember(user))
 				group.addMember(user);
 			userGroupIds.add(ga.getAuthority());
-
 		}
 
 		// check if user has not been removed from some groups
@@ -91,6 +95,36 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
 				group.removeMember(user);
 		}
 
+		// write roles in profile for easy access
+//		if (!(authen instanceof SystemAuthentication)) {
+//			Node userProfile = JcrUtils.getUserProfile(getSystemSession(),
+//					userId);
+//			boolean writeRoles = false;
+//			if (userProfile.hasProperty(ArgeoNames.ARGEO_REMOTE_ROLES)) {
+//				Value[] roles = userProfile.getProperty(ArgeoNames.ARGEO_REMOTE_ROLES)
+//						.getValues();
+//				if (roles.length != userGroupIds.size())
+//					writeRoles = true;
+//				else
+//					for (int i = 0; i < roles.length; i++)
+//						if (!roles[i].getString().equals(userGroupIds.get(i)))
+//							writeRoles = true;
+//			} else
+//				writeRoles = true;
+//
+//			if (writeRoles) {
+//				userProfile.getSession().getWorkspace().getVersionManager()
+//						.checkout(userProfile.getPath());
+//				String[] roleIds = userGroupIds.toArray(new String[userGroupIds
+//						.size()]);
+//				userProfile.setProperty(ArgeoNames.ARGEO_REMOTE_ROLES, roleIds);
+//				JcrUtils.updateLastModified(userProfile);
+//				userProfile.getSession().save();
+//				userProfile.getSession().getWorkspace().getVersionManager()
+//						.checkin(userProfile.getPath());
+//			}
+//		}
+
 		if (log.isTraceEnabled())
 			log.trace("Spring and Jackrabbit Security synchronized for user "
 					+ userId + " in " + (System.currentTimeMillis() - begin)
@@ -107,9 +141,12 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
 			Node userHome = null;
 			try {
 				userHome = JcrUtils.getUserHome(getSystemSession(), userId);
-				if (userHome == null)
+				if (userHome == null) {
 					userHome = JcrUtils.createUserHome(getSystemSession(),
 							HOME_BASE_PATH, userId);
+					//log.warn("No home available for user "+userId);
+					return;
+				}
 			} catch (Exception e) {
 				// silent
 			}