Просмотр исходного кода

YARN-6890. Not display killApp button on UI if UI is unsecured but cluster is secured. Contributed by Junping Du

Jian He 8 лет назад
Родитель
Сommit
ad1567c487

+ 2 - 0
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java

@@ -620,6 +620,8 @@ public class CommonConfigurationKeysPublic {
    */
    */
   public static final String HADOOP_TOKEN_FILES =
   public static final String HADOOP_TOKEN_FILES =
       "hadoop.token.files";
       "hadoop.token.files";
+  public static final String HADOOP_HTTP_AUTHENTICATION_TYPE =
+    "hadoop.http.authentication.type";
 
 
   @Deprecated
   @Deprecated
   /** Only used by HttpServer. */
   /** Only used by HttpServer. */

+ 13 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java

@@ -30,6 +30,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.http.RestCsrfPreventionFilter;
 import org.apache.hadoop.security.http.RestCsrfPreventionFilter;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.StringUtils;
@@ -69,6 +70,8 @@ public class AppBlock extends HtmlBlock {
   protected ApplicationBaseProtocol appBaseProt;
   protected ApplicationBaseProtocol appBaseProt;
   protected Configuration conf;
   protected Configuration conf;
   protected ApplicationId appID = null;
   protected ApplicationId appID = null;
+  private boolean unsecuredUI = true;
+
 
 
   @Inject
   @Inject
   protected AppBlock(ApplicationBaseProtocol appBaseProt, ViewContext ctx,
   protected AppBlock(ApplicationBaseProtocol appBaseProt, ViewContext ctx,
@@ -76,6 +79,9 @@ public class AppBlock extends HtmlBlock {
     super(ctx);
     super(ctx);
     this.appBaseProt = appBaseProt;
     this.appBaseProt = appBaseProt;
     this.conf = conf;
     this.conf = conf;
+    // check if UI is unsecured.
+    String httpAuth = conf.get(CommonConfigurationKeys.HADOOP_HTTP_AUTHENTICATION_TYPE);
+    this.unsecuredUI = (httpAuth != null) && httpAuth.equals("simple");
   }
   }
 
 
   @Override
   @Override
@@ -128,10 +134,16 @@ public class AppBlock extends HtmlBlock {
 
 
     setTitle(join("Application ", aid));
     setTitle(join("Application ", aid));
 
 
+    // YARN-6890. for secured cluster allow anonymous UI access, application kill
+    // shouldn't be there.
+    boolean unsecuredUIForSecuredCluster = UserGroupInformation.isSecurityEnabled()
+        && this.unsecuredUI;
+
     if (webUiType != null
     if (webUiType != null
         && webUiType.equals(YarnWebParams.RM_WEB_UI)
         && webUiType.equals(YarnWebParams.RM_WEB_UI)
         && conf.getBoolean(YarnConfiguration.RM_WEBAPP_UI_ACTIONS_ENABLED,
         && conf.getBoolean(YarnConfiguration.RM_WEBAPP_UI_ACTIONS_ENABLED,
-          YarnConfiguration.DEFAULT_RM_WEBAPP_UI_ACTIONS_ENABLED)) {
+          YarnConfiguration.DEFAULT_RM_WEBAPP_UI_ACTIONS_ENABLED)
+            && !unsecuredUIForSecuredCluster) {
       // Application Kill
       // Application Kill
       html.div()
       html.div()
         .button()
         .button()