[ambari] 02/02: AMBARI-25433. Ambari should add login and password to urls populated from VDF (aonishuk)

[aonishuk]

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

aonishuk pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit afbbb73db5a4f2adad2dd4e0e777f7c5109b2099
Author: Andrew Onishuk <aonis...@hortonworks.com>
AuthorDate: Thu Nov 28 14:30:40 2019 +0200

    AMBARI-25433. Ambari should add login and password to urls populated from 
VDF (aonishuk)
---
 .../internal/VersionDefinitionResourceProvider.java      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index 97cf917..0779f26 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -581,6 +582,7 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
       } else {
         URLStreamProvider provider = new URLStreamProvider(connectTimeout, 
readTimeout,
             ComponentSSLConfiguration.instance());
+        provider.setSetupTruststoreForHttps(false);
 
         stream = provider.readFrom(definitionUrl);
       }
@@ -615,12 +617,14 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
 
     entity.setStack(stackEntity);
 
-    String credentials;
-    try {
-      URL url = new URL(holder.url);
-      credentials = url.getUserInfo();
-    } catch (MalformedURLException e) {
-      throw new AmbariException(String.format("Could not parse url %s", 
holder.url), e);
+    String credentials = null;
+    if (holder.url != null) {
+      try {
+        URI uri = new URI(holder.url);
+        credentials = uri.getUserInfo();
+      } catch (URISyntaxException e) {
+        throw new AmbariException(String.format("Could not parse url %s", 
holder.url), e);
+      }
     }
 
     List<RepositoryInfo> repos = 
holder.xml.repositoryInfo.getRepositories(credentials);