azkaban-developers

Details

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
index 62dfc66..a172ab0 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
@@ -74,12 +74,6 @@ public class JMXHttpServlet extends LoginAbstractAzkabanServlet implements
     if (hasParam(req, "ajax")) {
       Map<String, Object> ret = new HashMap<>();
 
-      if (!hasPermission(session.getUser(), Permission.Type.METRICS)) {
-        ret.put("error", "User " + session.getUser().getUserId()
-            + " has no permission.");
-        this.writeJSON(resp, ret, true);
-        return;
-      }
       final String ajax = getParam(req, "ajax");
       if (JMX_GET_ALL_EXECUTOR_ATTRIBUTES.equals(ajax)) {
         if (!hasParam(req, JMX_MBEAN) || !hasParam(req, JMX_HOSTPORT)) {
@@ -177,13 +171,6 @@ public class JMXHttpServlet extends LoginAbstractAzkabanServlet implements
         newPage(req, resp, session,
             "azkaban/webapp/servlet/velocity/jmxpage.vm");
 
-    if (!hasPermission(session.getUser(), Permission.Type.METRICS)) {
-      page.add("errorMsg", "User " + session.getUser().getUserId()
-          + " has no permission.");
-      page.render();
-      return;
-    }
-
     page.add("mbeans", this.server.getMbeanNames());
 
     final Map<String, Object> executorMBeans = new HashMap<>();
@@ -214,16 +201,4 @@ public class JMXHttpServlet extends LoginAbstractAzkabanServlet implements
       final Session session) throws ServletException, IOException {
 
   }
-
-  protected boolean hasPermission(final User user, final Permission.Type type) {
-    for (final String roleName : user.getRoles()) {
-      final Role role = this.userManager.getRole(roleName);
-      if (role.getPermission().isPermissionSet(type)
-          || role.getPermission().isPermissionSet(Permission.Type.ADMIN)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
 }
diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/StatsServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/StatsServlet.java
index 917c982..f3f0aa7 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/StatsServlet.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/StatsServlet.java
@@ -181,11 +181,6 @@ public class StatsServlet extends LoginAbstractAzkabanServlet {
       final Session session)
       throws ServletException {
     final Page page = newPage(req, resp, session, "azkaban/webapp/servlet/velocity/statsPage.vm");
-    if (!hasPermission(session.getUser(), Permission.Type.METRICS)) {
-      page.add("errorMsg", "User " + session.getUser().getUserId() + " has no permission.");
-      page.render();
-      return;
-    }
 
     try {
       final Collection<Executor> executors = this.execManager.getAllActiveExecutors();
@@ -216,17 +211,6 @@ public class StatsServlet extends LoginAbstractAzkabanServlet {
       IOException {
   }
 
-  protected boolean hasPermission(final User user, final Permission.Type type) {
-    for (final String roleName : user.getRoles()) {
-      final Role role = this.userManager.getRole(roleName);
-      if (role.getPermission().isPermissionSet(type) || role.getPermission()
-          .isPermissionSet(Permission.Type.ADMIN)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * Parse all Http request params
    */