package org.argeo.cms.auth;
-import static org.argeo.naming.LdapAttrs.cn;
+import static org.argeo.util.naming.LdapAttrs.cn;
import java.io.IOException;
import java.security.PrivilegedAction;
import javax.security.auth.login.CredentialNotFoundException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
-import org.argeo.api.security.CryptoKeyring;
-import org.argeo.cms.CmsException;
-import org.argeo.cms.internal.kernel.Activator;
-import org.argeo.naming.LdapAttrs;
+
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.internal.runtime.CmsContextImpl;
+import org.argeo.cms.security.CryptoKeyring;
import org.argeo.osgi.useradmin.AuthenticatingUser;
-import org.argeo.osgi.useradmin.IpaUtils;
-import org.argeo.osgi.useradmin.OsUserUtils;
import org.argeo.osgi.useradmin.TokenUtils;
+import org.argeo.util.directory.ldap.IpaUtils;
+import org.argeo.util.naming.LdapAttrs;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
* authentication.
*/
public class UserAdminLoginModule implements LoginModule {
- private final static Log log = LogFactory.getLog(UserAdminLoginModule.class);
+ private final static CmsLog log = CmsLog.getLog(UserAdminLoginModule.class);
private Subject subject;
private CallbackHandler callbackHandler;
private Map<String, Object> sharedState = null;
- private List<String> indexedUserProperties = Arrays
- .asList(new String[] { LdapAttrs.mail.name(), LdapAttrs.uid.name(), LdapAttrs.authPassword.name() });
+ private List<String> indexedUserProperties = Arrays.asList(new String[] { LdapAttrs.mail.name(),
+ LdapAttrs.uid.name(), LdapAttrs.employeeNumber.name(), LdapAttrs.authPassword.name() });
// private state
private BundleContext bc;
private Authorization bindAuthorization = null;
- private boolean singleUser = Activator.isSingleUser();
+// private boolean singleUser = Activator.isSingleUser();
@SuppressWarnings("unchecked")
@Override
this.callbackHandler = callbackHandler;
this.sharedState = (Map<String, Object>) sharedState;
} catch (Exception e) {
- throw new CmsException("Cannot initialize login module", e);
+ throw new IllegalStateException("Cannot initialize login module", e);
}
}
@Override
public boolean login() throws LoginException {
- UserAdmin userAdmin = Activator.getUserAdmin();
+ UserAdmin userAdmin = CmsContextImpl.getCmsContext().getUserAdmin();
final String username;
final char[] password;
Object certificateChain = null;
username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
password = (char[]) sharedState.get(CmsAuthUtils.SHARED_STATE_PWD);
// // TODO locale?
+ } else if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
+ && sharedState.containsKey(CmsAuthUtils.SHARED_STATE_SPNEGO_TOKEN)) {
+ // SPNEGO login has succeeded, that's enough for us at this stage
+ return true;
} else if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
&& sharedState.containsKey(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN)) {
String certDn = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
-// LdapName ldapName;
-// try {
-// ldapName = new LdapName(certificateName);
-// } catch (InvalidNameException e) {
-// e.printStackTrace();
-// return false;
-// }
-// username = ldapName.getRdn(ldapName.size() - 1).getValue().toString();
username = certDn;
certificateChain = sharedState.get(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN);
password = null;
username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
password = null;
preauth = true;
- } else if (singleUser) {
- username = OsUserUtils.getOsUsername();
- password = null;
} else {
// ask for username and password
// TODO check CRLs/OSCP validity?
// NB: authorization in commit() will work only if an LDAP connection password
// is provided
- } else if (singleUser) {
- // TODO verify IP address?
+// } else if (singleUser) {
+// // TODO verify IP address?
} else if (preauth) {
// ident
} else {
@Override
public boolean commit() throws LoginException {
- if (locale == null)
- subject.getPublicCredentials().add(Locale.getDefault());
- else
+ if (locale != null)
subject.getPublicCredentials().add(locale);
- if (singleUser) {
- OsUserUtils.loginAsSystemUser(subject);
- }
- UserAdmin userAdmin = Activator.getUserAdmin();
+// if (singleUser) {
+// OsUserUtils.loginAsSystemUser(subject);
+// }
+ UserAdmin userAdmin = CmsContextImpl.getCmsContext().getUserAdmin();
Authorization authorization;
if (callbackHandler == null) {// anonymous
authorization = userAdmin.getAuthorization(null);
throw new LoginException("Kerberos login " + authenticatingUser.getName()
+ " is inconsistent with user admin login " + authenticatedUser.getName());
}
+ if (log.isTraceEnabled())
+ log.trace("Retrieve authorization for " + authenticatingUser + "... ");
authorization = Subject.doAs(subject, new PrivilegedAction<Authorization>() {
@Override
}
// Log and monitor new login
- HttpServletRequest request = (HttpServletRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
+ RemoteAuthRequest request = (RemoteAuthRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
CmsAuthUtils.addAuthorization(subject, authorization);
// Unlock keyring (underlying login to the JCR repository)
public boolean logout() throws LoginException {
if (log.isTraceEnabled())
log.trace("Logging out from CMS... " + subject);
- // boolean httpSessionLogoutOk = CmsAuthUtils.logoutSession(bc,
- // subject);
CmsAuthUtils.cleanUp(subject);
return true;
}
Set<User> collectedUsers = new HashSet<>();
// try dn
User user = null;
+ user = null;
// try all indexes
for (String attr : indexedUserProperties) {
user = userAdmin.getUser(attr, providedUsername);
}
protected Group searchForToken(UserAdmin userAdmin, String token) {
- String dn = cn + "=" + token + "," + NodeConstants.TOKENS_BASEDN;
+ String dn = cn + "=" + token + "," + CmsConstants.TOKENS_BASEDN;
Group tokenGroup = (Group) userAdmin.getRole(dn);
return tokenGroup;
}