Strip user/password from URL in error message.

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2e2a976bb53581c3a462fddd51e1309f2382b463..bd59a4749f0b400e66f7c7ee21b1681059d49f00 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -23,6 +23,7 @@
     
 #include <apti18n.h>
 #include <sys/types.h>
     
 #include <apti18n.h>
 #include <sys/types.h>

+#include <regex.h>

 #include <cstdlib>
 #include <algorithm>
 #include <iostream>
 #include <cstdlib>
 #include <algorithm>
 #include <iostream>


@@ -1342,7 +1343,22 @@ bool ListUpdate(pkgAcquireStatus &Stat,
 
       (*I)->Finished();
 
 
       (*I)->Finished();
 

-      _error->Warning(_("Failed to fetch %s  %s\n"),(*I)->DescURI().c_str(),
+         // stripping username/password from URI if present
+         string descUri = (*I)->DescURI();
+         regex_t userPassRegex;
+         regcomp(&userPassRegex, "\\://(\\w+)\\:(\\w+)@", REG_EXTENDED);
+         regmatch_t userPassMatch;
+         regexec(&userPassRegex, descUri.c_str(), 1, &userPassMatch, 0);
+         if (userPassMatch.rm_so != -1) // regexp matched
+         {
+         // really stripping
+                size_t stripStart = userPassMatch.rm_so + 3;
+                size_t stripEnd = userPassMatch.rm_eo;
+                descUri = descUri.substr(0, stripStart) +
+            descUri.substr(stripEnd, string::npos);
+      }
+
+      _error->Warning(_("Failed to fetch %s  %s\n"), descUri.c_str(),

              (*I)->ErrorText.c_str());
 
       if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) 
              (*I)->ErrorText.c_str());
 
       if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) 

diff --git a/debian/changelog b/debian/changelog
index 5c2c5f292f54a8b2f52e7e502009d9bfdb1fce8a..40e1cc23df9bdf889064752ef144c49116ec50a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ apt (0.7.17) unstable; urgency=low
   * apt-pkg/acquire-item.cc:
     - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz'
       available. (Closes: #409284)
   * apt-pkg/acquire-item.cc:
     - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz'
       available. (Closes: #409284)

+  * apt-pkg/algorithm.cc:
+    - Strip username and password from source URL in error message.
+      (Closes: #425150)

 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300
 
 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300