X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2Fjaas.cfg;h=83d36d927695cb9a7b7226e6eddcd39ee0043da8;hb=5f71a84cb6ad1383c97f16a1aa6fd63f9464509a;hp=0e76f376a3793a5a3175bbe591c946d6c9a7a616;hpb=93a457cf047cebb0170abd0f37a9b4291a2ae3e9;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 0e76f376a..83d36d927 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,43 +1,25 @@
 USER {
-    org.argeo.cms.internal.auth.UserAdminLoginModule requisite;
+    org.argeo.cms.auth.HttpSessionLoginModule sufficient;
+    org.argeo.cms.auth.UserAdminLoginModule requisite;
 };
 
-OLD_USER {
-    org.argeo.cms.internal.auth.EndUserLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
+DATA_ADMIN {
+    org.argeo.cms.auth.DataAdminLoginModule requisite;
 };
 
-ANONYMOUS {
-    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.cms.internal.auth.SystemLoginModule requisite;
-   org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
-   org.argeo.security.jackrabbit.SystemJackrabbitLoginModule requisite;
-};
-
-OLD_SYSTEM {
-    org.argeo.cms.internal.auth.SystemLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
+NODE {
+    org.argeo.cms.auth.DataAdminLoginModule requisite;
 };
 
 KEYRING {
-    org.argeo.security.crypto.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 {
    org.argeo.security.jackrabbit.SystemJackrabbitLoginModule requisite;
 };
-