ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject ambari git commit: AMBARI-16782. API output show protocol as http on 'https' and SSL enabled Ambari server (ncole)
Date Thu, 19 May 2016 21:31:54 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk fb3afc6a0 -> 9e98dc039


AMBARI-16782. API output show protocol as http on 'https' and SSL enabled Ambari server (ncole)


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

Branch: refs/heads/trunk
Commit: 9e98dc039e5bb92e8bf536a35be5a23c067f67a4
Parents: fb3afc6
Author: Nate Cole <ncole@hortonworks.com>
Authored: Thu May 19 16:20:35 2016 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Thu May 19 17:31:33 2016 -0400

----------------------------------------------------------------------
 .../org/apache/ambari/server/controller/AmbariServer.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9e98dc03/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index db66961..99a6cab 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -19,9 +19,6 @@
 package org.apache.ambari.server.controller;
 
 
-import javax.crypto.BadPaddingException;
-import javax.servlet.DispatcherType;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.Authenticator;
@@ -34,6 +31,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.LogManager;
 
+import javax.crypto.BadPaddingException;
+import javax.servlet.DispatcherType;
+
 import org.apache.ambari.eventdb.webservice.WorkflowJsonService;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.StateRecoveryManager;
@@ -556,6 +556,7 @@ public class AmbariServer {
 
         HttpConfiguration httpConfigurationSSL = new HttpConfiguration();
         httpConfigurationSSL.setSecurePort(configs.getClientSSLApiPort());
+        httpConfigurationSSL.addCustomizer(new SecureRequestCustomizer());
         setHeaderSize(httpConfigurationSSL);
 
         ServerConnector https = new ServerConnector(server, new SslConnectionFactory(contextFactoryApi,
"http/1.1"),
@@ -747,7 +748,7 @@ public class AmbariServer {
     // by default all protocols should be available
     factory.setExcludeProtocols();
     factory.setIncludeProtocols(new String[] { "SSLv2Hello","TLSv1"});
-    
+
     if (!configs.getSrvrDisabledCiphers().isEmpty()) {
       String[] masks = configs.getSrvrDisabledCiphers().split(DISABLED_ENTRIES_SPLITTER);
       factory.setExcludeCipherSuites(masks);


Mime
View raw message