import java.io.IOException;
import java.security.PrivilegedAction;
-import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.auth.login.CredentialNotFoundException;
-import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import javax.servlet.http.HttpServletRequest;
private CallbackHandler callbackHandler;
private Map<String, Object> sharedState = null;
- private List<String> indexedUserProperties = Arrays
- .asList(new String[] { LdapAttrs.uid.name(), LdapAttrs.mail.name(), LdapAttrs.cn.name() });
+ private List<String> indexedUserProperties = Arrays.asList(
+ new String[] { LdapAttrs.DN, LdapAttrs.mail.name(), LdapAttrs.uid.name(), LdapAttrs.authPassword.name() });
// private state
private BundleContext bc;
@Override
public boolean login() throws LoginException {
- // Authorization sharedAuth = (Authorization)
- // sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION);
- // if (sharedAuth != null) {
- // if (callbackHandler == null && sharedAuth.getName() != null)
- // throw new LoginException("Shared authorization should be anonymous");
- // return false;
- // }
UserAdmin userAdmin = bc.getService(bc.getServiceReference(UserAdmin.class));
- if (callbackHandler == null) {// anonymous
- // authorization = userAdmin.getAuthorization(null);
- // sharedState.put(CmsAuthUtils.SHARED_STATE_AUTHORIZATION,
- // authorization);
- return true;
- }
-
final String username;
final char[] password;
if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
password = (char[]) sharedState.get(CmsAuthUtils.SHARED_STATE_PWD);
// // TODO locale?
- // // NB: raw user name is used
- // AuthenticatingUser authenticatingUser = new
- // AuthenticatingUser(username, password);
- // authorization = userAdmin.getAuthorization(authenticatingUser);
} else {
// ask for username and password
NameCallback nameCallback = new NameCallback("User");
return true;// expect Kerberos
// throw new FailedLoginException("Invalid credentials");
if (!user.hasCredential(null, password))
- throw new FailedLoginException("Invalid credentials");
+ return false;
+ // throw new FailedLoginException("Invalid credentials");
authenticatedUser = user;
return true;
}
protected User searchForUser(UserAdmin userAdmin, String providedUsername) {
try {
// TODO check value null or empty
- List<User> collectedUsers = new ArrayList<User>();
+ Set<User> collectedUsers = new HashSet<>();
// try dn
User user = null;
try {
collectedUsers.add(user);
}
if (collectedUsers.size() == 1)
- return collectedUsers.get(0);
+ return collectedUsers.iterator().next();
else if (collectedUsers.size() > 1)
log.warn(collectedUsers.size() + " users for provided username" + providedUsername);
return null;