commit 958ef4ecdd17a91de6aa63194e2ade42795a1074 Author: Eric Yang Date: Fri Jan 26 17:38:13 2018 -0500 YARN-7831. Check security type base on http authentication configuration. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java index 34e62b6..897dbcd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java @@ -123,7 +123,8 @@ private String getApiUrl(String appName) throws IOException { api.append("/"); api.append(appName); } - if (!UserGroupInformation.isSecurityEnabled()) { + Configuration conf = getConfig(); + if (conf.get("hadoop.http.authentication.type").equalsIgnoreCase("simple")) { api.append("?user.name=" + UrlEncoded .encodeString(System.getProperty("user.name"))); } @@ -147,7 +148,7 @@ private Builder getApiClient(String appName) throws IOException { client.setChunkedEncodingSize(null); Builder builder = client .resource(getApiUrl(appName)).type(MediaType.APPLICATION_JSON); - if (conf.get("hadoop.security.authentication").equals("kerberos")) { + if (conf.get("hadoop.http.authentication.type").equals("kerberos")) { AuthenticatedURL.Token token = new AuthenticatedURL.Token(); builder.header("WWW-Authenticate", token); }