summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-11-01 10:44:13 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-11-01 10:44:13 +0100
commitf69b2c3d2984cd4dca485fb05ab84df94067c50d (patch)
tree11ac3bcba3399c2fa5c8d7fc45555d490a0497ff /apt-pkg/contrib
parent6292ea19bc71d0c1b977693195dcf9153bd07555 (diff)
parent446fb1002ad218929f3a6da911388b160b738f2a (diff)
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/netrc.cc63
-rw-r--r--apt-pkg/contrib/netrc.h8
2 files changed, 36 insertions, 35 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 2321ef063..0a902f126 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -45,11 +45,11 @@ enum {
#define NETRC DOT_CHAR "netrc"
/* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
-int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
+static int parsenetrc_string (char *host, std::string &login, std::string &password, char *netrcfile = NULL)
{
FILE *file;
int retcode = 1;
- int specific_login = (login[0] != 0);
+ int specific_login = (login.empty() == false);
char *home = NULL;
bool netrc_alloc = false;
@@ -80,16 +80,17 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
char *tok;
char *tok_buf;
bool done = false;
- char netrcbuffer[256];
+ char *netrcbuffer = NULL;
+ size_t netrcbuffer_size = 0;
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)) {
+ while (!done && getline(&netrcbuffer, &netrcbuffer_size, file) != -1) {
tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
while (!done && tok) {
- if(login[0] && password[0]) {
+ if(login.empty() == false && password.empty() == false) {
done = true;
break;
}
@@ -121,23 +122,13 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
/* we are now parsing sub-keywords concerning "our" host */
if (state_login) {
if (specific_login)
- state_our_login = !strcasecmp (login, tok);
+ state_our_login = !strcasecmp (login.c_str(), tok);
else
- {
- if (strlen(tok) > LOGINSIZE)
- _error->Error("login token too long %i (max: %i)",
- strlen(tok), LOGINSIZE);
- strncpy (login, tok, LOGINSIZE - 1);
- }
+ login = tok;
state_login = 0;
} else if (state_password) {
- if (state_our_login || !specific_login)
- {
- if (strlen(tok) > PASSWORDSIZE)
- _error->Error("password token too long %i (max %i)",
- strlen(tok), PASSWORDSIZE);
- strncpy (password, tok, PASSWORDSIZE - 1);
- }
+ if (state_our_login || !specific_login)
+ password = tok;
state_password = 0;
} else if (!strcasecmp ("login", tok))
state_login = 1;
@@ -153,8 +144,9 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
tok = strtok_r (NULL, " \t\n", &tok_buf);
} /* while(tok) */
- } /* while fgets() */
+ } /* while getline() */
+ free(netrcbuffer);
fclose(file);
}
@@ -163,6 +155,18 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
return retcode;
}
+// for some unknown reason this method is exported so keep a compatible interface for now …
+int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
+{
+ std::string login_string, password_string;
+ int const ret = parsenetrc_string(host, login_string, password_string, netrcfile);
+ if (ret < 0)
+ return ret;
+ strncpy(login, login_string.c_str(), LOGINSIZE - 1);
+ strncpy(password, password_string.c_str(), PASSWORDSIZE - 1);
+ return ret;
+}
+
void maybe_add_auth (URI &Uri, string NetRCFile)
{
@@ -173,21 +177,20 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
{
if (NetRCFile.empty () == false)
{
- char login[LOGINSIZE] = "";
- char password[PASSWORDSIZE] = "";
+ std::string login, password;
char *netrcfile = strdup(NetRCFile.c_str());
// 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 (host && parsenetrc_string(host, login, password, netrcfile) == 0)
{
if (_config->FindB("Debug::Acquire::netrc", false) == true)
std::clog << "host: " << host
<< " user: " << login
- << " pass-size: " << strlen(password)
+ << " pass-size: " << password.size()
<< std::endl;
- Uri.User = string (login);
- Uri.Password = string (password);
+ Uri.User = login;
+ Uri.Password = password;
free(netrcfile);
free(host);
return;
@@ -198,15 +201,15 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
// 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 (hostpath && parsenetrc_string(hostpath, login, password, netrcfile) == 0)
{
if (_config->FindB("Debug::Acquire::netrc", false) == true)
std::clog << "hostpath: " << hostpath
<< " user: " << login
- << " pass-size: " << strlen(password)
+ << " pass-size: " << password.size()
<< std::endl;
- Uri.User = string (login);
- Uri.Password = string (password);
+ Uri.User = login;
+ Uri.Password = password;
}
free(netrcfile);
free(hostpath);
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 5931d4a42..6feb5b726 100644
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -25,11 +25,9 @@
class URI;
-// Assume: password[0]=0, host[0] != 0.
-// If login[0] = 0, search for login and password within a machine section
-// in the netrc.
-// If login[0] != 0, search for password within machine and login.
-int parsenetrc (char *host, char *login, char *password, char *filename);
+// kill this export on the next ABI break - strongly doubt its in use anyway
+// outside of the apt itself, its really a internal interface
+__deprecated int parsenetrc (char *host, char *login, char *password, char *filename);
void maybe_add_auth (URI &Uri, std::string NetRCFile);
#endif