Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-12788 Avoid host URI encoding errors for Jetty Server Connector 

This closes #8404

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Bryan Bende 2024-02-14 11:11:10 -05:00 committed by exceptionfactory
parent 154fd87b79
commit d35247b7b1
No known key found for this signature in database
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
View File

@ -28,6 +28,7 @@ import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@ -153,7 +154,7 @@ public class JettyServer implements NiFiServer, ExtensionUiLoader {
private static final String WAR_EXTENSION = ".war";
private static final int WEB_APP_MAX_FORM_CONTENT_SIZE = 600000;
private static final String APPLICATION_URL_FORMAT = "%s://%s:%d/nifi";
private static final String APPLICATION_PATH = "/nifi";
private static final String HTTPS_SCHEME = "https";
private static final String HTTP_SCHEME = "http";
private static final String HOST_UNSPECIFIED = "0.0.0.0";
@ -725,7 +726,11 @@ public class JettyServer implements NiFiServer, ExtensionUiLoader {
final int port = serverConnector.getLocalPort();
final String connectorHost = serverConnector.getHost();
final String host = StringUtils.defaultIfEmpty(connectorHost, HOST_UNSPECIFIED);
return URI.create(String.format(APPLICATION_URL_FORMAT, scheme, host, port));
try {
return new URI(scheme, null, host, port, APPLICATION_PATH, null, null);
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
})
.collect(Collectors.toList());
}

9
nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
View File

@ -34,6 +34,7 @@ import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -48,7 +49,7 @@ public class JettyServer {
private static final Logger logger = LoggerFactory.getLogger(JettyServer.class);
private static final String APPLICATION_URL_FORMAT = "%s://%s:%d/nifi-registry";
private static final String APPLICATION_PATH = "/nifi-registry";
private static final String HTTPS_SCHEME = "https";
@ -142,7 +143,11 @@ public class JettyServer {
final int port = serverConnector.getLocalPort();
final String connectorHost = serverConnector.getHost();
final String host = StringUtils.defaultIfEmpty(connectorHost, HOST_UNSPECIFIED);
return URI.create(String.format(APPLICATION_URL_FORMAT, scheme, host, port));
try {
return new URI(scheme, null, host, port, APPLICATION_PATH, null, null);
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
})
.collect(Collectors.toList());
}