Revert "[502067] Set UserManager as IAuthenticator to allow authentication custo"
This reverts commit 2c26a19b22011eaf364d5446947b7f463e29dac7.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
index 1c6655d..0b37125 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013, 2016 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2011-2013, 2015 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -272,12 +272,7 @@
repository.setSessionManager(sessionManager);
}
- // Set the userManager as authenticator so that
- // the authenticate implementation can be overridden
- if (userManager instanceof IAuthenticator)
- {
- sessionManager.setAuthenticator((IAuthenticator)userManager);
- }
+ sessionManager.setUserManager(userManager);
}
}
}
diff --git a/plugins/org.eclipse.net4j.util/.settings/.api_filters b/plugins/org.eclipse.net4j.util/.settings/.api_filters
index 8fb7196..aff0f57 100644
--- a/plugins/org.eclipse.net4j.util/.settings/.api_filters
+++ b/plugins/org.eclipse.net4j.util/.settings/.api_filters
@@ -94,11 +94,4 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java" type="org.eclipse.net4j.util.security.UserManagerAuthenticator">
- <filter id="1143996420">
- <message_arguments>
- <message_argument value="UserManagerAuthenticator(IUserManager)"/>
- </message_arguments>
- </filter>
- </resource>
</component>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
index 1237ee2..d77d7bb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2016 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2008-2012 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,8 +13,8 @@
import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump;
import org.eclipse.net4j.util.io.IORuntimeException;
import org.eclipse.net4j.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -23,8 +23,6 @@
*/
public class UserManager extends Lifecycle implements IUserManager, IAuthenticator
{
- private UserManagerAuthenticator userManagerAuthenticator = new UserManagerAuthenticator(this);
-
@ExcludeFromDump
protected transient Map<String, char[]> users = new HashMap<String, char[]>();
@@ -59,8 +57,21 @@
*/
public void authenticate(String userID, char[] password)
{
- // delegate to UserManagerAuthenticator
- userManagerAuthenticator.authenticate(userID, password);
+ char[] userPassword;
+ synchronized (this)
+ {
+ userPassword = users.get(userID);
+ }
+
+ if (userPassword == null)
+ {
+ throw new SecurityException("No such user: " + userID); //$NON-NLS-1$
+ }
+
+ if (!Arrays.equals(userPassword, password))
+ {
+ throw new SecurityException("Wrong password for user: " + userID); //$NON-NLS-1$
+ }
}
/**
@@ -97,7 +108,6 @@
protected void doActivate() throws Exception
{
super.doActivate();
- LifecycleUtil.activate(userManagerAuthenticator);
load(users);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
index b911600..38f6499 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2012, 2015 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,14 +43,6 @@
{
}
- /**
- * @since 3.7
- */
- public UserManagerAuthenticator(IUserManager userManager)
- {
- setUserManager(userManager);
- }
-
public String getEncryptionAlgorithmName()
{
return encryptionAlgorithmName;
