Skip to content

Commit 9710046

Browse files
remibergsmaremibergsma
committed
Merge pull request apache#1100 from rafaelweingartner/master-lrg-cs-hackday-005
Removal of DefaultUserAuthenticator empty class.The DefaultUserAuthenticator is an empty class, extending from the AdapterBase and implementing the UserAuthenticator interface. The class is not being used as a marker and it's sole use is to be extended by other UserAuthenticators. Noticing that the class had no purpose, I removed it and made it's children extend from it's superclass and implement it's interface instead. Also, I removed the @Local tags from those classes, since EJB is not used anymore. * pr/1100: Removal of DefaultUserAuthenticator empty class Signed-off-by: Remi Bergsma <[email protected]>
2 parents 59d6fdf + 98594b7 commit 9710046

7 files changed

Lines changed: 75 additions & 83 deletions

File tree

‎plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,24 @@
1616
// under the License.
1717
package org.apache.cloudstack.ldap;
1818

19-
import com.cloud.server.auth.DefaultUserAuthenticator;
19+
import java.util.Map;
20+
import java.util.UUID;
21+
22+
import javax.inject.Inject;
23+
24+
import org.apache.commons.lang.StringUtils;
25+
import org.apache.log4j.Logger;
26+
27+
import com.cloud.server.auth.UserAuthenticator;
2028
import com.cloud.user.Account;
2129
import com.cloud.user.AccountManager;
2230
import com.cloud.user.User;
2331
import com.cloud.user.UserAccount;
2432
import com.cloud.user.dao.UserAccountDao;
2533
import com.cloud.utils.Pair;
26-
import org.apache.commons.lang.StringUtils;
27-
import org.apache.log4j.Logger;
28-
29-
import javax.inject.Inject;
30-
import java.util.Map;
31-
import java.util.UUID;
34+
import com.cloud.utils.component.AdapterBase;
3235

