X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=5e59187e0dad574a1283970aca39d851cf618342;hb=8633b7d69ebb6e1c5af0b1e170d7b4f2af3567d3;hp=ab40e720c2eaf58b2b3d1a9457ee86c8dedbb47a;hpb=c1d7a7fa363100689019e733314723196280175b;p=lgpl%2Fargeo-commons.git 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 ab40e720c..5e59187e0 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -13,6 +13,10 @@ import javax.security.auth.x500.X500Principal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.argeo.api.NodeConstants; +import org.argeo.api.security.AnonymousPrincipal; +import org.argeo.api.security.DataAdminPrincipal; +import org.argeo.api.security.NodeSecurityUtils; //import org.apache.jackrabbit.core.security.AnonymousPrincipal; //import org.apache.jackrabbit.core.security.SecurityConstants; //import org.apache.jackrabbit.core.security.principal.AdminPrincipal; @@ -21,10 +25,6 @@ import org.argeo.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.auth.ImpliedByPrincipal; import org.argeo.cms.internal.http.WebCmsSessionImpl; import org.argeo.cms.internal.kernel.Activator; -import org.argeo.node.NodeConstants; -import org.argeo.node.security.AnonymousPrincipal; -import org.argeo.node.security.DataAdminPrincipal; -import org.argeo.node.security.NodeSecurityUtils; import org.argeo.osgi.useradmin.AuthenticatingUser; import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; @@ -77,6 +77,10 @@ class CmsAuthUtils { principals.add(userPrincipal); // principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_USER_NAME, // userPrincipal)); + + if (Activator.isSingleUser()) { + principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_ADMIN_NAME, userPrincipal)); + } } // Add roles provided by authorization