X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2Fjaas.cfg;h=f97cf9113b9b2a9e4f9d8372491d20d69b6e0182;hb=92ac99f3ededbcd28def2bf9601bb33c02a351b3;hp=0155fc5eee9eae292a04d372041ec173d0af1099;hpb=759a7c0396796565b231738b855c8b0a8413be6b;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 0155fc5ee..f97cf9113 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,18 +1,47 @@
 USER {
-    org.argeo.security.login.EndUserLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule required;
+    org.argeo.cms.internal.auth.UserAdminLoginModule requisite;
+};
+
+OLD_USER {
+    org.argeo.cms.internal.auth.EndUserLoginModule requisite;
+    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
 };
 
 ANONYMOUS {
-    org.argeo.security.login.AnonymousLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule required;
+    org.argeo.cms.internal.auth.UserAdminLoginModule requisite anonymous=true;
+};
+
+OLD_ANONYMOUS {
+    org.argeo.cms.internal.auth.AnonymousLoginModule requisite;
+    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
 };
 
 SYSTEM {
-    org.argeo.security.login.SystemLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule required;
+    org.argeo.security.core.SystemLoginModule requisite;
+};
+
+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;
+    org.argeo.cms.internal.auth.KernelLoginModule requisite;
+};
+
+OLD_SYSTEM {
+    org.argeo.cms.internal.auth.SystemLoginModule requisite;
+    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
 };
 
 KEYRING {
     org.argeo.security.crypto.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;
+};
+
+Jackrabbit {
+   org.argeo.security.jackrabbit.SystemJackrabbitLoginModule requisite;
+};
+