X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FUserAdminLoginModule.java;h=092a06b7778e8bd6ecbcff7b53293ce3494a36b2;hp=4057b26af800e042d6fc1076ec89ad2f5ee7be63;hb=52a45835da8cd816ac2e2b22ee9b84101fe8fb06;hpb=48216df1d870744d4ae7486c6debe0ec626111ac

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 4057b26af..092a06b77 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
@@ -33,7 +33,6 @@ import org.argeo.cms.internal.kernel.Activator;
 import org.argeo.naming.LdapAttrs;
 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;
@@ -64,7 +63,7 @@ public class UserAdminLoginModule implements LoginModule {
 
 	private Authorization bindAuthorization = null;
 
-	private boolean singleUser = Activator.isSingleUser();
+//	private boolean singleUser = Activator.isSingleUser();
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -113,11 +112,11 @@ public class UserAdminLoginModule implements LoginModule {
 			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 if (singleUser) {
+//			username = OsUserUtils.getOsUsername();
+//			password = null;
+//			// TODO retrieve from http session
+//			locale = Locale.getDefault();
 		} else {
 
 			// ask for username and password
@@ -194,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
-		} else if (singleUser) {
-			// TODO verify IP address?
+//		} else if (singleUser) {
+//			// TODO verify IP address?
 		} else if (preauth) {
 			// ident
 		} else {
@@ -211,9 +210,9 @@ public class UserAdminLoginModule implements LoginModule {
 		if (locale != null)
 			subject.getPublicCredentials().add(locale);
 
-		if (singleUser) {
-			OsUserUtils.loginAsSystemUser(subject);
-		}
+//		if (singleUser) {
+//			OsUserUtils.loginAsSystemUser(subject);
+//		}
 		UserAdmin userAdmin = Activator.getUserAdmin();
 		Authorization authorization;
 		if (callbackHandler == null) {// anonymous