[11/50] [abbrv] hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-11 Thread virajith 
YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1769b12a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1769b12a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1769b12a

Branch: refs/heads/HDFS-9806
Commit: 1769b12a773dc6c83f13663a77da33fa78878730
Parents: ff5ec3b
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Mon May 8 15:46:12 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/1769b12a/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 64a4b2b..eabd9b3 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
@@ -375,16 +375,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

[14/50] [abbrv] hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-11 Thread inigoiri 
YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1769b12a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1769b12a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1769b12a

Branch: refs/heads/HDFS-10467
Commit: 1769b12a773dc6c83f13663a77da33fa78878730
Parents: ff5ec3b
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Mon May 8 15:46:12 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/1769b12a/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 64a4b2b..eabd9b3 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
@@ -375,16 +375,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

hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-09 Thread haibochen 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8.1 953dd19d8 -> a7652d862


YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)

(cherry picked from commit 1769b12a773dc6c83f13663a77da33fa78878730)
(cherry picked from commit 86fcb8a66ccc0a0cd0c41073bb3a49315033aed5)
(cherry picked from commit 3799625e90fff5a879710746f444924caf94f6e8)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a7652d86
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a7652d86
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a7652d86

Branch: refs/heads/branch-2.8.1
Commit: a7652d862c80f30535ab156c18e503e9f91d2b54
Parents: 953dd19
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Tue May 9 09:43:09 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/a7652d86/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 f45465a..076ee29 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
@@ -369,16 +369,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

hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-09 Thread haibochen 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 018789215 -> f8e893f7e


YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)

(cherry picked from commit 1769b12a773dc6c83f13663a77da33fa78878730)
(cherry picked from commit 86fcb8a66ccc0a0cd0c41073bb3a49315033aed5)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f8e893f7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f8e893f7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f8e893f7

Branch: refs/heads/branch-2.7
Commit: f8e893f7ea56e989d2b66ece53abe4991690599d
Parents: 0187892
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Tue May 9 08:56:56 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/f8e893f7/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 f8e67ee..27e5784 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
@@ -334,16 +334,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

hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-09 Thread haibochen 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 8007d024b -> 3799625e9


YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)

(cherry picked from commit 1769b12a773dc6c83f13663a77da33fa78878730)
(cherry picked from commit 86fcb8a66ccc0a0cd0c41073bb3a49315033aed5)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3799625e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3799625e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3799625e

Branch: refs/heads/branch-2.8
Commit: 3799625e90fff5a879710746f444924caf94f6e8
Parents: 8007d02
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Tue May 9 08:52:37 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/3799625e/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 f45465a..076ee29 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
@@ -369,16 +369,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

[46/50] [abbrv] hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-08 Thread aengineer 
YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1769b12a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1769b12a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1769b12a

Branch: refs/heads/HDFS-7240
Commit: 1769b12a773dc6c83f13663a77da33fa78878730
Parents: ff5ec3b
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Mon May 8 15:46:12 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/1769b12a/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 64a4b2b..eabd9b3 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
@@ -375,16 +375,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

[07/50] [abbrv] hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-08 Thread subru 
YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1769b12a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1769b12a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1769b12a

Branch: refs/heads/YARN-2915
Commit: 1769b12a773dc6c83f13663a77da33fa78878730
Parents: ff5ec3b
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Mon May 8 15:46:12 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/1769b12a/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 64a4b2b..eabd9b3 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
@@ -375,16 +375,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

hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-08 Thread haibochen 
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 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
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

hadoop git commit: YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via Haibo Chen)

2017-05-08 Thread haibochen 
Repository: hadoop
Updated Branches:
  refs/heads/trunk ff5ec3b84 -> 1769b12a7


YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M 
Pujare via Haibo Chen)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1769b12a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1769b12a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1769b12a

Branch: refs/heads/trunk
Commit: 1769b12a773dc6c83f13663a77da33fa78878730
Parents: ff5ec3b
Author: Haibo Chen 
Authored: Mon May 8 15:43:20 2017 -0700
Committer: Haibo Chen 
Committed: Mon May 8 15:46:12 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/1769b12a/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 64a4b2b..eabd9b3 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
@@ -375,16 +375,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