X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FSingleUserLoginModule.java;h=35b7d5cc7ebe73233f630e1a46bb6aa2bac2168e;hb=ae3512aea50717cfaf0392421b66c7c028cbd36b;hp=08380ac5a227cd165756e9b430cec4e6fd9c5e6d;hpb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java
index 08380ac5a..35b7d5cc7 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java
@@ -1,7 +1,5 @@
 package org.argeo.cms.auth;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Locale;
 import java.util.Map;
 
@@ -13,15 +11,15 @@ import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 import javax.security.auth.x500.X500Principal;
 
-import org.argeo.api.cms.CmsLog;
-import org.argeo.osgi.useradmin.IpaUtils;
+import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.argeo.osgi.useradmin.OsUserUtils;
+import org.argeo.util.directory.ldap.IpaUtils;
 import org.argeo.util.naming.LdapAttrs;
 import org.osgi.service.useradmin.Authorization;
 
 /** Login module for when the system is owned by a single user. */
 public class SingleUserLoginModule implements LoginModule {
-	private final static CmsLog log = CmsLog.getLog(SingleUserLoginModule.class);
+//	private final static CmsLog log = CmsLog.getLog(SingleUserLoginModule.class);
 
 	private Subject subject;
 	private Map<String, Object> sharedState = null;
@@ -54,13 +52,7 @@ public class SingleUserLoginModule implements LoginModule {
 			Object username = sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
 			if (username == null)
 				throw new LoginException("No username available");
-			String hostname;
-			try {
-				hostname = InetAddress.getLocalHost().getHostName();
-			} catch (UnknownHostException e) {
-				log.warn("Using localhost as hostname", e);
-				hostname = "localhost";
-			}
+			String hostname = CmsContextImpl.getCmsContext().getCmsState().getHostname();
 			String baseDn = ("." + hostname).replaceAll("\\.", ",dc=");
 			X500Principal principal = new X500Principal(LdapAttrs.uid + "=" + username + baseDn);
 			authorizationName = principal.getName();
@@ -74,8 +66,8 @@ public class SingleUserLoginModule implements LoginModule {
 			locale = Locale.getDefault();
 		Authorization authorization = new SingleUserAuthorization(authorizationName);
 		CmsAuthUtils.addAuthorization(subject, authorization);
-		
-		// Add standard Java OS login 
+
+		// Add standard Java OS login
 		OsUserUtils.loginAsSystemUser(subject);
 
 		// additional principals (must be after Authorization registration)