From: Mathieu Baudier Date: Wed, 27 Jul 2022 07:56:05 +0000 (+0200) Subject: Remove deprecated warnings X-Git-Tag: v2.3.10~78 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=ae3512aea50717cfaf0392421b66c7c028cbd36b Remove deprecated warnings --- diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsAuth.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsAuth.java index decea3550..6ecfeba11 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsAuth.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/CmsAuth.java @@ -1,5 +1,6 @@ package org.argeo.api.cms; +import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; @@ -21,6 +22,14 @@ public enum CmsAuth { return new LoginContext(getLoginContextName(), callbackHandler); } + public LoginContext newLoginContext(Subject subject, CallbackHandler callbackHandler) throws LoginException { + return new LoginContext(getLoginContextName(), subject, callbackHandler); + } + + public LoginContext newLoginContext(Subject subject) throws LoginException { + return new LoginContext(getLoginContextName(), subject); + } + /* * LOGIN CONTEXTS */ diff --git a/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java index c49a59ef1..af559df75 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java @@ -1,6 +1,5 @@ package org.argeo.cms.auth; -import java.security.AccessController; import java.util.Map; import java.util.Set; @@ -16,6 +15,7 @@ import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; import org.argeo.cms.security.PBEKeySpecCallback; +import org.argeo.util.CurrentSubject; import org.argeo.util.PasswordEncryption; /** Adds a secret key to the private credentials */ @@ -28,7 +28,7 @@ public class KeyringLoginModule implements LoginModule { Map options) { this.subject = subject; if (subject == null) { - subject = Subject.getSubject(AccessController.getContext()); + this.subject = CurrentSubject.current(); } this.callbackHandler = callbackHandler; } diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java index 9720812e0..be5d0e15e 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java @@ -9,7 +9,6 @@ public interface RemoteAuthRequest { RemoteAuthSession getSession(); - @Deprecated RemoteAuthSession createSession(); Locale getLocale(); 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 956987d52..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,7 +11,6 @@ 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.cms.internal.runtime.CmsContextImpl; import org.argeo.osgi.useradmin.OsUserUtils; import org.argeo.util.directory.ldap.IpaUtils; @@ -22,7 +19,7 @@ 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 sharedState = null; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java index dfedfab19..4f5a85ddf 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java @@ -76,9 +76,9 @@ public class CmsSessionImpl implements CmsSession, Serializable { try { LoginContext lc; if (isAnonymous()) { - lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS, getSubject()); + lc = CmsAuth.ANONYMOUS.newLoginContext(getSubject()); } else { - lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, getSubject()); + lc = CmsAuth.USER.newLoginContext(getSubject()); } lc.logout(); } catch (LoginException e) { diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java index 5e047d38a..59b226a53 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java @@ -58,11 +58,11 @@ public class CmsActivator implements BundleActivator { } catch (Exception e) { log.error("CMS activator shutdown failed", e); } - + new GogoShellKiller().start(); } - private void initSecurity() { + protected void initSecurity() { // code-level permissions String osgiSecurity = bundleContext.getProperty(Constants.FRAMEWORK_SECURITY); if (osgiSecurity != null && Constants.FRAMEWORK_SECURITY_OSGI.equals(osgiSecurity)) { @@ -104,7 +104,6 @@ public class CmsActivator implements BundleActivator { // bundleContext.registerService(ArgeoLogger.class, logger, null); // } - public static void registerService(Class clss, T service, Dictionary properties) { if (bundleContext != null) { bundleContext.registerService(clss, service, properties); @@ -139,7 +138,6 @@ public class CmsActivator implements BundleActivator { bundleContext = null; } - public static BundleContext getBundleContext() { return bundleContext; }