X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2Fjaas.cfg;h=2bb1ab48170320bed1acaa977d11715de5f6ab9b;hb=06acf73a99f0e3908fe8998f1ff08dee109c5562;hp=4f647cf8a667a38f8f4f2a06a8bc2237310a2862;hpb=9dba7b01008499bdaf15c754190906d3200713fe;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 4f647cf8a..2bb1ab481 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,33 +1,35 @@
 USER {
-    org.argeo.cms.auth.NodeContextLoginModule requisite;
+    org.argeo.cms.auth.HttpLoginModule requisite;
     org.argeo.cms.auth.UserAdminLoginModule requisite;
     org.argeo.cms.auth.NodeUserLoginModule requisite;
 };
 
 ANONYMOUS {
-    org.argeo.cms.auth.NodeContextLoginModule requisite;
     org.argeo.cms.auth.UserAdminLoginModule requisite anonymous=true;
     org.argeo.cms.auth.NodeUserLoginModule requisite;
 };
 
-SYSTEM {
-    org.argeo.security.core.SystemLoginModule requisite;
+DATA_ADMIN {
+    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.security.crypto.KeyringLoginModule required;
+    org.argeo.util.security.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 {