[zeppelin] branch master updated: [ZEPPELIN-4306] Add ForwardedRequestCustomizer to httpConfig

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 65ec6eb  [ZEPPELIN-4306] Add ForwardedRequestCustomizer to httpConfig
65ec6eb is described below

commit 65ec6ebd7a651af7f5167867a1a432738376ebef
Author: Philipp Dallig <philipp.dal...@gmail.com>
AuthorDate: Mon Aug 19 14:18:17 2019 +0200

    [ZEPPELIN-4306] Add ForwardedRequestCustomizer to httpConfig
    
    ### What is this PR for?
    With this PR the jetty customizer `ForwardedRequestCustomizer` is enabled 
to correct jetty behavior, if zeppelin is running behind a proxy.
    
    ### What type of PR is it?
    Improvement
    
    ### What is the Jira issue?
    [ZEPPELIN-4306](https://issues.apache.org/jira/browse/ZEPPELIN-4306)
    
    ### Questions:
    * Does the licenses files need update?
    No
    * Is there breaking changes for older versions?
    No
    * Does this needs documentation?
    No
    
    Author: Philipp Dallig <philipp.dal...@gmail.com>
    
    Closes #3429 from Reamer/ForwardedRequestCustomizer and squashes the 
following commits:
    
    08beb1dea [Philipp Dallig] Add ForwardedRequestCustomizer to httpConfig
---
 .../src/main/java/org/apache/zeppelin/server/ZeppelinServer.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 29fbd07..2aaad7a 100644
--- 
a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ 
b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -66,6 +66,7 @@ import org.apache.zeppelin.util.ReflectionUtils;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.jmx.ConnectorServer;
 import org.eclipse.jetty.jmx.MBeanContainer;
+import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
@@ -295,9 +296,10 @@ public class ZeppelinServer extends ResourceConfig {
     final Server server = new Server(threadPool);
     ServerConnector connector;
 
+    HttpConfiguration httpConfig = new HttpConfiguration();
+    httpConfig.addCustomizer(new ForwardedRequestCustomizer());
     if (conf.useSsl()) {
       LOG.debug("Enabling SSL for Zeppelin Server on port " + 
conf.getServerSslPort());
-      HttpConfiguration httpConfig = new HttpConfiguration();
       httpConfig.setSecureScheme("https");
       httpConfig.setSecurePort(conf.getServerSslPort());
       httpConfig.setOutputBufferSize(32768);
@@ -314,7 +316,7 @@ public class ZeppelinServer extends ResourceConfig {
               new SslConnectionFactory(getSslContextFactory(conf), 
HttpVersion.HTTP_1_1.asString()),
               new HttpConnectionFactory(httpsConfig));
     } else {
-      connector = new ServerConnector(server);
+      connector = new ServerConnector(server, new 
HttpConnectionFactory(httpConfig));
     }
 
     configureRequestHeaderSize(conf, connector);