Repository: hadoop Updated Branches: refs/heads/branch-2 b8870d815 -> 86fcb8a66
YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen) (cherry picked from commit 1769b12a773dc6c83f13663a77da33fa78878730) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/86fcb8a6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/86fcb8a6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/86fcb8a6 Branch: refs/heads/branch-2 Commit: 86fcb8a66ccc0a0cd0c41073bb3a49315033aed5 Parents: b8870d8 Author: Haibo Chen <haiboc...@cloudera.com> Authored: Mon May 8 15:43:20 2017 -0700 Committer: Haibo Chen <haiboc...@cloudera.com> Committed: Mon May 8 15:47:01 2017 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/webapp/util/WebAppUtils.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/86fcb8a6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java index 29e41ea..a32b2be 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java @@ -371,16 +371,21 @@ public class WebAppUtils { /** * Load the SSL keystore / truststore into the HttpServer builder. * @param builder the HttpServer2.Builder to populate with ssl config - * @param sslConf the Configuration instance to use during loading of SSL conf + * @param conf the Configuration instance to load custom SSL config from + * + * @return HttpServer2.Builder instance (passed in as the first parameter) + * after loading SSL stores */ public static HttpServer2.Builder loadSslConfiguration( - HttpServer2.Builder builder, Configuration sslConf) { - if (sslConf == null) { - sslConf = new Configuration(false); + HttpServer2.Builder builder, Configuration conf) { + + Configuration sslConf = new Configuration(false); + + sslConf.addResource(YarnConfiguration.YARN_SSL_SERVER_RESOURCE_DEFAULT); + if (conf != null) { + sslConf.addResource(conf); } boolean needsClientAuth = YarnConfiguration.YARN_SSL_CLIENT_HTTPS_NEED_AUTH_DEFAULT; - sslConf.addResource(YarnConfiguration.YARN_SSL_SERVER_RESOURCE_DEFAULT); - return builder .needsClientAuth(needsClientAuth) .keyPassword(getPassword(sslConf, WEB_APP_KEY_PASSWORD_KEY)) --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
