do not change protected packages in autoinstall (Closes: #618848)

[apt.git] / apt-pkg / contrib / netrc.cc

diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 851b661a461c5cbaca2f4d9c88dc9ab3d5c89355..d8027fc24c6605f54ac745fbe0b88f1c242feb66 100644 (file)
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -12,6 +12,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
@@ -98,7 +100,10 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
           }
           break;
         case HOSTFOUND:
-          if (!strcasecmp (host, tok)) {
+          /* extended definition of a "machine" if we have a "/"
+             we match the start of the string (host.startswith(token) */
+         if ((strchr(host, '/') && strstr(host, tok) == host) ||
+             (!strcasecmp (host, tok))) {
             /* and yes, this is our host! */
             state = HOSTVALID;
             retcode = 0; /* we did find our host */
@@ -146,24 +151,46 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
 
 void maybe_add_auth (URI &Uri, string NetRCFile)
 {
-  if (Uri.Password.empty () == true && Uri.User.empty () == true)
+  if (_config->FindB("Debug::Acquire::netrc", false) == true)
+     std::clog << "maybe_add_auth: " << (string)Uri 
+              << " " << NetRCFile << std::endl;
+  if (Uri.Password.empty () == true || Uri.User.empty () == true)
   {
     if (NetRCFile.empty () == false)
     {
       char login[64] = "";
       char password[64] = "";
-      char *netrcfile = strdup (NetRCFile.c_str ());
-      char *host = strdup (Uri.Host.c_str ());
+      char *netrcfile = strdupa (NetRCFile.c_str ());
 
-      if (host && 0 == parsenetrc (host, login, password, netrcfile))
+      // first check for a generic host based netrc entry
+      char *host = strdupa (Uri.Host.c_str ());
+      if (host && parsenetrc (host, login, password, netrcfile) == 0)
       {
+        if (_config->FindB("Debug::Acquire::netrc", false) == true)
+           std::clog << "host: " << host 
+                     << " user: " << login
+                     << " pass-size: " << strlen(password)
+                     << std::endl;
         Uri.User = string (login);
         Uri.Password = string (password);
+       return;
       }
 
-      if (host)
-        free (host);
-      free (netrcfile);
+      // if host did not work, try Host+Path next, this will trigger
+      // a lookup uri.startswith(host) in the netrc file parser (because
+      // of the "/"
+      char *hostpath = strdupa (string(Uri.Host+Uri.Path).c_str ());
+      if (hostpath && parsenetrc (hostpath, login, password, netrcfile) == 0)
+      {
+        if (_config->FindB("Debug::Acquire::netrc", false) == true)
+           std::clog << "hostpath: " << hostpath
+                     << " user: " << login
+                     << " pass-size: " << strlen(password)
+                     << std::endl;
+        Uri.User = string (login);
+        Uri.Password = string (password);
+        return;
+      }
     }
   }
 }