X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FSingleUserLoginModule.java;h=956987d52ddde586d7b9ff8cf370e1608dc8b72a;hb=8c6e16aa43d9523e1ec57a41a06b3ceba7d23fdb;hp=972d6a2458a74b2edaa9438b6c3acbbd5e0e69ed;hpb=79c14508549e1af042485b4f888a3c54f5a68833;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 972d6a245..956987d52 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java @@ -14,6 +14,7 @@ import javax.security.auth.spi.LoginModule; import javax.security.auth.x500.X500Principal; import org.argeo.api.cms.CmsLog; +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; @@ -54,13 +55,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 +69,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)