Bug 459781 - Customizable authentication & authorization

Fixed missing cloen in UserVerifier & and naming of orgUnitResolverServiceClass attribute in access control schema
eclipse-emfstore · Mar 27, 2015 · c7fb8bd · c7fb8bd
1 parent dc57ab4
commit c7fb8bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd b/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd
@@ -52,7 +52,7 @@
 
    <element name="orgUnitResolverServiceProvider">
       <complexType>
-         <attribute name="orgUnitServiceClass" type="string">
+         <attribute name="orgUnitResolverServiceClass" type="string">
             <annotation>
                <documentation>
 

diff --git a/...pse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java b/...pse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java
@@ -14,6 +14,7 @@
 import java.util.Set;
 
 import org.eclipse.emf.emfstore.internal.common.APIUtil;
+import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
 import org.eclipse.emf.emfstore.internal.server.ServerConfiguration;
 import org.eclipse.emf.emfstore.internal.server.core.MonitorProvider;
 import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
@@ -64,7 +65,7 @@ public ESAuthenticationInformation verifyUser(String username, String password,
 
 		if (verifySuperUser(username, preparedPassword) || verifyPassword(username, preparedPassword)) {
 			final AuthenticationInformation createAuthenticationInfo = createAuthenticationInfo();
-			createAuthenticationInfo.setResolvedACUser(findUser(username));
+			createAuthenticationInfo.setResolvedACUser(ModelUtil.clone(findUser(username)));
 			return createAuthenticationInfo.toAPI();
 		}