Bug 459781 - Customizable authentication & authorization
Fixed missing cloen in UserVerifier & and naming of
orgUnitResolverServiceClass attribute in access control schema
diff --git a/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd b/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd
index 2904467..bcf693d 100644
--- 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/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java
index 52e70c6..7133ac8 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/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 @@
if (verifySuperUser(username, preparedPassword) || verifyPassword(username, preparedPassword)) {
final AuthenticationInformation createAuthenticationInfo = createAuthenticationInfo();
- createAuthenticationInfo.setResolvedACUser(findUser(username));
+ createAuthenticationInfo.setResolvedACUser(ModelUtil.clone(findUser(username)));
return createAuthenticationInfo.toAPI();
}
