Make CMS production ready

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / jaas.cfg

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 0e76f376a3793a5a3175bbe591c946d6c9a7a616..2bb1ab48170320bed1acaa977d11715de5f6ab9b 100644 (file)
--- 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,37 @@
 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.HttpLoginModule requisite;
+    org.argeo.cms.auth.UserAdminLoginModule requisite;
+    org.argeo.cms.auth.NodeUserLoginModule requisite;
 };
 
 ANONYMOUS {
-    org.argeo.cms.internal.auth.UserAdminLoginModule requisite anonymous=true;
+    org.argeo.cms.auth.UserAdminLoginModule requisite anonymous=true;
+    org.argeo.cms.auth.NodeUserLoginModule requisite;
 };
 
-OLD_ANONYMOUS {
-    org.argeo.cms.internal.auth.AnonymousLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
+DATA_ADMIN {
+    org.argeo.cms.auth.DataAdminLoginModule requisite;
 };
 
-SYSTEM {
-   org.argeo.cms.internal.auth.SystemLoginModule requisite;
-   org.springframework.security.authentication.jaas.SecurityContextLoginModule requisite;
-   org.argeo.security.jackrabbit.SystemJackrabbitLoginModule requisite;
+KERNEL {
+    org.argeo.cms.internal.auth.KernelLoginModule requisite;
 };
 
-OLD_SYSTEM {
-    org.argeo.cms.internal.auth.SystemLoginModule requisite;
-    org.springframework.security.authentication.jaas.SecurityContextLoginModule 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;
+    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 {
    org.argeo.security.jackrabbit.SystemJackrabbitLoginModule requisite;
 };
-