Updated Branches: refs/heads/master 4d01ce8fc -> c7cc79181
Revert "Cleanup DefaultUserAuthenticator and removed masking _name variable" This reverts commit 4d01ce8fc766423d795955bd5784b56969ce11a8. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c7cc7918 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c7cc7918 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c7cc7918 Branch: refs/heads/master Commit: c7cc79181b784fe4b6ea1ae7802a6604da08f8d3 Parents: 4d01ce8 Author: Abhinandan Prateek <[email protected]> Authored: Fri Sep 20 19:33:50 2013 +0530 Committer: Abhinandan Prateek <[email protected]> Committed: Fri Sep 20 19:33:50 2013 +0530 ---------------------------------------------------------------------- .../cloudstack/ldap/LdapAuthenticator.java | 10 ++++++++ .../cloud/server/auth/MD5UserAuthenticator.java | 14 +++++++++- .../server/auth/PlainTextUserAuthenticator.java | 15 +++++++++++ .../auth/SHA256SaltedUserAuthenticator.java | 11 ++++++++ .../server/auth/DefaultUserAuthenticator.java | 27 ++++++++++++++++++++ 5 files changed, 76 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7cc7918/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java index 559a979..e62a3d8 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.ldap; import java.util.Map; import javax.inject.Inject; +import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -47,6 +48,15 @@ public class LdapAuthenticator extends DefaultUserAuthenticator { } @Override + public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { + if (name == null) { + name = "LDAP"; + } + super.configure(name, params); + return true; + } + + @Override public boolean authenticate(final String username, final String password, final Long domainId, final Map<String, Object[]> requestParameters) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7cc7918/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java index 63583af..e5b169f 100644 --- a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java +++ b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java @@ -22,11 +22,12 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import javax.naming.ConfigurationException; import org.apache.log4j.Logger; - import com.cloud.user.UserAccount; import com.cloud.user.dao.UserAccountDao; + import com.cloud.utils.exception.CloudRuntimeException; /** @@ -58,6 +59,17 @@ public class MD5UserAuthenticator extends DefaultUserAuthenticator { return true; } + @Override + public boolean configure(String name, Map<String, Object> params) + throws ConfigurationException { + if(name == null) { + name = "MD5"; + } + super.configure(name, params); + return true; + } + + @Override public String encode(String password) { MessageDigest md5 = null; try { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7cc7918/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java b/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java index 849e82e..f102275 100644 --- a/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java +++ b/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java @@ -15,15 +15,20 @@ package com.cloud.server.auth; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import com.cloud.user.UserAccount; import com.cloud.user.dao.UserAccountDao; +import com.cloud.utils.exception.CloudRuntimeException; @Local(value={UserAuthenticator.class}) @@ -51,6 +56,16 @@ public class PlainTextUserAuthenticator extends DefaultUserAuthenticator { return true; } + @Override + public boolean configure(String name, Map<String, Object> params) + throws ConfigurationException { + if (name == null) { + name = "PLAINTEXT"; + } + super.configure(name, params); + return true; + } + @Override public String encode(String password) { // Plaintext so no encoding at all http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7cc7918/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java b/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java index 3592ddc..91be922 100644 --- a/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java +++ b/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java @@ -24,6 +24,7 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.bouncycastle.util.encoders.Base64; @@ -41,6 +42,16 @@ public class SHA256SaltedUserAuthenticator extends DefaultUserAuthenticator { private UserAccountDao _userAccountDao; private static final int s_saltlen = 32; + @Override + public boolean configure(String name, Map<String, Object> params) + throws ConfigurationException { + if (name == null) { + name = "SHA256SALT"; + } + super.configure(name, params); + return true; + } + /* (non-Javadoc) * @see com.cloud.server.auth.UserAuthenticator#authenticate(java.lang.String, java.lang.String, java.lang.Long, java.util.Map) */ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7cc7918/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java index 253b0ac..952f724 100644 --- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java +++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java @@ -16,7 +16,10 @@ // under the License. package com.cloud.server.auth; +import java.util.Map; + import javax.ejb.Local; +import javax.naming.ConfigurationException; import com.cloud.utils.component.AdapterBase; @@ -26,4 +29,28 @@ import com.cloud.utils.component.AdapterBase; */ @Local(value={UserAuthenticator.class}) public abstract class DefaultUserAuthenticator extends AdapterBase implements UserAuthenticator { + private String _name = null; + + @Override + public boolean configure(String name, Map<String, Object> params) + throws ConfigurationException { + _name = name; + return true; + } + + @Override + public String getName() { + return _name; + } + + @Override + public boolean start() { + return true; + } + + @Override + public boolean stop() { + return true; + } + }
