You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/11/28 03:08:44 UTC
nifi git commit: NIFI-4632: Add the local hostname to the list of
validated host headers
Repository: nifi
Updated Branches:
refs/heads/master 616906145 -> cec276414
NIFI-4632: Add the local hostname to the list of validated host headers
This closes #2288.
Signed-off-by: Andy LoPresto <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cec27641
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cec27641
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cec27641
Branch: refs/heads/master
Commit: cec276414051e99d704064799675f0504bd35cc1
Parents: 6169061
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Nov 22 09:56:09 2017 -0500
Committer: Andy LoPresto <al...@gmail.com>
Committed: Mon Nov 27 19:08:29 2017 -0800
----------------------------------------------------------------------
.../java/org/apache/nifi/web/server/HostHeaderHandler.java | 7 +++++++
.../nifi/web/server/HostHeaderSanitizationCustomizer.java | 7 +++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/cec27641/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
index 989d8d7..0b3a8be 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
@@ -18,6 +18,7 @@ package org.apache.nifi.web.server;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -60,6 +61,12 @@ public class HostHeaderHandler extends ScopedHandler {
validHosts.add("localhost:" + serverPort);
// Different from customizer -- empty is ok here
validHosts.add("");
+ try {
+ validHosts.add(InetAddress.getLocalHost().getHostName());
+ validHosts.add(InetAddress.getLocalHost().getHostName() + ":" + serverPort);
+ } catch (final Exception e) {
+ logger.warn("Failed to determine local hostname.", e);
+ }
logger.info("Created " + this.toString());
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/cec27641/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
index 9d55d71..5a10610 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.server;
+import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -53,6 +54,12 @@ public class HostHeaderSanitizationCustomizer implements HttpConfiguration.Custo
// Sometimes the hostname is left empty but the port is always populated
validHosts.add("localhost");
validHosts.add("localhost:" + serverPort);
+ try {
+ validHosts.add(InetAddress.getLocalHost().getHostName());
+ validHosts.add(InetAddress.getLocalHost().getHostName() + ":" + serverPort);
+ } catch (final Exception e) {
+ logger.warn("Failed to determine local hostname.", e);
+ }
logger.info("Created " + this.toString());
}