X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FOsJcrAuthenticationProvider.java;fp=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FOsJcrAuthenticationProvider.java;h=917733dbcb5a059c5389445908fc4ee27e3885da;hb=571e877fb974988d07527d4bb5b7e7c5e16ca4fb;hp=4f3e6a18e5a5ff0e3c4bf058c3664d915b79cbc2;hpb=93da2a227ea6de0fb63c1e8730b5946f3e41d711;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java
index 4f3e6a18e..917733dbc 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/OsJcrAuthenticationProvider.java
@@ -19,7 +19,6 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.security.Privilege;
 
 import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
@@ -27,6 +26,9 @@ import org.argeo.security.OsAuthenticationToken;
 import org.argeo.security.core.OsAuthenticationProvider;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.userdetails.UserDetails;
 
 /** Relies on OS to authenticate and additionally setup JCR */
 public class OsJcrAuthenticationProvider extends OsAuthenticationProvider {
@@ -35,6 +37,8 @@ public class OsJcrAuthenticationProvider extends OsAuthenticationProvider {
 	private Session securitySession;
 	private Session nodeSession;
 
+	private UserDetails userDetails;
+
 	public void init() {
 		try {
 			securitySession = repository.login(securityWorkspace);
@@ -51,39 +55,50 @@ public class OsJcrAuthenticationProvider extends OsAuthenticationProvider {
 
 	public Authentication authenticate(Authentication authentication)
 			throws AuthenticationException {
-		final OsAuthenticationToken authen = (OsAuthenticationToken) super
-				.authenticate(authentication);
-		try {
-			// WARNING: at this stage we assume that the java properties
-			// will have the same value
-			String username = System.getProperty("user.name");
-			Node userProfile = JcrUtils.createUserProfileIfNeeded(
-					securitySession, username);
-			JcrUserDetails.checkAccountStatus(userProfile);
-
-			// each user should have a writable area in the default workspace of
-			// the node
-			Node userNodeHome = JcrUtils.createUserHomeIfNeeded(nodeSession,
-					username);
-			// FIXME how to set user home privileges *before* it is created ?
-			// JcrUtils.addPrivilege(nodeSession, userNodeHome.getPath(),
-			// username, Privilege.JCR_ALL);
-			// if (nodeSession.hasPendingChanges())
-			// nodeSession.save();
-
-			// user details
-			JcrUserDetails userDetails = new JcrUserDetails(userProfile, authen
-					.getCredentials().toString(), getBaseAuthorities());
+		if (authentication instanceof UsernamePasswordAuthenticationToken) {
+			// deal with remote access to internal server
+			// FIXME very primitive and unsecure at this stage
+			// consider using the keyring for username / password authentication
+			// or certificate
+			UsernamePasswordAuthenticationToken upat = (UsernamePasswordAuthenticationToken) authentication;
+			if (!upat.getPrincipal().toString()
+					.equals(System.getProperty("user.name")))
+				throw new BadCredentialsException("Wrong credentials");
+			UsernamePasswordAuthenticationToken authen = new UsernamePasswordAuthenticationToken(
+					authentication.getPrincipal(),
+					authentication.getCredentials(), getBaseAuthorities());
 			authen.setDetails(userDetails);
-		} catch (RepositoryException e) {
-			JcrUtils.discardQuietly(securitySession);
-			throw new ArgeoException(
-					"Unexpected exception when synchronizing OS and JCR security ",
-					e);
-		} finally {
-			JcrUtils.logoutQuietly(securitySession);
+			return authen;
+		} else if (authentication instanceof OsAuthenticationToken) {
+			OsAuthenticationToken authen = (OsAuthenticationToken) super
+					.authenticate(authentication);
+			try {
+				// WARNING: at this stage we assume that the java properties
+				// will have the same value
+				String username = System.getProperty("user.name");
+				Node userProfile = JcrUtils.createUserProfileIfNeeded(
+						securitySession, username);
+				JcrUserDetails.checkAccountStatus(userProfile);
+
+				// each user should have a writable area in the default
+				// workspace of the node
+				JcrUtils.createUserHomeIfNeeded(nodeSession, username);
+				userDetails = new JcrUserDetails(userProfile, authen
+						.getCredentials().toString(), getBaseAuthorities());
+				authen.setDetails(userDetails);
+				return authen;
+			} catch (RepositoryException e) {
+				JcrUtils.discardQuietly(securitySession);
+				throw new ArgeoException(
+						"Unexpected exception when synchronizing OS and JCR security ",
+						e);
+			} finally {
+				JcrUtils.logoutQuietly(securitySession);
+			}
+		} else {
+			throw new ArgeoException("Unsupported authentication "
+					+ authentication.getClass());
 		}
-		return authen;
 	}
 
 	public void setSecurityWorkspace(String securityWorkspace) {
@@ -93,4 +108,12 @@ public class OsJcrAuthenticationProvider extends OsAuthenticationProvider {
 	public void setRepository(Repository repository) {
 		this.repository = repository;
 	}
+
+	@SuppressWarnings("rawtypes")
+	public boolean supports(Class authentication) {
+		return OsAuthenticationToken.class.isAssignableFrom(authentication)
+				|| UsernamePasswordAuthenticationToken.class
+						.isAssignableFrom(authentication);
+	}
+
 }