You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/07/12 21:00:08 UTC
[5/9] nifi git commit: NIFI-2095: - Adding a page for managing users
and groups. - Adding a page for managing access policies. - Renaming
accessPolicy in entity to permissions to avoid confusion with the
accessPolicy model. - Adding an Authorizable for a
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java
index c530f41..f9a68ae 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java
@@ -24,6 +24,7 @@ import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO;
import org.apache.nifi.web.api.dto.status.ProcessorStatusDTO;
import org.apache.nifi.web.api.dto.status.RemoteProcessGroupStatusDTO;
import org.apache.nifi.web.api.entity.AccessPolicyEntity;
+import org.apache.nifi.web.api.entity.AccessPolicySummaryEntity;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ControllerConfigurationEntity;
import org.apache.nifi.web.api.entity.ControllerServiceEntity;
@@ -48,37 +49,37 @@ import java.util.List;
public final class EntityFactory {
- public ControllerConfigurationEntity createControllerConfigurationEntity(final ControllerConfigurationDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ public ControllerConfigurationEntity createControllerConfigurationEntity(final ControllerConfigurationDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final ControllerConfigurationEntity entity = new ControllerConfigurationEntity();
entity.setRevision(revision);
entity.setCurrentTime(new Date());
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ entity.setPermissions(permissions);
+ if (permissions != null && permissions.getCanRead()) {
entity.setControllerConfiguration(dto);
}
}
return entity;
}
- public ProcessGroupFlowEntity createProcessGroupFlowEntity(final ProcessGroupFlowDTO dto, final AccessPolicyDTO accessPolicy) {
+ public ProcessGroupFlowEntity createProcessGroupFlowEntity(final ProcessGroupFlowDTO dto, final PermissionsDTO permissions) {
final ProcessGroupFlowEntity entity = new ProcessGroupFlowEntity();
entity.setProcessGroupFlow(dto);
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
return entity;
}
- public ProcessorEntity createProcessorEntity(final ProcessorDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy,
+ public ProcessorEntity createProcessorEntity(final ProcessorDTO dto, final RevisionDTO revision, final PermissionsDTO permissions,
final ProcessorStatusDTO status, final List<BulletinDTO> bulletins) {
final ProcessorEntity entity = new ProcessorEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setStatus(status);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
entity.setBulletins(bulletins);
}
@@ -86,16 +87,16 @@ public final class EntityFactory {
return entity;
}
- public PortEntity createPortEntity(final PortDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy, final PortStatusDTO status, final List<BulletinDTO> bulletins) {
+ public PortEntity createPortEntity(final PortDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final PortStatusDTO status, final List<BulletinDTO> bulletins) {
final PortEntity entity = new PortEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setStatus(status);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
entity.setPortType(dto.getType());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
entity.setBulletins(bulletins);
}
@@ -103,13 +104,13 @@ public final class EntityFactory {
return entity;
}
- public ProcessGroupEntity createProcessGroupEntity(final ProcessGroupDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy,
+ public ProcessGroupEntity createProcessGroupEntity(final ProcessGroupDTO dto, final RevisionDTO revision, final PermissionsDTO permissions,
final ProcessGroupStatusDTO status, final List<BulletinDTO> bulletins) {
final ProcessGroupEntity entity = new ProcessGroupEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setStatus(status);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
@@ -121,7 +122,7 @@ public final class EntityFactory {
entity.setDisabledCount(dto.getDisabledCount());
entity.setActiveRemotePortCount(dto.getActiveRemotePortCount());
entity.setInactiveRemotePortCount(dto.getInactiveRemotePortCount());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
entity.setBulletins(bulletins);
}
@@ -129,11 +130,11 @@ public final class EntityFactory {
return entity;
}
- public LabelEntity createLabelEntity(final LabelDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ public LabelEntity createLabelEntity(final LabelDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final LabelEntity entity = new LabelEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
@@ -142,88 +143,103 @@ public final class EntityFactory {
dimensions.setWidth(dto.getWidth());
entity.setDimensions(dimensions);
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
return entity;
}
- public UserEntity createUserEntity(final UserDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ public UserEntity createUserEntity(final UserDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final UserEntity entity = new UserEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
return entity;
}
- public TenantEntity createTenantEntity(final TenantDTO dto, final RevisionDTO revsion, final AccessPolicyDTO accessPolicy) {
+ public TenantEntity createTenantEntity(final TenantDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final TenantEntity entity = new TenantEntity();
- entity.setRevision(revsion);
+ entity.setRevision(revision);
+ if (dto != null) {
+ entity.setPermissions(permissions);
+ entity.setId(dto.getId());
+
+ if (permissions != null && permissions.getCanRead()) {
+ entity.setComponent(dto);
+ }
+ }
+ return entity;
+ }
+
+ public AccessPolicySummaryEntity createAccessPolicySummaryEntity(final AccessPolicySummaryDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
+ final AccessPolicySummaryEntity entity = new AccessPolicySummaryEntity();
+ entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
return entity;
}
- public UserGroupEntity createUserGroupEntity(final UserGroupDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ public UserGroupEntity createUserGroupEntity(final UserGroupDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final UserGroupEntity entity = new UserGroupEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
return entity;
}
- public AccessPolicyEntity createAccessPolicyEntity(final AccessPolicyDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ public AccessPolicyEntity createAccessPolicyEntity(final AccessPolicyDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final AccessPolicyEntity entity = new AccessPolicyEntity();
entity.setRevision(revision);
+ entity.setGenerated(new Date());
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
return entity;
}
- public FunnelEntity createFunnelEntity(final FunnelDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ public FunnelEntity createFunnelEntity(final FunnelDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final FunnelEntity entity = new FunnelEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
return entity;
}
- public ConnectionEntity createConnectionEntity(final ConnectionDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy, final ConnectionStatusDTO status) {
+ public ConnectionEntity createConnectionEntity(final ConnectionDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final ConnectionStatusDTO status) {
final ConnectionEntity entity = new ConnectionEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setStatus(status);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
@@ -233,26 +249,26 @@ public final class EntityFactory {
entity.setSourceGroupId(dto.getSource().getGroupId());
entity.setDestinationId(dto.getDestination().getId());
entity.setDestinationGroupId(dto.getDestination().getGroupId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
return entity;
}
- public RemoteProcessGroupEntity createRemoteProcessGroupEntity(final RemoteProcessGroupDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy,
+ public RemoteProcessGroupEntity createRemoteProcessGroupEntity(final RemoteProcessGroupDTO dto, final RevisionDTO revision, final PermissionsDTO permissions,
final RemoteProcessGroupStatusDTO status, final List<BulletinDTO> bulletins) {
final RemoteProcessGroupEntity entity = new RemoteProcessGroupEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setStatus(status);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
entity.setInputPortCount(dto.getInputPortCount());
entity.setOutputPortCount(dto.getOutputPortCount());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
entity.setBulletins(bulletins);
}
@@ -260,13 +276,13 @@ public final class EntityFactory {
return entity;
}
- public RemoteProcessGroupPortEntity createRemoteProcessGroupPortEntity(final RemoteProcessGroupPortDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ public RemoteProcessGroupPortEntity createRemoteProcessGroupPortEntity(final RemoteProcessGroupPortDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final RemoteProcessGroupPortEntity entity = new RemoteProcessGroupPortEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setRemoteProcessGroupPort(dto);
}
}
@@ -280,13 +296,13 @@ public final class EntityFactory {
return entity;
}
- public ReportingTaskEntity createReportingTaskEntity(final ReportingTaskDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy, final List<BulletinDTO> bulletins) {
+ public ReportingTaskEntity createReportingTaskEntity(final ReportingTaskDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final List<BulletinDTO> bulletins) {
final ReportingTaskEntity entity = new ReportingTaskEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
entity.setBulletins(bulletins);
}
@@ -295,14 +311,14 @@ public final class EntityFactory {
return entity;
}
- public ControllerServiceEntity createControllerServiceEntity(final ControllerServiceDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy, final List<BulletinDTO> bulletins) {
+ public ControllerServiceEntity createControllerServiceEntity(final ControllerServiceDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final List<BulletinDTO> bulletins) {
final ControllerServiceEntity entity = new ControllerServiceEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
entity.setPosition(dto.getPosition());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
entity.setBulletins(bulletins);
}
@@ -311,14 +327,14 @@ public final class EntityFactory {
}
public ControllerServiceReferencingComponentEntity createControllerServiceReferencingComponentEntity(
- final ControllerServiceReferencingComponentDTO dto, final RevisionDTO revision, final AccessPolicyDTO accessPolicy) {
+ final ControllerServiceReferencingComponentDTO dto, final RevisionDTO revision, final PermissionsDTO permissions) {
final ControllerServiceReferencingComponentEntity entity = new ControllerServiceReferencingComponentEntity();
entity.setRevision(revision);
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setComponent(dto);
}
}
@@ -326,12 +342,12 @@ public final class EntityFactory {
return entity;
}
- public FlowBreadcrumbEntity createFlowBreadcrumbEntity(final FlowBreadcrumbDTO dto, final AccessPolicyDTO accessPolicy) {
+ public FlowBreadcrumbEntity createFlowBreadcrumbEntity(final FlowBreadcrumbDTO dto, final PermissionsDTO permissions) {
final FlowBreadcrumbEntity entity = new FlowBreadcrumbEntity();
if (dto != null) {
- entity.setAccessPolicy(accessPolicy);
+ entity.setPermissions(permissions);
entity.setId(dto.getId());
- if (accessPolicy != null && accessPolicy.getCanRead()) {
+ if (permissions != null && permissions.getCanRead()) {
entity.setBreadcrumb(dto);
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index b7472fc..a414bc2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@ -1329,6 +1329,16 @@ public class ControllerFacade implements Authorizable {
}
/**
+ * Gets an authorizable for proveance events for a given component id.
+ *
+ * @param componentId component id
+ * @return authorizable
+ */
+ public Authorizable getProvenanceEventAuthorizable(final String componentId) {
+ return flowController.createProvenanceAuthorizable(componentId);
+ }
+
+ /**
* Creates a ProvenanceEventDTO for the specified ProvenanceEventRecord.
*
* @param event event
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/AccessPolicyDAO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/AccessPolicyDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/AccessPolicyDAO.java
index 2c0dc80..d3f8965 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/AccessPolicyDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/AccessPolicyDAO.java
@@ -17,6 +17,8 @@
package org.apache.nifi.web.dao;
import org.apache.nifi.authorization.AccessPolicy;
+import org.apache.nifi.authorization.RequestAction;
+import org.apache.nifi.authorization.resource.Authorizable;
import org.apache.nifi.web.api.dto.AccessPolicyDTO;
public interface AccessPolicyDAO {
@@ -36,7 +38,7 @@ public interface AccessPolicyDAO {
AccessPolicy createAccessPolicy(AccessPolicyDTO accessPolicyDTO);
/**
- * Gets the acess policy with the specified ID.
+ * Gets the access policy with the specified ID.
*
* @param accessPolicyId The access policy ID
* @return The access policy transfer object
@@ -44,6 +46,15 @@ public interface AccessPolicyDAO {
AccessPolicy getAccessPolicy(String accessPolicyId);
/**
+ * Gets the access policy according to the action and authorizable.
+ *
+ * @param requestAction action
+ * @param authorizable authorizable
+ * @return access policy
+ */
+ AccessPolicy getAccessPolicy(RequestAction requestAction, Authorizable authorizable);
+
+ /**
* Updates the specified access policy.
*
* @param accessPolicyDTO The access policy DTO
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/UserGroupDAO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/UserGroupDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/UserGroupDAO.java
index b6c299d..1dc9a6d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/UserGroupDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/UserGroupDAO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.dao;
+import org.apache.nifi.authorization.AccessPolicy;
import org.apache.nifi.authorization.Group;
import org.apache.nifi.web.api.dto.UserGroupDTO;
@@ -54,6 +55,14 @@ public interface UserGroupDAO {
Set<Group> getUserGroupsForUser(String userId);
/**
+ * Gets the access policies for the user with the specified ID.
+ *
+ * @param userId The user ID
+ * @return The set of access policies
+ */
+ Set<AccessPolicy> getAccessPoliciesForUser(String userId);
+
+ /**
* Gets all user groups.
*
* @return The user group transfer objects
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAO.java
index 3f12f73..7488fe1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAO.java
@@ -28,6 +28,7 @@ import org.apache.nifi.authorization.UsersAndAccessPolicies;
import org.apache.nifi.authorization.exception.AuthorizationAccessException;
import org.apache.nifi.authorization.exception.AuthorizerCreationException;
import org.apache.nifi.authorization.exception.AuthorizerDestructionException;
+import org.apache.nifi.authorization.resource.Authorizable;
import org.apache.nifi.web.ResourceNotFoundException;
import org.apache.nifi.web.api.dto.AccessPolicyDTO;
import org.apache.nifi.web.api.dto.UserDTO;
@@ -151,6 +152,13 @@ public class StandardPolicyBasedAuthorizerDAO implements AccessPolicyDAO, UserGr
}
}
+ private AccessPolicy findAccessPolicy(final RequestAction requestAction, final String resource) {
+ return authorizer.getAccessPolicies().stream()
+ .filter(policy -> policy.getAction().equals(requestAction) && policy.getResource().equals(resource))
+ .findFirst()
+ .orElse(null);
+ }
+
@Override
public boolean hasAccessPolicy(final String accessPolicyId) {
return authorizer.getAccessPolicy(accessPolicyId) != null;
@@ -158,7 +166,8 @@ public class StandardPolicyBasedAuthorizerDAO implements AccessPolicyDAO, UserGr
@Override
public AccessPolicy createAccessPolicy(final AccessPolicyDTO accessPolicyDTO) {
- return authorizer.addAccessPolicy(buildAccessPolicy(accessPolicyDTO.getId(), accessPolicyDTO));
+ return authorizer.addAccessPolicy(buildAccessPolicy(accessPolicyDTO.getId(),
+ accessPolicyDTO.getResource(), RequestAction.valueOfValue(accessPolicyDTO.getAction()), accessPolicyDTO));
}
@Override
@@ -171,8 +180,27 @@ public class StandardPolicyBasedAuthorizerDAO implements AccessPolicyDAO, UserGr
}
@Override
+ public AccessPolicy getAccessPolicy(final RequestAction requestAction, final Authorizable authorizable) {
+ final String resource = authorizable.getResource().getIdentifier();
+
+ final AccessPolicy accessPolicy = findAccessPolicy(requestAction, authorizable.getResource().getIdentifier());
+ if (accessPolicy == null) {
+ final Authorizable parentAuthorizable = authorizable.getParentAuthorizable();
+ if (parentAuthorizable == null) {
+ throw new ResourceNotFoundException(String.format("Unable to find access policy for %s on %s", requestAction.toString(), resource));
+ } else {
+ return getAccessPolicy(requestAction, parentAuthorizable);
+ }
+ }
+
+ return accessPolicy;
+ }
+
+ @Override
public AccessPolicy updateAccessPolicy(final AccessPolicyDTO accessPolicyDTO) {
- return authorizer.updateAccessPolicy(buildAccessPolicy(getAccessPolicy(accessPolicyDTO.getId()).getIdentifier(), accessPolicyDTO));
+ final AccessPolicy currentAccessPolicy = getAccessPolicy(accessPolicyDTO.getId());
+ return authorizer.updateAccessPolicy(buildAccessPolicy(currentAccessPolicy.getIdentifier(),
+ currentAccessPolicy.getResource(), currentAccessPolicy.getAction(), accessPolicyDTO));
}
@Override
@@ -180,23 +208,19 @@ public class StandardPolicyBasedAuthorizerDAO implements AccessPolicyDAO, UserGr
return authorizer.deleteAccessPolicy(getAccessPolicy(accessPolicyId));
}
- private AccessPolicy buildAccessPolicy(final String identifier, final AccessPolicyDTO accessPolicyDTO) {
+ private AccessPolicy buildAccessPolicy(final String identifier, final String resource, final RequestAction action, final AccessPolicyDTO accessPolicyDTO) {
final Set<TenantEntity> userGroups = accessPolicyDTO.getUserGroups();
final Set<TenantEntity> users = accessPolicyDTO.getUsers();
final AccessPolicy.Builder builder = new AccessPolicy.Builder()
.identifier(identifier)
- .resource(accessPolicyDTO.getResource());
+ .resource(resource);
if (userGroups != null) {
builder.addGroups(userGroups.stream().map(ComponentEntity::getId).collect(Collectors.toSet()));
}
if (users != null) {
builder.addUsers(users.stream().map(ComponentEntity::getId).collect(Collectors.toSet()));
}
- if (Boolean.TRUE == accessPolicyDTO.getCanWrite()) {
- builder.action(RequestAction.WRITE);
- } else {
- builder.action(RequestAction.READ);
- }
+ builder.action(action);
return builder.build();
}
@@ -227,6 +251,21 @@ public class StandardPolicyBasedAuthorizerDAO implements AccessPolicyDAO, UserGr
}
@Override
+ public Set<AccessPolicy> getAccessPoliciesForUser(String userId) {
+ return authorizer.getAccessPolicies().stream()
+ .filter(p -> {
+ // policy contains the user
+ if (p.getUsers().contains(userId)) {
+ return true;
+ }
+
+ // policy contains a group with the user
+ return !p.getGroups().stream().filter(g -> authorizer.getGroup(g).getUsers().contains(userId)).collect(Collectors.toSet()).isEmpty();
+ })
+ .collect(Collectors.toSet());
+ }
+
+ @Override
public Set<Group> getUserGroups() {
return authorizer.getGroups();
}
@@ -281,12 +320,12 @@ public class StandardPolicyBasedAuthorizerDAO implements AccessPolicyDAO, UserGr
@Override
public User deleteUser(final String userId) {
- return authorizer.deleteUser(getUser(userId));
+ final User user = getUser(userId);
+ return authorizer.deleteUser(user);
}
private User buildUser(final String identifier, final UserDTO userDTO) {
final User.Builder builder = new User.Builder().identifier(identifier).identity(userDTO.getIdentity());
return builder.build();
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
index 2e42efb..85983ca 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
@@ -219,6 +219,12 @@
<property name="requestReplicator" ref="requestReplicator" />
<property name="authorizer" ref="authorizer"/>
</bean>
+ <bean id="dataTransferResource" class="org.apache.nifi.web.api.DataTransferResource" scope="singleton">
+ <property name="properties" ref="nifiProperties"/>
+ <property name="clusterCoordinator" ref="clusterCoordinator"/>
+ <property name="requestReplicator" ref="requestReplicator" />
+ <property name="authorizer" ref="authorizer"/>
+ </bean>
<bean id="snippetResource" class="org.apache.nifi.web.api.SnippetResource" scope="singleton">
<property name="serviceFacade" ref="serviceFacade"/>
<property name="properties" ref="nifiProperties"/>
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/StandardNiFiServiceFacadeSpec.groovy
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/StandardNiFiServiceFacadeSpec.groovy b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/StandardNiFiServiceFacadeSpec.groovy
index 87dbf86..677b25d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/StandardNiFiServiceFacadeSpec.groovy
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/StandardNiFiServiceFacadeSpec.groovy
@@ -74,8 +74,8 @@ class StandardNiFiServiceFacadeSpec extends Specification {
if (isAuthorized) {
assert userEntity?.component?.id == userDto.id
assert userEntity?.component?.identity?.equals(userDto.identity)
- assert userEntity?.accessPolicy?.canRead
- assert userEntity?.accessPolicy?.canWrite
+ assert userEntity?.permissions?.canRead
+ assert userEntity?.permissions?.canWrite
} else {
assert userEntity.component == null
}
@@ -174,8 +174,8 @@ class StandardNiFiServiceFacadeSpec extends Specification {
def userEntity = userEntityUpdateResult?.result
if (isAuthorized) {
assert userEntity?.component?.id?.equals(userDto.id)
- assert userEntity?.accessPolicy?.canRead
- assert userEntity?.accessPolicy?.canWrite
+ assert userEntity?.getPermissions?.canRead
+ assert userEntity?.getPermissions?.canWrite
} else {
assert userEntity.component == null
}
@@ -294,8 +294,8 @@ class StandardNiFiServiceFacadeSpec extends Specification {
if (isAuthorized) {
assert userGroupEntity?.component?.id == userGroupDto.id
assert userGroupEntity?.component?.users?.equals(userGroupDto.users)
- assert userGroupEntity?.accessPolicy?.canRead
- assert userGroupEntity?.accessPolicy?.canWrite
+ assert userGroupEntity?.permissions?.canRead
+ assert userGroupEntity?.permissions?.canWrite
} else {
assert userGroupEntity?.component == null
}
@@ -425,8 +425,8 @@ class StandardNiFiServiceFacadeSpec extends Specification {
assert userGroupEntity != null
if (isAuthorized) {
assert userGroupEntity?.component?.id?.equals(userGroupDto.id)
- assert userGroupEntity?.accessPolicy?.canRead
- assert userGroupEntity?.accessPolicy?.canWrite
+ assert userGroupEntity?.getPermissions?.canRead
+ assert userGroupEntity?.getPermissions?.canWrite
} else {
assert userGroupEntity.component == null
}
@@ -577,8 +577,8 @@ class StandardNiFiServiceFacadeSpec extends Specification {
assert accessPolicyEntity != null
if (isAuthorized) {
assert accessPolicyEntity?.component?.id?.equals(accessPolicyDto.id)
- assert accessPolicyEntity?.accessPolicy?.canRead
- assert accessPolicyEntity?.accessPolicy?.canWrite
+ assert accessPolicyEntity?.permissions?.canRead
+ assert accessPolicyEntity?.permissions?.canWrite
} else {
assert accessPolicyEntity.component == null
}
@@ -722,8 +722,8 @@ class StandardNiFiServiceFacadeSpec extends Specification {
assert accessPolicyEntity != null
if (isAuthorized) {
assert accessPolicyEntity?.component?.id?.equals(accessPolicyDto.id)
- assert accessPolicyEntity?.accessPolicy?.canRead
- assert accessPolicyEntity?.accessPolicy?.canWrite
+ assert accessPolicyEntity?.getPermissions?.canRead
+ assert accessPolicyEntity?.getPermissions?.canWrite
} else {
assert accessPolicyEntity.component == null
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAOSpec.groovy
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAOSpec.groovy b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAOSpec.groovy
index a63036f..3a98c70 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAOSpec.groovy
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/groovy/org/apache/nifi/web/dao/impl/StandardPolicyBasedAuthorizerDAOSpec.groovy
@@ -38,7 +38,7 @@ class StandardPolicyBasedAuthorizerDAOSpec extends Specification {
where:
method | daoMethod
- 'createAccessPolicy' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).createAccessPolicy(new AccessPolicyDTO(id: '1', resource: '/1', canRead: true)) }
+ 'createAccessPolicy' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).createAccessPolicy(new AccessPolicyDTO(id: '1', resource: '/1', action: "read")) }
'createUser' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).createUser(new UserDTO(id: '1', identity: 'a')) }
'createUserGroup' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).createUserGroup(new UserGroupDTO(id: '1', identity: 'a')) }
'deleteAccessPolicy' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).deleteAccessPolicy('1') }
@@ -50,7 +50,7 @@ class StandardPolicyBasedAuthorizerDAOSpec extends Specification {
'hasAccessPolicy' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).hasAccessPolicy('1') }
'hasUser' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).hasUser('1') }
'hasUserGroup' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).hasUserGroup('1') }
- 'updateAccessPolicy' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).updateAccessPolicy(new AccessPolicyDTO(id: '1', resource: '/1', canRead: true)) }
+ 'updateAccessPolicy' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).updateAccessPolicy(new AccessPolicyDTO(id: '1', resource: '/1', action: "read")) }
'updateUser' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).updateUser(new UserDTO(id: '1', identity: 'a')) }
'updateUserGroup' | { new StandardPolicyBasedAuthorizerDAO(Mock(Authorizer)).updateUserGroup(new UserGroupDTO(id: '1', identity: 'a')) }
}
@@ -81,8 +81,7 @@ class StandardPolicyBasedAuthorizerDAOSpec extends Specification {
given:
def authorizer = Mock AbstractPolicyBasedAuthorizer
def dao = new StandardPolicyBasedAuthorizerDAO(authorizer)
- def requestDTO = new AccessPolicyDTO(id: 'policy-id-1', resource: '/fake/resource', canRead: true,
- canWrite: true,
+ def requestDTO = new AccessPolicyDTO(id: 'policy-id-1', resource: '/fake/resource', action: "read",
users: [new TenantEntity(id: 'user-id-1')] as Set,
userGroups: [new TenantEntity(id: 'user-group-id-1')] as Set)
@@ -144,8 +143,7 @@ class StandardPolicyBasedAuthorizerDAOSpec extends Specification {
given:
def authorizer = Mock AbstractPolicyBasedAuthorizer
def dao = new StandardPolicyBasedAuthorizerDAO(authorizer)
- def requestDTO = new AccessPolicyDTO(id: 'policy-id-1', resource: '/fake/resource', canRead: true,
- canWrite: true,
+ def requestDTO = new AccessPolicyDTO(id: 'policy-id-1', resource: '/fake/resource', action: "read",
users: [new TenantEntity(id: 'user-id-1')] as Set,
userGroups: [new TenantEntity(id: 'user-group-id-1')] as Set)
@@ -169,8 +167,7 @@ class StandardPolicyBasedAuthorizerDAOSpec extends Specification {
given:
def authorizer = Mock AbstractPolicyBasedAuthorizer
def dao = new StandardPolicyBasedAuthorizerDAO(authorizer)
- def requestDTO = new AccessPolicyDTO(id: 'policy-id-1', resource: '/fake/resource', canRead: true,
- canWrite: true,
+ def requestDTO = new AccessPolicyDTO(id: 'policy-id-1', resource: '/fake/resource', action: "read",
users: [new TenantEntity(id: 'user-id-1')] as Set,
userGroups: [new TenantEntity(id: 'user-group-id-1')] as Set)
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITConnectionAccessControl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITConnectionAccessControl.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITConnectionAccessControl.java
index 1d8e597..0f5fe92 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITConnectionAccessControl.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITConnectionAccessControl.java
@@ -69,8 +69,8 @@ public class ITConnectionAccessControl {
@Test
public void testReadUserGetConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -82,8 +82,8 @@ public class ITConnectionAccessControl {
@Test
public void testReadWriteUserGetConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -95,8 +95,8 @@ public class ITConnectionAccessControl {
@Test
public void testWriteUserGetConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -108,8 +108,8 @@ public class ITConnectionAccessControl {
@Test
public void testNoneUserGetConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -121,8 +121,8 @@ public class ITConnectionAccessControl {
@Test
public void testReadUserPutConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
// attempt update the name
@@ -144,8 +144,8 @@ public class ITConnectionAccessControl {
@Test
public void testReadWriteUserPutConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String updatedName = "Updated Name";
@@ -209,8 +209,8 @@ public class ITConnectionAccessControl {
@Test
public void testWriteUserPutConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name";
@@ -252,8 +252,8 @@ public class ITConnectionAccessControl {
@Test
public void testNoneUserPutConnection() throws Exception {
final ConnectionEntity entity = getRandomConnection(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name";
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITFunnelAccessControl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITFunnelAccessControl.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITFunnelAccessControl.java
index 5d835fc..b66a667 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITFunnelAccessControl.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITFunnelAccessControl.java
@@ -65,8 +65,8 @@ public class ITFunnelAccessControl {
@Test
public void testReadUserGetFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -78,8 +78,8 @@ public class ITFunnelAccessControl {
@Test
public void testReadWriteUserGetFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -91,8 +91,8 @@ public class ITFunnelAccessControl {
@Test
public void testWriteUserGetFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -104,8 +104,8 @@ public class ITFunnelAccessControl {
@Test
public void testNoneUserGetFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -117,8 +117,8 @@ public class ITFunnelAccessControl {
@Test
public void testReadUserPutFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
// attempt update the position
@@ -140,8 +140,8 @@ public class ITFunnelAccessControl {
@Test
public void testReadWriteUserPutFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final double y = 15.0;
@@ -174,8 +174,8 @@ public class ITFunnelAccessControl {
@Test
public void testWriteUserPutFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final double y = 15.0;
@@ -217,8 +217,8 @@ public class ITFunnelAccessControl {
@Test
public void testNoneUserPutFunnel() throws Exception {
final FunnelEntity entity = getRandomFunnel(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
// attempt to update the position
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITInputPortAccessControl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITInputPortAccessControl.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITInputPortAccessControl.java
index 3dc8f19..1e67333 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITInputPortAccessControl.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITInputPortAccessControl.java
@@ -66,8 +66,8 @@ public class ITInputPortAccessControl {
@Test
public void testReadUserGetInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -79,8 +79,8 @@ public class ITInputPortAccessControl {
@Test
public void testReadWriteUserGetInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -92,8 +92,8 @@ public class ITInputPortAccessControl {
@Test
public void testWriteUserGetInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -105,8 +105,8 @@ public class ITInputPortAccessControl {
@Test
public void testNoneUserGetInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -118,8 +118,8 @@ public class ITInputPortAccessControl {
@Test
public void testReadUserPutInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
// attempt update the name
@@ -141,8 +141,8 @@ public class ITInputPortAccessControl {
@Test
public void testReadWriteUserPutInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
@@ -206,8 +206,8 @@ public class ITInputPortAccessControl {
@Test
public void testWriteUserPutInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
@@ -249,8 +249,8 @@ public class ITInputPortAccessControl {
@Test
public void testNoneUserPutInputPort() throws Exception {
final PortEntity entity = getRandomInputPort(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITLabelAccessControl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITLabelAccessControl.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITLabelAccessControl.java
index 3a44d53..d581946 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITLabelAccessControl.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITLabelAccessControl.java
@@ -65,8 +65,8 @@ public class ITLabelAccessControl {
@Test
public void testReadUserGetLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -78,8 +78,8 @@ public class ITLabelAccessControl {
@Test
public void testReadWriteUserGetLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -91,8 +91,8 @@ public class ITLabelAccessControl {
@Test
public void testWriteUserGetLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -104,8 +104,8 @@ public class ITLabelAccessControl {
@Test
public void testNoneUserGetLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -117,8 +117,8 @@ public class ITLabelAccessControl {
@Test
public void testReadUserPutLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
// attempt update the name
@@ -140,8 +140,8 @@ public class ITLabelAccessControl {
@Test
public void testReadWriteUserPutLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String updatedLabel = "Updated Name";
@@ -205,8 +205,8 @@ public class ITLabelAccessControl {
@Test
public void testWriteUserPutLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedLabel = "Updated Name";
@@ -248,8 +248,8 @@ public class ITLabelAccessControl {
@Test
public void testNoneUserPutLabel() throws Exception {
final LabelEntity entity = getRandomLabel(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name";
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITOutputPortAccessControl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITOutputPortAccessControl.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITOutputPortAccessControl.java
index 5de49df..58bc3df 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITOutputPortAccessControl.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITOutputPortAccessControl.java
@@ -66,8 +66,8 @@ public class ITOutputPortAccessControl {
@Test
public void testReadUserGetOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -79,8 +79,8 @@ public class ITOutputPortAccessControl {
@Test
public void testReadWriteUserGetOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -92,8 +92,8 @@ public class ITOutputPortAccessControl {
@Test
public void testWriteUserGetOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -105,8 +105,8 @@ public class ITOutputPortAccessControl {
@Test
public void testNoneUserGetOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -118,8 +118,8 @@ public class ITOutputPortAccessControl {
@Test
public void testReadUserPutOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
// attempt update the name
@@ -141,8 +141,8 @@ public class ITOutputPortAccessControl {
@Test
public void testReadWriteUserPutOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
@@ -206,8 +206,8 @@ public class ITOutputPortAccessControl {
@Test
public void testWriteUserPutOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
@@ -249,8 +249,8 @@ public class ITOutputPortAccessControl {
@Test
public void testNoneUserPutOutputPort() throws Exception {
final PortEntity entity = getRandomOutputPort(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
index 59af063..326a120 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessGroupAccessControl.java
@@ -66,8 +66,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testReadUserGetProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -79,8 +79,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testReadWriteUserGetProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -92,8 +92,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testWriteUserGetProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -105,8 +105,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testNoneUserGetProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -118,8 +118,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testReadUserPutProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
// attempt update the name
@@ -141,8 +141,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testReadWriteUserPutProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
@@ -206,8 +206,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testWriteUserPutProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
@@ -249,8 +249,8 @@ public class ITProcessGroupAccessControl {
@Test
public void testNoneUserPutProcessGroup() throws Exception {
final ProcessGroupEntity entity = getRandomProcessGroup(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name" + count++;
http://git-wip-us.apache.org/repos/asf/nifi/blob/e0c96794/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessorAccessControl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessorAccessControl.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessorAccessControl.java
index 143d60e..7c59083 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessorAccessControl.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITProcessorAccessControl.java
@@ -66,8 +66,8 @@ public class ITProcessorAccessControl {
@Test
public void testReadUserGetProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -79,8 +79,8 @@ public class ITProcessorAccessControl {
@Test
public void testReadWriteUserGetProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
}
@@ -92,8 +92,8 @@ public class ITProcessorAccessControl {
@Test
public void testWriteUserGetProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -105,8 +105,8 @@ public class ITProcessorAccessControl {
@Test
public void testNoneUserGetProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
}
@@ -118,8 +118,8 @@ public class ITProcessorAccessControl {
@Test
public void testReadUserPutProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
// attempt update the name
@@ -141,8 +141,8 @@ public class ITProcessorAccessControl {
@Test
public void testReadWriteUserPutProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadWriteUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String updatedName = "Updated Name";
@@ -206,8 +206,8 @@ public class ITProcessorAccessControl {
@Test
public void testWriteUserPutProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getWriteUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertTrue(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertTrue(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name";
@@ -249,8 +249,8 @@ public class ITProcessorAccessControl {
@Test
public void testNoneUserPutProcessor() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getNoneUser());
- assertFalse(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertFalse(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNull(entity.getComponent());
final String updatedName = "Updated Name";
@@ -285,8 +285,8 @@ public class ITProcessorAccessControl {
@Test
public void testReadUserClearState() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String url = helper.getBaseUrl() + "/processors/" + entity.getId() + "/state/clear-requests";
@@ -306,8 +306,8 @@ public class ITProcessorAccessControl {
@Test
public void testNoneUserClearState() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String url = helper.getBaseUrl() + "/processors/" + entity.getId() + "/state/clear-requests";
@@ -327,8 +327,8 @@ public class ITProcessorAccessControl {
@Test
public void testReadWriteUserClearState() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String url = helper.getBaseUrl() + "/processors/" + entity.getId() + "/state/clear-requests";
@@ -348,8 +348,8 @@ public class ITProcessorAccessControl {
@Test
public void testWriteUserClearState() throws Exception {
final ProcessorEntity entity = getRandomProcessor(helper.getReadUser());
- assertTrue(entity.getAccessPolicy().getCanRead());
- assertFalse(entity.getAccessPolicy().getCanWrite());
+ assertTrue(entity.getPermissions().getCanRead());
+ assertFalse(entity.getPermissions().getCanWrite());
assertNotNull(entity.getComponent());
final String url = helper.getBaseUrl() + "/processors/" + entity.getId() + "/state/clear-requests";