[ambari] branch branch-2.7 updated: AMBARI-25446. Credentials should not be shown on cleartext on Ambari UI (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


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 6e28cc2  AMBARI-25446. Credentials should not be shown on cleartext on 
Ambari UI (aonishuk)
6e28cc2 is described below

commit 6e28cc22720cde5ca77e1f825a3fa2e2b99a67f3
Author: Andrew Onishuk <aonis...@hortonworks.com>
AuthorDate: Wed Dec 11 14:17:09 2019 +0200

    AMBARI-25446. Credentials should not be shown on cleartext on Ambari UI 
(aonishuk)
---
 .../server/controller/internal/RepositoryResourceProvider.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
index 82f7903..b844495 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
@@ -44,6 +44,7 @@ import 
org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.utils.URLCredentialsHider;
 import org.apache.commons.lang.BooleanUtils;
 
 public class RepositoryResourceProvider extends 
AbstractControllerResourceProvider {
@@ -178,11 +179,11 @@ public class RepositoryResourceProvider extends 
AbstractControllerResourceProvid
         setResourceProperty(resource, REPOSITORY_REPO_NAME_PROPERTY_ID, 
response.getRepoName(), requestedIds);
         setResourceProperty(resource, REPOSITORY_DISTRIBUTION_PROPERTY_ID, 
response.getDistribution(), requestedIds);
         setResourceProperty(resource, REPOSITORY_COMPONENTS_PROPERTY_ID, 
response.getComponents(), requestedIds);
-        setResourceProperty(resource, REPOSITORY_BASE_URL_PROPERTY_ID, 
response.getBaseUrl(), requestedIds);
+        setResourceProperty(resource, REPOSITORY_BASE_URL_PROPERTY_ID, 
URLCredentialsHider.hideCredentials(response.getBaseUrl()), requestedIds);
         setResourceProperty(resource, REPOSITORY_OS_TYPE_PROPERTY_ID, 
response.getOsType(), requestedIds);
         setResourceProperty(resource, REPOSITORY_REPO_ID_PROPERTY_ID, 
response.getRepoId(), requestedIds);
         setResourceProperty(resource, REPOSITORY_MIRRORS_LIST_PROPERTY_ID, 
response.getMirrorsList(), requestedIds);
-        setResourceProperty(resource, REPOSITORY_DEFAULT_BASE_URL_PROPERTY_ID, 
response.getDefaultBaseUrl(), requestedIds);
+        setResourceProperty(resource, REPOSITORY_DEFAULT_BASE_URL_PROPERTY_ID, 
URLCredentialsHider.hideCredentials(response.getDefaultBaseUrl()), 
requestedIds);
         setResourceProperty(resource, REPOSITORY_UNIQUE_PROPERTY_ID, 
response.isUnique(), requestedIds);
         setResourceProperty(resource, REPOSITORY_TAGS_PROPERTY_ID, 
response.getTags(), requestedIds);
         setResourceProperty(resource, 
REPOSITORY_APPLICABLE_SERVICES_PROPERTY_ID, response.getApplicableServices(), 
requestedIds);