package org.argeo.cms.auth;
+import static org.argeo.naming.LdapAttrs.cn;
+
import java.io.IOException;
import java.security.PrivilegedAction;
-import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.CmsException;
+import org.argeo.api.NodeConstants;
+import org.argeo.api.security.CryptoKeyring;
import org.argeo.cms.internal.kernel.Activator;
import org.argeo.naming.LdapAttrs;
-import org.argeo.node.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.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.service.useradmin.Authorization;
+import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
+/**
+ * Use the {@link UserAdmin} in the OSGi registry as the basis for
+ * authentication.
+ */
public class UserAdminLoginModule implements LoginModule {
private final static Log log = LogFactory.getLog(UserAdminLoginModule.class);
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);
}
}
UserAdmin userAdmin = Activator.getUserAdmin();
final String username;
final char[] password;
- X509Certificate[] certificateChain = null;
+ Object certificateChain = null;
+ boolean preauth = false;
if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
&& sharedState.containsKey(CmsAuthUtils.SHARED_STATE_PWD)) {
// NB: required by Basic http auth
// // TODO locale?
} else if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
&& sharedState.containsKey(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN)) {
- // NB: required by Basic http auth
- username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
- certificateChain = (X509Certificate[]) sharedState.get(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;
- } else if (singleUser) {
- username = OsUserUtils.getOsUsername();
+ } else if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
+ && sharedState.containsKey(CmsAuthUtils.SHARED_STATE_REMOTE_ADDR)
+ && sharedState.containsKey(CmsAuthUtils.SHARED_STATE_REMOTE_PORT)) {// ident
+ username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
password = null;
+ preauth = true;
+// } else if (singleUser) {
+// username = OsUserUtils.getOsUsername();
+// password = null;
+// // TODO retrieve from http session
+// locale = Locale.getDefault();
} else {
// ask for username and password
sharedState.put(CmsAuthUtils.SHARED_STATE_PWD, password);
}
User user = searchForUser(userAdmin, username);
+
+ // Tokens
+ if (user == null) {
+ String token = username;
+ Group tokenGroup = searchForToken(userAdmin, token);
+ if (tokenGroup != null) {
+ Authorization tokenAuthorization = getAuthorizationFromToken(userAdmin, tokenGroup);
+ if (tokenAuthorization != null) {
+ bindAuthorization = tokenAuthorization;
+ authenticatedUser = (User) userAdmin.getRole(bindAuthorization.getName());
+ return true;
+ }
+ }
+ }
+
if (user == null)
return true;// expect Kerberos
// 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 {
throw new CredentialNotFoundException("No credentials provided");
}
@Override
public boolean commit() throws LoginException {
- if (singleUser) {
- OsUserUtils.loginAsSystemUser(subject);
- }
+ if (locale != null)
+ subject.getPublicCredentials().add(locale);
+
+// if (singleUser) {
+// OsUserUtils.loginAsSystemUser(subject);
+// }
UserAdmin userAdmin = Activator.getUserAdmin();
Authorization authorization;
if (callbackHandler == null) {// anonymous
if (authenticatedUser == null) {
if (log.isTraceEnabled())
log.trace("Neither kerberos nor user admin login succeeded. Login failed.");
- return false;
+ throw new CredentialNotFoundException("Bad credentials.");
} else {
authenticatingUser = authenticatedUser;
}
// Log and monitor new login
HttpServletRequest request = (HttpServletRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
- CmsAuthUtils.addAuthorization(subject, authorization, locale, request);
+ CmsAuthUtils.addAuthorization(subject, authorization);
// Unlock keyring (underlying login to the JCR repository)
char[] password = (char[]) sharedState.get(CmsAuthUtils.SHARED_STATE_PWD);
});
}
}
-
+
// Register CmsSession with initial subject
CmsAuthUtils.registerSessionAuthorization(request, subject, authorization, locale);
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;
+ Group tokenGroup = (Group) userAdmin.getRole(dn);
+ return tokenGroup;
+ }
+
+ protected Authorization getAuthorizationFromToken(UserAdmin userAdmin, Group tokenGroup) {
+ if (TokenUtils.isExpired(tokenGroup))
+ return null;
+// String expiryDateStr = (String) tokenGroup.getProperties().get(description.name());
+// if (expiryDateStr != null) {
+// Instant expiryDate = NamingUtils.ldapDateToInstant(expiryDateStr);
+// if (expiryDate.isBefore(Instant.now())) {
+// if (log.isDebugEnabled())
+// log.debug("Token " + tokenGroup.getName() + " has expired.");
+// return null;
+// }
+// }
+ String userDn = TokenUtils.userDn(tokenGroup);
+ User user = (User) userAdmin.getRole(userDn);
+ Authorization auth = userAdmin.getAuthorization(user);
+ return auth;
+ }
}
projects / lgpl / argeo-commons.git / blobdiff