diff options
| -rw-r--r-- | apt-pkg/contrib/netrc.cc | 34 | ||||
| -rw-r--r-- | methods/https.cc | 2 |
2 files changed, 28 insertions, 8 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index 186527306..91fc7dfd7 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -13,6 +13,7 @@ /*}}}*/ #include <apt-pkg/configuration.h> +#include <apt-pkg/fileutl.h> #include <iostream> #include <stdio.h> #include <stdlib.h> @@ -148,25 +149,44 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL) void maybe_add_auth (URI &Uri, string NetRCFile) { if (_config->FindB("Debug::Acquire::netrc", false) == true) - std::clog << "maybe_add_auth: " << NetRCFile << std::endl; + 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 + // FIXME: with host+path we need to match url.startswith(host+path) + char *hostpath = strdupa (flNotFile(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; + } } } } diff --git a/methods/https.cc b/methods/https.cc index 075d655b7..585e13848 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -130,7 +130,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc")); // callbacks - curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str()); + curl_easy_setopt(curl, CURLOPT_URL, static_cast<string>(Uri).c_str()); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); curl_easy_setopt(curl, CURLOPT_WRITEDATA, this); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback); |