Repository: nifi Updated Branches: refs/heads/master e2b8be53c -> 3de0b8edf
NIFI-4224: - Ensuring the parent permissions are used when building the variable registry for a process group ancestry. This closes #2116. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3de0b8ed Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3de0b8ed Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3de0b8ed Branch: refs/heads/master Commit: 3de0b8edff22616165f6fb0c5beebe31ac27ad17 Parents: e2b8be5 Author: Matt Gilman <[email protected]> Authored: Wed Aug 30 11:02:48 2017 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Aug 30 11:54:31 2017 -0400 ---------------------------------------------------------------------- .../nifi/web/StandardNiFiServiceFacade.java | 52 ++++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3de0b8ed/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java index 35686a5..7cd5732 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java @@ -16,31 +16,7 @@ */ package org.apache.nifi.web; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; - +import com.google.common.collect.Sets; import org.apache.nifi.action.Action; import org.apache.nifi.action.Component; import org.apache.nifi.action.FlowChangeAction; @@ -247,7 +223,29 @@ import org.apache.nifi.web.util.SnippetUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Sets; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; /** * Implementation of NiFiServiceFacade that performs revision checking. @@ -3240,7 +3238,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { if (includeAncestorGroups) { ProcessGroup parent = processGroup.getParent(); while (parent != null) { - final PermissionsDTO parentPerms = dtoFactory.createPermissionsDto(processGroup); + final PermissionsDTO parentPerms = dtoFactory.createPermissionsDto(parent); if (Boolean.TRUE.equals(parentPerms.getCanRead())) { final VariableRegistryDTO parentRegistryDto = dtoFactory.createVariableRegistryDto(parent); final Set<VariableEntity> parentVariables = parentRegistryDto.getVariables();
