From 416b86145f58210baf548d422865068faf7acf39 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Wed, 13 Dec 2017 13:57:59 -0500 Subject: [PATCH] NIFI-4436: Bug fixes Signed-off-by: Matt Gilman --- .../flow/StandardFlowRegistryClient.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClient.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClient.java index 4f98a2beea..754646b828 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClient.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClient.java @@ -18,6 +18,7 @@ package org.apache.nifi.registry.flow; import java.net.URI; +import java.net.URISyntaxException; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -58,8 +59,17 @@ public class StandardFlowRegistryClient implements FlowRegistryClient { @Override public FlowRegistry addFlowRegistry(final String registryId, final String registryName, final String registryUrl, final String description) { - final URI uri = URI.create(registryUrl); + final URI uri; + try { + uri = new URI(registryUrl); + } catch (URISyntaxException e) { + throw new IllegalArgumentException("The given Registry URL is not valid: " + registryUrl); + } + final String uriScheme = uri.getScheme(); + if (uriScheme == null) { + throw new IllegalArgumentException("The given Registry URL is not valid: " + registryUrl); + } final FlowRegistry registry; if (uriScheme.equalsIgnoreCase("http") || uriScheme.equalsIgnoreCase("https")) { @@ -70,16 +80,6 @@ public class StandardFlowRegistryClient implements FlowRegistryClient { + "Please populate NiFi's Keystore/Truststore properties or connect to a NiFi Registry over http instead of https."); } - registry = new RestBasedFlowRegistry(this, registryId, registryUrl, sslContext, registryName); - registry.setDescription(description); - } else if (uriScheme.equalsIgnoreCase("http") || uriScheme.equalsIgnoreCase("https")) { - final SSLContext sslContext = SslContextFactory.createSslContext(nifiProperties, false); - if (sslContext == null && uriScheme.equalsIgnoreCase("https")) { - throw new IllegalStateException("Failed to create Flow Registry for URI " + registryUrl - + " because this NiFi is not configured with a Keystore/Truststore, so it is not capable of communicating with a secure Registry. " - + "Please populate NiFi's Keystore/Truststore properties or connect to a NiFi Registry over http instead of https."); - } - registry = new RestBasedFlowRegistry(this, registryId, registryUrl, sslContext, registryName); registry.setDescription(description); } else {