From: Mathieu Baudier Date: Fri, 30 Sep 2022 09:37:36 +0000 (+0200) Subject: Deal with null context for system roles X-Git-Tag: v2.3.10~22 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=92044e2022c2e55999617080fc3c69aaeeeeb0f8 Deal with null context for system roles --- diff --git a/org.argeo.cms/src/org/argeo/cms/auth/SystemRole.java b/org.argeo.cms/src/org/argeo/cms/auth/SystemRole.java index 933f80a95..3a28b7c88 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/SystemRole.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/SystemRole.java @@ -16,6 +16,9 @@ public interface SystemRole { for (ImpliedByPrincipal role : roles) { if (role.isSystemRole()) { if (role.getRoleName().equals(getName())) { + // !! if context is not specified, it is considered irrelevant + if (context == null) + return true; if (role.getContext().equalsIgnoreCase(context) || role.getContext().equals(CmsConstants.NODE_BASEDN)) return true;