X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2Fjaas.cfg;h=269c9112ba058c852a221bda7d80f387949f3f61;hb=85688af22a77f82e7762e11e6eb38c6367eddb6c;hp=e5e3be5cdfcbcb60432452dbad765e8da485b928;hpb=86db10fcb2299ebf71d5599a80dc54444b26f893;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg
index e5e3be5cd..269c9112b 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg
@@ -1,4 +1,5 @@
 USER {
+    org.argeo.cms.auth.HttpLoginModule requisite;
     org.argeo.cms.auth.UserAdminLoginModule requisite;
     org.argeo.cms.auth.NodeUserLoginModule requisite;
 };
@@ -8,24 +9,31 @@ ANONYMOUS {
     org.argeo.cms.auth.NodeUserLoginModule requisite;
 };
 
+DATA_ADMIN {
+    org.argeo.cms.auth.DataAdminLoginModule requisite;
+};
+
 SYSTEM {
-    org.argeo.security.core.SystemLoginModule requisite;
+    org.argeo.cms.auth.DataAdminLoginModule requisite;
 };
 
 KERNEL {
+    org.argeo.cms.internal.auth.KernelLoginModule requisite;
+};
+
+HARDENED_KERNEL {
     com.sun.security.auth.module.UnixLoginModule requisite;
-    com.sun.security.auth.module.KeyStoreLoginModule requisite keyStoreURL="${osgi.instance.area}/node.p12" keyStoreType=PKCS12 keyStoreProvider=BC;
+    com.sun.security.auth.module.KeyStoreLoginModule requisite keyStoreURL="${osgi.instance.area}/node.p12" keyStoreType=PKCS12;
     org.argeo.cms.internal.auth.KernelLoginModule requisite;
 };
 
 KEYRING {
-    org.argeo.util.security.KeyringLoginModule required;
+    org.argeo.cms.auth.KeyringLoginModule required;
 };
 
 SINGLE_USER {
     com.sun.security.auth.module.UnixLoginModule requisite;
-    org.argeo.cms.internal.auth.SingleUserLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
+    org.argeo.cms.auth.SingleUserLoginModule requisite;
 };
 
 Jackrabbit {