X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2Fjaas.cfg;h=364977d4b3b9054cac876bb96a05007f8739ba9d;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=8cd11ba447cc481dbbca80d776db1c3ebd2d85f4;hpb=50911fdcc6df5cd35e71a0a4ecddf03f98f742a2;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 8cd11ba44..364977d4b 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,47 +1,30 @@
 USER {
-    org.argeo.cms.internal.auth.UserAdminLoginModule requisite;
-};
-
-OLD_USER {
-    org.argeo.cms.internal.auth.EndUserLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
+    org.argeo.cms.auth.RemoteSessionLoginModule sufficient;
+    org.argeo.cms.auth.IdentLoginModule optional;
+    org.argeo.cms.auth.UserAdminLoginModule 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;
+    org.argeo.cms.auth.RemoteSessionLoginModule sufficient;
+    org.argeo.cms.auth.AnonymousLoginModule requisite;
 };
 
-SYSTEM {
-    org.argeo.security.core.SystemLoginModule requisite;
+DATA_ADMIN {
+    org.argeo.cms.auth.DataAdminLoginModule requisite;
 };
 
-KERNEL {
-    com.sun.security.auth.module.UnixLoginModule requisite;
-    com.sun.security.auth.module.KeyStoreLoginModule requisite keyStoreURL="${osgi.configuration.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;
+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;
 };
-