Fix regression with anonymous WebDav

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / CmsAuthUtils.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
index 86800e282627441a3d6dbda5cf1d49320ba69b2e..63936c89754a1a81b2d2b222c557e43823fc0f3c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -14,13 +14,21 @@ import javax.security.auth.x500.X500Principal;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.auth.ImpliedByPrincipal;
 import org.argeo.node.security.AnonymousPrincipal;
+import org.argeo.node.security.DataAdminPrincipal;
 import org.argeo.node.security.NodeSecurityUtils;
 import org.osgi.service.useradmin.Authorization;
 
 class CmsAuthUtils {
+       /** From org.osgi.service.http.HttpContext */
+       static final String SHARED_STATE_AUTHORIZATION = "org.osgi.service.useradmin.authorization";
+       /** From com.sun.security.auth.module.*LoginModule */
+       static final String SHARED_STATE_NAME = "javax.security.auth.login.name";
+       /** From com.sun.security.auth.module.*LoginModule */
+       static final String SHARED_STATE_PWD = "javax.security.auth.login.password";
 
        static void addAuthentication(Subject subject, Authorization authorization) {
                assert subject != null;
+               checkSubjectEmpty(subject);
                assert authorization != null;
 
                // required for display name:
@@ -54,9 +62,8 @@ class CmsAuthUtils {
                                } else {
                                        NodeSecurityUtils.checkImpliedPrincipalName(roleName);
                                        principals.add(new ImpliedByPrincipal(roleName.toString(), userPrincipal));
-                                       // if (roleName.equals(ROLE_ADMIN_NAME))
-                                       // principals.add(new
-                                       // AdminPrincipal(SecurityConstants.ADMIN_ID));
+                                       if (roleName.equals(NodeSecurityUtils.ROLE_ADMIN_NAME))
+                                               principals.add(new DataAdminPrincipal());
                                }
                        }
 
@@ -65,6 +72,17 @@ class CmsAuthUtils {
                }
        }
 
+       private static void checkSubjectEmpty(Subject subject) {
+               if (!subject.getPrincipals(AnonymousPrincipal.class).isEmpty())
+                       throw new IllegalStateException("Already logged in as anonymous: " + subject);
+               if (!subject.getPrincipals(X500Principal.class).isEmpty())
+                       throw new IllegalStateException("Already logged in as user: " + subject);
+               if (!subject.getPrincipals(DataAdminPrincipal.class).isEmpty())
+                       throw new IllegalStateException("Already logged in as data admin: " + subject);
+               if (!subject.getPrincipals(ImpliedByPrincipal.class).isEmpty())
+                       throw new IllegalStateException("Already authorized: " + subject);
+       }
+
        static void cleanUp(Subject subject) {
                // Argeo
                subject.getPrincipals().removeAll(subject.getPrincipals(X500Principal.class));
@@ -74,6 +92,13 @@ class CmsAuthUtils {
                // subject.getPrincipals().removeAll(subject.getPrincipals(AnonymousPrincipal.class));
        }
 
+       // SHARED STATE KEYS
+       // compatible with com.sun.security.auth.module.*LoginModule
+       // public static final String SHARED_STATE_USERNAME =
+       // "javax.security.auth.login.name";
+       // public static final String SHARED_STATE_PASSWORD =
+       // "javax.security.auth.login.password";
+
        private CmsAuthUtils() {
 
        }