From 92044e2022c2e55999617080fc3c69aaeeeeb0f8 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 30 Sep 2022 11:37:36 +0200
Subject: [PATCH] Deal with null context for system roles

---
 org.argeo.cms/src/org/argeo/cms/auth/SystemRole.java | 3 +++
 1 file changed, 3 insertions(+)

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;
-- 
2.30.2