[ZEPPELIN-1237] Auto-suggestion of notebook permissions should list roles as well

zeppelin-server/src/main/java/org/apache/zeppelin/rest/GetUserList.java

@@ -67,6 +67,25 @@ public List<String> getUserList(IniRealm r) {
     return userList;
   }
 
+
+  /***
+   * Get user roles from shiro.ini
+   * @param r
+   * @return
+   */
+  public List<String> getRolesList(IniRealm r) {
+    List<String> roleList = new ArrayList<>();
+    Map getIniRoles = r.getIni().get("roles");
+    if (getIniRoles != null) {
+      Iterator it = getIniRoles.entrySet().iterator();
+      while (it.hasNext()) {
+        Map.Entry pair = (Map.Entry) it.next();
+        roleList.add(pair.getKey().toString().trim());
+      }
+    }
+    return roleList;
+  }
+
   /**
    * function to extract users from LDAP
    */

zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java

@@ -18,9 +18,9 @@
 package org.apache.zeppelin.rest;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.realm.jdbc.JdbcRealm;
-import org.apache.shiro.realm.ldap.AbstractLdapRealm;
 import org.apache.shiro.realm.ldap.JndiLdapRealm;
 import org.apache.shiro.realm.text.IniRealm;
 import org.apache.zeppelin.annotation.ZeppelinApi;
