big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-9385. Fixed ApiServiceClient to use current UGI.

Browse Source 
Contributed by Eric Yang
This commit is contained in:
Eric Yang 2019-03-18 13:16:34 -04:00
parent 5446e3cb8a
commit 19b22c4385
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java
View File

@ -151,7 +151,7 @@ List<String> getRMHAWebAddresses(Configuration conf) {
* @return URI to API Service * @return URI to API Service
* @throws IOException * @throws IOException
*/ */
private String getServicePath(String appName) throws IOException { protected String getServicePath(String appName) throws IOException {
String url = getRMWebAddress(); String url = getRMWebAddress();
StringBuilder api = new StringBuilder(); StringBuilder api = new StringBuilder();
api.append(url) api.append(url)
@ -203,12 +203,15 @@ private String getComponentsPath(String appName) throws IOException {
return api.toString(); return api.toString();
} }
private void appendUserNameIfRequired(StringBuilder builder) { private void appendUserNameIfRequired(StringBuilder builder)
throws IOException {
Configuration conf = getConfig(); Configuration conf = getConfig();
if (conf.get("hadoop.http.authentication.type").equalsIgnoreCase( if (conf.get("hadoop.http.authentication.type")
"simple")) { .equalsIgnoreCase("simple")) {
String username = UserGroupInformation.getCurrentUser()
.getShortUserName();
builder.append("?user.name=").append(UrlEncoded builder.append("?user.name=").append(UrlEncoded
.encodeString(System.getProperty("user.name"))); .encodeString(username));
} }
} }

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestApiServiceClient.java
View File

@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.exceptions.YarnException;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
@ -310,5 +311,13 @@ public void testComponentsUpgrade() {
} }
} }
@Test
public void testNoneSecureApiClient() throws IOException {
String url = asc.getServicePath("/foobar");
assertTrue("User.name flag is missing in service path.",
url.contains("user.name"));
assertTrue("User.name flag is not matching JVM user.",
url.contains(System.getProperty("user.name")));
}
} }