33-
public class LdapAuthenticator extends DefaultUserAuthenticator {
36+
public class LdapAuthenticator extends AdapterBase implements UserAuthenticator {
3437
private static final Logger s_logger = Logger.getLogger(LdapAuthenticator.class.getName());
3538

3639
@Inject

‎plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,28 @@
1515

1616
package com.cloud.server.auth;
1717

18-
import com.cloud.user.UserAccount;
19-
import com.cloud.user.dao.UserAccountDao;
20-
import com.cloud.utils.Pair;
21-
import com.cloud.utils.exception.CloudRuntimeException;
22-
import org.apache.commons.lang.StringUtils;
23-
import org.apache.log4j.Logger;
24-
25-
import javax.inject.Inject;
2618
import java.math.BigInteger;
2719
import java.security.MessageDigest;
2820
import java.security.NoSuchAlgorithmException;
2921
import java.util.Map;
3022

23+
import javax.inject.Inject;
24+
25+
import org.apache.commons.lang.StringUtils;
26+
import org.apache.log4j.Logger;
27+
28+
import com.cloud.user.UserAccount;
29+
import com.cloud.user.dao.UserAccountDao;
30+
import com.cloud.utils.Pair;
31+
import com.cloud.utils.component.AdapterBase;
32+
import com.cloud.utils.exception.CloudRuntimeException;
33+
3134
/**
3235
* Simple UserAuthenticator that performs a MD5 hash of the password before
3336
* comparing it against the local database.
3437
*
3538
*/
36-
public class MD5UserAuthenticator extends DefaultUserAuthenticator {
39+
public class MD5UserAuthenticator extends AdapterBase implements UserAuthenticator {
3740
public static final Logger s_logger = Logger.getLogger(MD5UserAuthenticator.class);
3841

3942
@Inject

‎plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,32 @@
1515

1616
package org.apache.cloudstack.server.auth;
1717

18-
import com.cloud.server.auth.DefaultUserAuthenticator;
19-
import com.cloud.server.auth.UserAuthenticator;
20-
import com.cloud.user.UserAccount;
21-
import com.cloud.user.dao.UserAccountDao;
22-
import com.cloud.utils.ConstantTimeComparator;
23-
import com.cloud.utils.Pair;
24-
import com.cloud.utils.exception.CloudRuntimeException;
25-
import org.apache.commons.lang.StringUtils;
26-
import org.apache.log4j.Logger;
27-
import org.bouncycastle.crypto.PBEParametersGenerator;
28-
import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
29-
import org.bouncycastle.crypto.params.KeyParameter;
30-
import org.bouncycastle.util.encoders.Base64;
18+
import static java.lang.String.format;
3119

32-
import javax.inject.Inject;
3320
import java.io.UnsupportedEncodingException;
3421
import java.security.NoSuchAlgorithmException;
3522
import java.security.SecureRandom;
3623
import java.security.spec.InvalidKeySpecException;
3724
import java.util.Map;
3825

39-
import static java.lang.String.format;
26+
import javax.inject.Inject;
27+
28+
import org.apache.commons.lang.StringUtils;
29+
import org.apache.log4j.Logger;
30+
import org.bouncycastle.crypto.PBEParametersGenerator;
31+
import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
32+
import org.bouncycastle.crypto.params.KeyParameter;
33+
import org.bouncycastle.util.encoders.Base64;
34+
35+
import com.cloud.server.auth.UserAuthenticator;
36+
import com.cloud.user.UserAccount;
37+
import com.cloud.user.dao.UserAccountDao;
38+
import com.cloud.utils.ConstantTimeComparator;
39+
import com.cloud.utils.Pair;
40+
import com.cloud.utils.component.AdapterBase;
41+
import com.cloud.utils.exception.CloudRuntimeException;
4042

41-
public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator {
43+
public class PBKDF2UserAuthenticator extends AdapterBase implements UserAuthenticator {
4244
public static final Logger s_logger = Logger.getLogger(PBKDF2UserAuthenticator.class);
4345
private static final int s_saltlen = 64;
4446
private static final int s_rounds = 100000;
@@ -47,6 +49,7 @@ public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator {
4749
@Inject
4850
private UserAccountDao _userAccountDao;
4951

52+
@Override
5053
public Pair<Boolean, UserAuthenticator.ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, Map<String, Object[]> requestParameters) {
5154
if (s_logger.isDebugEnabled()) {
5255
s_logger.debug("Retrieving user: " + username);
@@ -100,6 +103,7 @@ public Pair<Boolean, UserAuthenticator.ActionOnFailedAuthentication> authenticat
100103
}
101104
}
102105

106+
@Override
103107
public String encode(String password)
104108
{
105109
try

‎plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@
1515

1616
package com.cloud.server.auth;
1717

18-
import com.cloud.user.UserAccount;
19-
import com.cloud.user.dao.UserAccountDao;
20-
import com.cloud.utils.Pair;
18+
import java.util.Map;
19+
20+
import javax.inject.Inject;
21+
2122
import org.apache.commons.lang.StringUtils;
2223
import org.apache.log4j.Logger;
2324

24-
import javax.inject.Inject;
25-
import java.util.Map;
25+
import com.cloud.user.UserAccount;
26+
import com.cloud.user.dao.UserAccountDao;
27+
import com.cloud.utils.Pair;
28+
import com.cloud.utils.component.AdapterBase;
2629

27-
public class PlainTextUserAuthenticator extends DefaultUserAuthenticator {
30+
public class PlainTextUserAuthenticator extends AdapterBase implements UserAuthenticator {
2831
public static final Logger s_logger = Logger.getLogger(PlainTextUserAuthenticator.class);
2932

3033
@Inject

‎plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,22 @@
1414
// limitations under the License.
1515
package org.apache.cloudstack.saml;
1616

17-
import com.cloud.server.auth.DefaultUserAuthenticator;
17+
import java.util.Map;
18+
19+
import javax.inject.Inject;
20+
21+
import org.apache.cxf.common.util.StringUtils;
22+
import org.apache.log4j.Logger;
23+
24+
import com.cloud.server.auth.UserAuthenticator;
1825
import com.cloud.user.User;
1926
import com.cloud.user.UserAccount;
2027
import com.cloud.user.dao.UserAccountDao;
2128
import com.cloud.user.dao.UserDao;
2229
import com.cloud.utils.Pair;
23-
import org.apache.cxf.common.util.StringUtils;
24-
import org.apache.log4j.Logger;
25-
26-
import javax.inject.Inject;
27-
import java.util.Map;
30+
import com.cloud.utils.component.AdapterBase;
2831

29-
public class SAML2UserAuthenticator extends DefaultUserAuthenticator {
32+
public class SAML2UserAuthenticator extends AdapterBase implements UserAuthenticator {
3033
public static final Logger s_logger = Logger.getLogger(SAML2UserAuthenticator.class);
3134

3235
@Inject

‎plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,25 @@
1616
// under the License.
1717
package com.cloud.server.auth;
1818

19-
import com.cloud.user.UserAccount;
20-
import com.cloud.user.dao.UserAccountDao;
21-
import com.cloud.utils.Pair;
22-
import com.cloud.utils.exception.CloudRuntimeException;
23-
import org.apache.commons.lang.StringUtils;
24-
import org.apache.log4j.Logger;
25-
import org.bouncycastle.util.encoders.Base64;
26-
27-
import javax.inject.Inject;
2819
import java.io.UnsupportedEncodingException;
2920
import java.security.MessageDigest;
3021
import java.security.NoSuchAlgorithmException;
3122
import java.security.SecureRandom;
3223
import java.util.Map;
3324

34-
public class SHA256SaltedUserAuthenticator extends DefaultUserAuthenticator {
25+
import javax.inject.Inject;
26+
27+
import org.apache.commons.lang.StringUtils;
28+
import org.apache.log4j.Logger;
29+
import org.bouncycastle.util.encoders.Base64;
30+
31+
import com.cloud.user.UserAccount;
32+
import com.cloud.user.dao.UserAccountDao;
33+
import com.cloud.utils.Pair;
34+
import com.cloud.utils.component.AdapterBase;
35+
import com.cloud.utils.exception.CloudRuntimeException;
36+
37+
public class SHA256SaltedUserAuthenticator extends AdapterBase implements UserAuthenticator {
3538
public static final Logger s_logger = Logger.getLogger(SHA256SaltedUserAuthenticator.class);
3639
private static final String s_defaultPassword = "000000000000000000000000000=";
3740
private static final String s_defaultSalt = "0000000000000000000000000000000=";

‎server/src/com/cloud/server/auth/DefaultUserAuthenticator.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)