@@ -98,6 +98,7 @@ public Response ticket() {
   public Response getUserList(@PathParam("searchText") final String searchText) {
 
     List<String> usersList = new ArrayList<>();
+    List<String> rolesList = new ArrayList<>();
     try {
       GetUserList getUserListObj = new GetUserList();
       Collection realmsList = SecurityUtils.getRealmsList();
@@ -107,6 +108,7 @@ public Response getUserList(@PathParam("searchText") final String searchText) {
           String name = realm.getName();
           if (name.equals("iniRealm")) {
             usersList.addAll(getUserListObj.getUserList((IniRealm) realm));
+            rolesList.addAll(getUserListObj.getRolesList((IniRealm) realm));
           } else if (name.equals("ldapRealm")) {
             usersList.addAll(getUserListObj.getUserList((JndiLdapRealm) realm, searchText));
           } else if (name.equals("activeDirectoryRealm")) {
@@ -120,8 +122,10 @@ public Response getUserList(@PathParam("searchText") final String searchText) {
     } catch (Exception e) {
       LOG.error("Exception in retrieving Users from realms ", e);
     }
-    List<String> autoSuggestList = new ArrayList<>();
+    List<String> autoSuggestUserList = new ArrayList<>();
+    List<String> autoSuggestRoleList = new ArrayList<>();
     Collections.sort(usersList);
+    Collections.sort(rolesList);
     Collections.sort(usersList, new Comparator<String>() {
       @Override
       public int compare(String o1, String o2) {
@@ -134,18 +138,28 @@ public int compare(String o1, String o2) {
       }
     });
     int maxLength = 0;
-    for (int i = 0; i < usersList.size(); i++) {
-      String userLowerCase = usersList.get(i).toLowerCase();
-      String searchTextLowerCase = searchText.toLowerCase();
-      if (userLowerCase.indexOf(searchTextLowerCase) != -1) {
+    for (String user : usersList) {
+      if (StringUtils.containsIgnoreCase(user, searchText)) {
+        autoSuggestUserList.add(user);
         maxLength++;
-        autoSuggestList.add(usersList.get(i));
       }
       if (maxLength == 5) {
         break;
       }
     }
-    return new JsonResponse<>(Response.Status.OK, "", autoSuggestList).build();
+
+    for (String role : rolesList) {
+      if (StringUtils.containsIgnoreCase(role, searchText)) {
+        autoSuggestRoleList.add(role);
+      }
+    }
+
+    Map<String, List> returnListMap = new HashMap<>();
+    returnListMap.put("users", autoSuggestUserList);
+    returnListMap.put("roles", autoSuggestRoleList);
+
+
+    return new JsonResponse<>(Response.Status.OK, "", returnListMap).build();
   }
 
 }

zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java

@@ -161,12 +161,12 @@ public void testGroupPermission() throws Exception {
 
       pollingWait(By.xpath("//span[@tooltip='Note permissions']"),
           MAX_BROWSER_TIMEOUT_SEC).click();
-      pollingWait(By.xpath("//input[@ng-model='permissions.owners']"), MAX_BROWSER_TIMEOUT_SEC)
-          .sendKeys("finance");
-      pollingWait(By.xpath("//input[@ng-model='permissions.readers']"), MAX_BROWSER_TIMEOUT_SEC)
-          .sendKeys("finance");
-      pollingWait(By.xpath("//input[@ng-model='permissions.writers']"), MAX_BROWSER_TIMEOUT_SEC)
-          .sendKeys("finance");
+      pollingWait(By.xpath(".//*[@id='selectOwners']/following::span//input"),
+          MAX_BROWSER_TIMEOUT_SEC).sendKeys("finance ");
+      pollingWait(By.xpath(".//*[@id='selectReaders']/following::span//input"),
+          MAX_BROWSER_TIMEOUT_SEC).sendKeys("finance ");
+      pollingWait(By.xpath(".//*[@id='selectWriters']/following::span//input"),
+          MAX_BROWSER_TIMEOUT_SEC).sendKeys("finance ");
       pollingWait(By.xpath("//button[@ng-click='savePermissions()']"), MAX_BROWSER_TIMEOUT_SEC)
           .sendKeys(Keys.ENTER);
 

zeppelin-server/src/test/java/org/apache/zeppelin/rest/SecurityRestApiTest.java

@@ -69,7 +69,7 @@ public void testGetUserList() throws IOException {
     get.addRequestHeader("Origin", "http://localhost");
     Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(),
         new TypeToken<Map<String, Object>>(){}.getType());
-    List<String> userList = (List<String>)  resp.get("body");
+    List<String> userList = (List) ((Map) resp.get("body")).get("users");
     collector.checkThat("Search result size", userList.size(),
         CoreMatchers.equalTo(1));
     collector.checkThat("Search result contains admin", userList.contains("admin"),
@@ -80,7 +80,7 @@ public void testGetUserList() throws IOException {
     notUser.addRequestHeader("Origin", "http://localhost");
     Map<String, Object> notUserResp = gson.fromJson(notUser.getResponseBodyAsString(),
         new TypeToken<Map<String, Object>>(){}.getType());
-    List<String> emptyUserList = (List<String>)  notUserResp.get("body");
+    List<String> emptyUserList = (List) ((Map) notUserResp.get("body")).get("users");
     collector.checkThat("Search result size", emptyUserList.size(),
         CoreMatchers.equalTo(0));
 

zeppelin-web/bower.json

@@ -31,7 +31,8 @@
     "ng-focus-if": "~1.0.2",
     "bootstrap3-dialog": "bootstrap-dialog#~1.34.7",
     "handsontable": "~0.24.2",
-    "moment-duration-format": "^1.3.0"
+    "moment-duration-format": "^1.3.0",
+    "select2": "^4.0.3"
   },
   "devDependencies": {
     "angular-mocks": "1.5.0"

zeppelin-web/src/app/app.js

@@ -98,6 +98,13 @@
     var baseUrlSrv = angular.injector(['zeppelinWebApp']).get('baseUrlSrv');
     // withCredentials when running locally via grunt
     $http.defaults.withCredentials = true;
+    jQuery.ajaxSetup({
+      dataType: 'json',
+      xhrFields: {
+        withCredentials: true
+      },
+      crossDomain: true
+    });
     return $http.get(baseUrlSrv.getRestApiBase() + '/security/ticket').then(function(response) {
       zeppelinWebApp.run(function($rootScope) {
         $rootScope.ticket = angular.fromJson(response.data).body;