ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbhowm...@apache.org
Subject ambari git commit: AMBARI-19631. Hive View 2.0: Show the table accesses in the authorization sceen. (dipayanb)
Date Fri, 27 Jan 2017 06:26:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4313fec21 -> 635191c8a


AMBARI-19631. Hive View 2.0: Show the table accesses in the authorization sceen. (dipayanb)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/635191c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/635191c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/635191c8

Branch: refs/heads/branch-2.5
Commit: 635191c8ae2aedd1ac1912e142f1b7afdcafe461
Parents: 4313fec
Author: Dipayan Bhowmick <dipayan.bhowmick@gmail.com>
Authored: Fri Jan 27 11:56:15 2017 +0530
Committer: Dipayan Bhowmick <dipayan.bhowmick@gmail.com>
Committed: Fri Jan 27 11:56:15 2017 +0530

----------------------------------------------------------------------
 .../resources/system/ranger/RangerService.java  | 41 +++++++++++++++-----
 .../databases/database/tables/table/auth.hbs    | 10 ++++-
 2 files changed, 39 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/635191c8/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
index 95ab27c..9debe42 100644
--- a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
+++ b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/system/ranger/RangerService.java
@@ -25,7 +25,7 @@ import org.apache.ambari.view.hive20.utils.AuthorizationChecker;
 import org.apache.ambari.view.utils.ambari.AmbariApi;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.hbase.util.Strings;
+import org.apache.commons.lang.StringUtils;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
@@ -81,7 +81,7 @@ public class RangerService {
       LOG.error("Failed to fetch Ranger URL from ambari. Exception: {}", e);
       throw new RangerException("Failed to fetch Ranger URL from Ambari", "AMBARI_FETCH_FAILED",
500, e);
     }
-    if (Strings.isEmpty(rangerUrl)) {
+    if (StringUtils.isEmpty(rangerUrl)) {
       LOG.info("Ranger url is not configured for the instance");
       throw new RangerException("Ranger url is not configured in Ambari.", "CONFIGURATION_ERROR",
500);
     }
@@ -91,7 +91,7 @@ public class RangerService {
 
   private List<Policy> getPoliciesFromNonAmbariCluster(String database, String table)
{
     String rangerUrl = getRangerUrlFromConfig();
-    if (Strings.isEmpty(rangerUrl)) {
+    if (StringUtils.isEmpty(rangerUrl)) {
       LOG.info("Ranger url is not configured for the instance");
       throw new RangerException("Ranger url is not configured in Ambari Instance.", "CONFIGURATION_ERROR",
500);
     }
@@ -107,7 +107,7 @@ public class RangerService {
     }
 
     String rangerResponse = fetchResponseFromRanger(rangerUrl, cred.username, cred.password,
database, table);
-    if (Strings.isEmpty(rangerResponse)) {
+    if (StringUtils.isEmpty(rangerResponse)) {
       return Lists.newArrayList();
     }
 
@@ -141,8 +141,17 @@ public class RangerService {
       JSONObject policyItem = (JSONObject) policyItems.get(0);
       JSONArray usersJson = (JSONArray) policyItem.get("users");
       JSONArray groupsJson = (JSONArray) policyItem.get("groups");
+      JSONArray accesses = (JSONArray) policyItem.get("accesses");
 
 
+      for (Object accessJson : accesses) {
+        JSONObject access = (JSONObject) accessJson;
+        Boolean isAllowed = (Boolean) access.get("isAllowed");
+        if (isAllowed) {
+          policy.addAccess((String) access.get("type"));
+        }
+      }
+
       for (Object user : usersJson) {
         policy.addUser((String) user);
       }
@@ -159,7 +168,7 @@ public class RangerService {
   private String fetchResponseFromRanger(String rangerUrl, String username, String password,
String database, String table) {
 
     String serviceName = context.getProperties().get("hive.ranger.servicename");
-    if(Strings.isEmpty(serviceName)) {
+    if (StringUtils.isEmpty(serviceName)) {
       LOG.error("Bad service name configured");
       throw new RangerException("Ranger service name is not configured in Ambari Instance.",
"CONFIGURATION_ERROR", 500);
     }
@@ -182,15 +191,15 @@ public class RangerService {
 
   private StringBuilder getRangerUrl(String rangerUrl, String database, String table, String
serviceName) {
     StringBuilder queryParams = new StringBuilder();
-    if (!Strings.isEmpty(database)) {
+    if (!StringUtils.isEmpty(database)) {
       queryParams.append("resource:database=");
       queryParams.append(database);
-      if (!Strings.isEmpty(table)) {
+      if (!StringUtils.isEmpty(table)) {
         queryParams.append("&");
       }
     }
 
-    if (!Strings.isEmpty(table)) {
+    if (!StringUtils.isEmpty(table)) {
       queryParams.append("resource:table=");
       queryParams.append(table);
     }
@@ -203,7 +212,7 @@ public class RangerService {
     urlBuilder.append("/service/public/v2/api/service/");
     urlBuilder.append(serviceName);
     urlBuilder.append("/policy");
-    if (!Strings.isEmpty(queryParamString)) {
+    if (!StringUtils.isEmpty(queryParamString)) {
       urlBuilder.append("?");
       urlBuilder.append(queryParamString);
     }
@@ -259,6 +268,7 @@ public class RangerService {
     private String name;
     private List<String> users = new ArrayList<>();
     private List<String> groups = new ArrayList<>();
+    private List<String> accesses = new ArrayList<>();
 
     public Policy(String name) {
       this.name = name;
@@ -288,6 +298,13 @@ public class RangerService {
       this.groups = groups;
     }
 
+    public List<String> getAccesses() {
+      return accesses;
+    }
+
+    public void setAccesses(List<String> accesses) {
+      this.accesses = accesses;
+    }
 
     public void addUser(String user) {
       users.add(user);
@@ -296,6 +313,10 @@ public class RangerService {
     public void addGroup(String group) {
       groups.add(group);
     }
+
+    public void addAccess(String access) {
+      accesses.add(access);
+    }
   }
 
   /**
@@ -311,7 +332,7 @@ public class RangerService {
     }
 
     public boolean isValid() {
-      return !(Strings.isEmpty(username) || Strings.isEmpty(password));
+      return !(StringUtils.isEmpty(username) || StringUtils.isEmpty(password));
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/635191c8/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
b/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
index f717bcc..416f12f 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
+++ b/contrib/views/hive20/src/main/resources/ui/app/templates/databases/database/tables/table/auth.hbs
@@ -26,8 +26,9 @@
     <thead>
     <tr>
       <th width="20%">POLICY NAME</th>
-      <th width="40%">USERS</th>
-      <th width="40%">GROUPS</th>
+      <th width="25%">USERS</th>
+      <th width="25%">GROUPS</th>
+      <th width="30%">ACCESS</th>
     </tr>
     </thead>
     <tbody>
@@ -44,6 +45,11 @@
             <span class="label label-success">{{group}}</span>
           {{/each}}
         </td>
+        <td>
+          {{#each policy.accesses as |access|}}
+            <span class="label label-success">{{access}}</span>
+          {{/each}}
+        </td>
       </tr>
     {{/each}}
     </tbody>


Mime
View raw message