projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve single user login.
[lgpl/argeo-commons.git]
/
org.argeo.cms
/
src
/
org
/
argeo
/
cms
/
auth
/
UserAdminLoginModule.java
diff --git
a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
index 692d214bcccc23ce5fe51303ef9e66336bccc3a4..092a06b7778e8bd6ecbcff7b53293ce3494a36b2 100644
(file)
--- a/
org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
+++ b/
org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
@@
-27,14
+27,12
@@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.cms.internal.kernel.Activator;
import org.argeo.naming.LdapAttrs;
-import org.argeo.node.NodeConstants;
-import org.argeo.node.security.CryptoKeyring;
import org.argeo.osgi.useradmin.AuthenticatingUser;
import org.argeo.osgi.useradmin.IpaUtils;
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.argeo.osgi.useradmin.TokenUtils;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
@@
-44,6
+42,10
@@
import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
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);
public class UserAdminLoginModule implements LoginModule {
private final static Log log = LogFactory.getLog(UserAdminLoginModule.class);
@@
-61,7
+63,7
@@
public class UserAdminLoginModule implements LoginModule {
private Authorization bindAuthorization = null;
private Authorization bindAuthorization = null;
-
private boolean singleUser = Activator.isSingleUser();
+
//
private boolean singleUser = Activator.isSingleUser();
@SuppressWarnings("unchecked")
@Override
@SuppressWarnings("unchecked")
@Override
@@
-73,7
+75,7
@@
public class UserAdminLoginModule implements LoginModule {
this.callbackHandler = callbackHandler;
this.sharedState = (Map<String, Object>) sharedState;
} catch (Exception e) {
this.callbackHandler = callbackHandler;
this.sharedState = (Map<String, Object>) sharedState;
} catch (Exception e) {
- throw new
Cms
Exception("Cannot initialize login module", e);
+ throw new
IllegalState
Exception("Cannot initialize login module", e);
}
}
}
}
@@
-110,9
+112,11
@@
public class UserAdminLoginModule implements LoginModule {
username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
password = null;
preauth = true;
username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
password = null;
preauth = true;
- } else if (singleUser) {
- username = OsUserUtils.getOsUsername();
- password = null;
+// } else if (singleUser) {
+// username = OsUserUtils.getOsUsername();
+// password = null;
+// // TODO retrieve from http session
+// locale = Locale.getDefault();
} else {
// ask for username and password
} else {
// ask for username and password
@@
-189,8
+193,8
@@
public class UserAdminLoginModule implements LoginModule {
// TODO check CRLs/OSCP validity?
// NB: authorization in commit() will work only if an LDAP connection password
// is provided
// 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 {
} else if (preauth) {
// ident
} else {
@@
-203,14
+207,12
@@
public class UserAdminLoginModule implements LoginModule {
@Override
public boolean commit() throws LoginException {
@Override
public boolean commit() throws LoginException {
- if (locale == null)
- subject.getPublicCredentials().add(Locale.getDefault());
- else
+ if (locale != null)
subject.getPublicCredentials().add(locale);
subject.getPublicCredentials().add(locale);
-
if (singleUser) {
-
OsUserUtils.loginAsSystemUser(subject);
-
}
+
//
if (singleUser) {
+
//
OsUserUtils.loginAsSystemUser(subject);
+
//
}
UserAdmin userAdmin = Activator.getUserAdmin();
Authorization authorization;
if (callbackHandler == null) {// anonymous
UserAdmin userAdmin = Activator.getUserAdmin();
Authorization authorization;
if (callbackHandler == null) {// anonymous
@@
-224,7
+226,7
@@
public class UserAdminLoginModule implements LoginModule {
if (authenticatedUser == null) {
if (log.isTraceEnabled())
log.trace("Neither kerberos nor user admin login succeeded. Login failed.");
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;
}
} else {
authenticatingUser = authenticatedUser;
}
@@
-295,8
+297,6
@@
public class UserAdminLoginModule implements LoginModule {
public boolean logout() throws LoginException {
if (log.isTraceEnabled())
log.trace("Logging out from CMS... " + subject);
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;
}
CmsAuthUtils.cleanUp(subject);
return true;
}
@@
-307,6
+307,7
@@
public class UserAdminLoginModule implements LoginModule {
Set<User> collectedUsers = new HashSet<>();
// try dn
User user = null;
Set<User> collectedUsers = new HashSet<>();
// try dn
User user = null;
+ user = null;
// try all indexes
for (String attr : indexedUserProperties) {
user = userAdmin.getUser(attr, providedUsername);
// try all indexes
for (String attr : indexedUserProperties) {
user = userAdmin.getUser(attr, providedUsername);