[nifi] branch main updated: NIFI-11051 Corrected handling of empty Registry host property

[pvillard]

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

pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 9067774237 NIFI-11051 Corrected handling of empty Registry host 
property
9067774237 is described below

commit 90677742371e4e77fb0b39334961bba102716553
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Thu Jan 12 14:48:36 2023 -0600

    NIFI-11051 Corrected handling of empty Registry host property
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #6842.
---
 .../connector/ApplicationServerConnectorFactory.java    |  4 +++-
 .../ApplicationServerConnectorFactoryTest.java          | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
index d9636beb74..4acebbc338 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
@@ -49,6 +49,8 @@ public class ApplicationServerConnectorFactory extends 
StandardServerConnectorFa
 
     private static final String CIPHER_SUITE_SEPARATOR_PATTERN = ",\\s*";
 
+    private static final String DEFAULT_HOST = null;
+
     private final String includeCipherSuites;
 
     private final String excludeCipherSuites;
@@ -213,7 +215,7 @@ public class ApplicationServerConnectorFactory extends 
StandardServerConnectorFa
             host = properties.getHttpHost();
         }
 
-        return host;
+        return StringUtils.defaultIfEmpty(host, DEFAULT_HOST);
     }
 
     private static int getPort(final NiFiRegistryProperties properties) {
diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java
index bfb22affcf..3b5a2d9d29 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java
@@ -20,6 +20,7 @@ import 
org.apache.nifi.registry.properties.NiFiRegistryProperties;
 import org.apache.nifi.remote.io.socket.NetworkUtils;
 import org.apache.nifi.security.util.TemporaryKeyStoreBuilder;
 import org.apache.nifi.security.util.TlsConfiguration;
+import org.apache.nifi.util.StringUtils;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.junit.jupiter.api.BeforeAll;
@@ -93,6 +94,22 @@ class ApplicationServerConnectorFactoryTest {
         assertEquals(LOCALHOST, serverConnector.getHost());
     }
 
+    @Test
+    void testGetServerConnectorHostPropertyEmpty() {
+        final int port = NetworkUtils.getAvailableTcpPort();
+        final Properties configuredProperties = new Properties();
+        configuredProperties.put(NiFiRegistryProperties.WEB_HTTP_PORT, 
Integer.toString(port));
+        configuredProperties.put(NiFiRegistryProperties.WEB_HTTP_HOST, 
StringUtils.EMPTY);
+
+        final NiFiRegistryProperties properties = 
getProperties(configuredProperties);
+        final ApplicationServerConnectorFactory factory = new 
ApplicationServerConnectorFactory(server, properties);
+
+        final ServerConnector serverConnector = factory.getServerConnector();
+
+        assertNotNull(serverConnector);
+        assertNull(serverConnector.getHost());
+    }
+
     @Test
     void testGetServerConnectorSslProperties() {
         final int port = NetworkUtils.getAvailableTcpPort();