added tests for ACL handling, merging and dropping

2026-09-22 21:55:39 +00:00 · 2020-01-29 12:28:48 +01:00
parent 4cbf92e796
commit 92e3b05d78
3 changed files with 21 additions and 1 deletions
@@ -299,7 +299,7 @@ public class SecurityStoreMerger {
            for (final UserGroup sourceGroup : groupsInAcl) {
                final Set<String> actionsForGroup = new HashSet<>(actionsByUserGroup.get(sourceGroup));
                final UserGroup targetGroup = userGroupMap.get(sourceGroup);
-                if (targetGroup == null) {
+                if (sourceGroup != null && targetGroup == null) {
                    // drop; check that we don't grow permissions:
                    for (final String action : actionsForGroup) {
                        if (action.startsWith("!")) {