address more reviewer comments

This commit is contained in:
Jyoti Wadhwani 2018-07-31 13:22:18 -07:00
parent 3ede35ada1
commit 202c8032bc

View File

@ -13,26 +13,24 @@
*/ */
package security; package security;
import com.google.common.base.Preconditions;
import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.naming.AuthenticationException; import javax.naming.AuthenticationException;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException; import javax.security.auth.login.LoginException;
import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.Callback; import javax.security.auth.callback.Callback;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Preconditions; import play.Logger;
public class AuthenticationManager { public class AuthenticationManager {
public static void authenticateUser(String userName, String password) throws NamingException { public static void authenticateUser(String userName, String password) throws NamingException {
Preconditions.checkNotNull(userName, "Username String cannot be null"); Preconditions.checkArgument(
Preconditions.checkNotNull(password, "Password String cannot be null"); !StringUtils.isAnyEmpty(userName, password), "Username or password cannot be empty"
Preconditions.checkArgument(!userName.isEmpty(), "Username cannot be empty"); );
Preconditions.checkArgument(!password.isEmpty(), "Password cannot be empty");
try { try {
LoginContext lc = new LoginContext("WHZ-Authentication", new WHZCallbackHandler(userName, password)); LoginContext lc = new LoginContext("WHZ-Authentication", new WHZCallbackHandler(userName, password));
lc.login(); lc.login();
@ -50,8 +48,7 @@ public class AuthenticationManager {
} }
@Override @Override
public void handle(Callback[] callbacks) public void handle(Callback[] callbacks) {
throws UnsupportedCallbackException {
NameCallback nc = null; NameCallback nc = null;
PasswordCallback pc = null; PasswordCallback pc = null;
for (Callback callback : callbacks) { for (Callback callback : callbacks) {
@ -62,7 +59,7 @@ public class AuthenticationManager {
pc = (PasswordCallback) callback; pc = (PasswordCallback) callback;
pc.setPassword(this.password.toCharArray()); pc.setPassword(this.password.toCharArray());
} else { } else {
throw new UnsupportedCallbackException(callback, "The submitted Callback is unsupported"); Logger.warn("The submitted callback is unsupported! ", callback);
} }
} }
} }