Imported Upstream version 17.25.4

[platform/upstream/libzypp.git] / zypp / repo / RepoVariables.cc

diff --git a/zypp/repo/RepoVariables.cc b/zypp/repo/RepoVariables.cc
index 6009859..2eacab8 100644 (file)
--- a/zypp/repo/RepoVariables.cc
+++ b/zypp/repo/RepoVariables.cc
@@ -554,7 +554,13 @@ namespace zypp
     Url RepoVariablesUrlReplacer::operator()( const Url & value ) const
     {
       Url::ViewOptions toReplace = value.getViewOptions() - url::ViewOption::WITH_USERNAME - url::ViewOption::WITH_PASSWORD;
-      const std::string & replaced( RepoVarExpand()( value.asString( toReplace ), RepoVarsMap::lookup ) );
+      // Legacy: Not 100% correct because it substitutes inside the 'proxypass=' value,
+      // but this was done before as well. The final fix will have to keep the proxypasswd
+      // out side the url in a cedential file.
+      Url tmpurl { value };
+      tmpurl.setViewOptions( toReplace );
+      const std::string & replaced( RepoVarExpand()( hotfix1050625::asString( tmpurl ), RepoVarsMap::lookup ) );
+
       Url newurl;
       if ( !replaced.empty() )
       {