X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/592b78001c381f9cca6f20d8d1d47696bb98c0d1..c307a4f0aa29c9c52a0e028524d21b448a53d09b:/apt-pkg/contrib/netrc.cc

diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 851b661a4..56e59d84b 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -11,6 +11,11 @@
 
    ##################################################################### */
 									/*}}}*/
+#include <config.h>
+
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 
 #include <iostream>
 #include <stdio.h>
@@ -21,6 +26,7 @@
 
 #include "netrc.h"
 
+using std::string;
 
 /* Get user and password from .netrc when given a machine name */
 
@@ -45,10 +51,7 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
   int specific_login = (login[0] != 0);
   char *home = NULL;
   bool netrc_alloc = false;
-  int state = NOTHING;
 
-  char state_login = 0;        /* Found a login keyword */
-  char state_password = 0;     /* Found a password keyword */
   int state_our_login = false;  /* With specific_login,
                                    found *our* login name */
 
@@ -65,8 +68,7 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     if (!home)
       return -1;
 
-    asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC);
-    if(!netrcfile)
+    if (asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC) == -1 || netrcfile == NULL)
       return -1;
     else
       netrc_alloc = true;
@@ -79,6 +81,10 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     bool done = false;
     char netrcbuffer[256];
 
+    int state = NOTHING;
+    char state_login = 0;        /* Found a login keyword */
+    char state_password = 0;     /* Found a password keyword */
+
     while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
       while (!done && tok) {
@@ -98,7 +104,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 +155,50 @@ 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 = strdup(NetRCFile.c_str());
 
-      if (host && 0 == parsenetrc (host, login, password, netrcfile))
+      // first check for a generic host based netrc entry
+      char *host = strdup(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);
+	free(netrcfile);
+	free(host);
+	return;
       }
+      free(host);
 
-      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 = strdup(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);
+      }
+      free(netrcfile);
+      free(hostpath);
     }
   }
 }