DPNG-15268-tap_user_permission_propagation: (#17)

* fix for tap user permissions not propagation when creating hdfs instance
trustedanalytics-ng · Feb 20, 2017 · 88a31e6 · 88a31e6
1 parent 1e20979
commit 88a31e6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hdfs-broker</artifactId>
-    <version>0.12.7</version>
+    <version>0.12.8</version>
 
     <parent>
         <groupId>org.trustedanalytics</groupId>

diff --git a/...danalytics/servicebroker/hdfs/plans/provisioning/HdfsDirectoryProvisioningOperations.java b/...danalytics/servicebroker/hdfs/plans/provisioning/HdfsDirectoryProvisioningOperations.java
@@ -20,4 +20,5 @@
 public interface HdfsDirectoryProvisioningOperations {
   String provisionDirectory(String instanceId, String orgId) throws ServiceBrokerException;
   void addHiveUserGroupAcl(String path, String orgId) throws ServiceBrokerException;
+  void addTapUserAcl(String path, String orgId) throws ServiceBrokerException;
 }
diff --git a/...va/org/trustedanalytics/servicebroker/hdfs/plans/provisioning/HdfsProvisioningClient.java b/...va/org/trustedanalytics/servicebroker/hdfs/plans/provisioning/HdfsProvisioningClient.java
@@ -51,12 +51,31 @@ public String provisionDirectory(String instanceId, String orgId) throws Service
       hdfsClient.createDir(path);
       hdfsClient.setPermission(path, FS_PERMISSION);
       addHiveUserGroupAcl(path, orgId);
+      addTapUserAcl(path, orgId);
       return path;
     } catch (IOException e) {
       throw new ServiceBrokerException("Unable to provision directory for: " + instanceId, e);
     }
   }
 
+  @Override
+  public void addTapUserAcl(String path, String orgId) throws ServiceBrokerException {
+    try {
+      AclEntry.Builder builder = new AclEntry.Builder()
+              .setType(AclEntryType.USER)
+              .setPermission(FsAction.ALL)
+              .setName("tap");
+
+      AclEntry tapDefaultUserAcl = builder.setScope(AclEntryScope.DEFAULT).build();
+      AclEntry tapUserAcl = builder.setScope(AclEntryScope.ACCESS).build();
+
+      setAclRecursively(path, tapUserAcl);
+      setAclRecursively(path, tapDefaultUserAcl);
+    } catch (IOException e) {
+      throw new ServiceBrokerException("Unable to add system users groups ACL for path: " + path, e);
+    }
+  }
+
   @Override
   public void addHiveUserGroupAcl(String path, String orgId) throws ServiceBrokerException {
     try {

diff --git a/src/test/java/org/trustedanalytics/servicebroker/hdfs/plans/HdfsPlanEncryptedDirTest.java b/src/test/java/org/trustedanalytics/servicebroker/hdfs/plans/HdfsPlanEncryptedDirTest.java
@@ -83,7 +83,7 @@ public void provision_templateWithOrgAndInstanceVariables_replaceVariablesWithVa
         new Path(getDirectoryPathToProvision(serviceInstance)));
     verify(hdfsClient).setPermission(getDirectoryPathToProvision(serviceInstance), FS_PERMISSION);
 
-    verify(encryptedHdfsClient, times(2)).listFiles("/org/"+ serviceInstance.getOrganizationGuid()+"/brokers/userspace/"+serviceInstance.getServiceInstanceId(), true);
+    verify(encryptedHdfsClient, times(4)).listFiles("/org/"+ serviceInstance.getOrganizationGuid()+"/brokers/userspace/"+serviceInstance.getServiceInstanceId(), true);
 
     verifyNoMoreInteractions(hdfsClient, encryptedHdfsClient);
   }

diff --git a/src/test/java/org/trustedanalytics/servicebroker/hdfs/plans/HdfsPlanPlainDirTest.java b/src/test/java/org/trustedanalytics/servicebroker/hdfs/plans/HdfsPlanPlainDirTest.java
@@ -75,7 +75,7 @@ public void provision_templateWithOrgAndInstanceVariables_replaceVariablesWithVa
     verify(encryptedHdfsClient).addAclEntry("/org/"+ serviceInstance.getOrganizationGuid()+"/brokers/userspace/"+serviceInstance.getServiceInstanceId(), TestUtil.hiveUserAcl());
     verify(encryptedHdfsClient).addAclEntry("/org/"+ serviceInstance.getOrganizationGuid()+"/brokers/userspace/"+serviceInstance.getServiceInstanceId(), TestUtil.hiveDefaultUserAcl());
 
-    verify(encryptedHdfsClient, times(2)).listFiles("/org/"+ serviceInstance.getOrganizationGuid()+"/brokers/userspace/"+serviceInstance.getServiceInstanceId(), true);
+    verify(encryptedHdfsClient, times(4)).listFiles("/org/"+ serviceInstance.getOrganizationGuid()+"/brokers/userspace/"+serviceInstance.getServiceInstanceId(), true);
 
     verifyNoMoreInteractions(hdfsClient, encryptedHdfsClient);
   }