--- /dev/null
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: netrc.c,v 1.38 2007-11-07 09:21:35 bagder Exp $
+/* ######################################################################
+
+ netrc file parser - returns the login and password of a give host in
+ a specified netrc-type file
+
+ Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
+ placed into the Public Domain, do with it what you will.
+
+ ##################################################################### */
+ /*}}}*/
+
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+
+#include "netrc.h"
+
+
+/* Get user and password from .netrc when given a machine name */
+
+enum {
+ NOTHING,
+ HOSTFOUND, /* the 'machine' keyword was found */
+ HOSTCOMPLETE, /* the machine name following the keyword was found too */
+ HOSTVALID, /* this is "our" machine! */
+ HOSTEND /* LAST enum */
+};
+
+/* make sure we have room for at least this size: */
+#define LOGINSIZE 64
+#define PASSWORDSIZE 64
+#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)
+{
+ FILE *file;
+ int retcode = 1;
+ 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 */
+
+ if (!netrcfile) {
+ home = getenv ("HOME"); /* portable environment reader */
+
+ if (!home) {
+ struct passwd *pw;
+ pw = getpwuid (geteuid ());
+ if(pw)
+ home = pw->pw_dir;
+ }
+
+ if (!home)
+ return -1;
+
+ asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC);
+ if(!netrcfile)
+ return -1;
+ else
+ netrc_alloc = true;
+ }
+
+ file = fopen (netrcfile, "r");
+ if(file) {
+ char *tok;
+ char *tok_buf;
+ bool done = false;
+ char netrcbuffer[256];
+
+ while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
+ tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
+ while (!done && tok) {
+ if(login[0] && password[0]) {
+ done = true;
+ break;
+ }
+
+ switch(state) {
+ case NOTHING:
+ if (!strcasecmp ("machine", tok)) {
+ /* the next tok is the machine name, this is in itself the
+ delimiter that starts the stuff entered for this machine,
+ after this we need to search for 'login' and
+ 'password'. */
+ state = HOSTFOUND;
+ }
+ break;
+ case HOSTFOUND:
+ if (!strcasecmp (host, tok)) {
+ /* and yes, this is our host! */
+ state = HOSTVALID;
+ retcode = 0; /* we did find our host */
+ }
+ else
+ /* not our host */
+ state = NOTHING;
+ break;
+ case HOSTVALID:
+ /* we are now parsing sub-keywords concerning "our" host */
+ if (state_login) {
+ if (specific_login)
+ state_our_login = !strcasecmp (login, tok);
+ else
+ strncpy (login, tok, LOGINSIZE - 1);
+ state_login = 0;
+ } else if (state_password) {
+ if (state_our_login || !specific_login)
+ strncpy (password, tok, PASSWORDSIZE - 1);
+ state_password = 0;
+ } else if (!strcasecmp ("login", tok))
+ state_login = 1;
+ else if (!strcasecmp ("password", tok))
+ state_password = 1;
+ else if(!strcasecmp ("machine", tok)) {
+ /* ok, there's machine here go => */
+ state = HOSTFOUND;
+ state_our_login = false;
+ }
+ break;
+ } /* switch (state) */
+
+ tok = strtok_r (NULL, " \t\n", &tok_buf);
+ } /* while(tok) */
+ } /* while fgets() */
+
+ fclose(file);
+ }
+
+ if (netrc_alloc)
+ free(netrcfile);
+
+ return retcode;
+}
+
+void maybe_add_auth (URI &Uri, string NetRCFile)
+{
+ 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 ());
+
+ if (host && 0 == parsenetrc (host, login, password, netrcfile))
+ {
+ Uri.User = string (login);
+ Uri.Password = string (password);
+ }
+
+ if (host)
+ free (host);
+ free (netrcfile);
+ }
+ }
+}
+
+#ifdef DEBUG
+int main(int argc, char* argv[])
+{
+ char login[64] = "";
+ char password[64] = "";
+
+ if(argc < 2)
+ return -1;
+
+ if(0 == parsenetrc (argv[1], login, password, argv[2])) {
+ printf("HOST: %s LOGIN: %s PASSWORD: %s\n", argv[1], login, password);
+ }
+}
+#endif
--- /dev/null
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: netrc.h,v 1.11 2004/01/07 09:19:35 bagder Exp $
+/* ######################################################################
+
+ netrc file parser - returns the login and password of a give host in
+ a specified netrc-type file
+
+ Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
+ placed into the Public Domain, do with it what you will.
+
+ ##################################################################### */
+ /*}}}*/
+#ifndef NETRC_H
+#define NETRC_H
+
+#include <apt-pkg/strutl.h>
+
+#define DOT_CHAR "."
+#define DIR_CHAR "/"
+
+// 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);
+
+void maybe_add_auth (URI &Uri, string NetRCFile);
+#endif
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
+ Cnf.Set("Dir::ETc::netrc", "auth.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
- contrib/cdromutl.cc contrib/crc-16.cc \
+ contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
contrib/fileutl.cc
-HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h \
- md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h
+HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h\
+ md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h
# Source code for the core main library
SOURCE+= pkgcache.cc version.cc depcache.cc \
// Config files
Etc "etc/apt/" {
Main "apt.conf";
+ Netrc "auth.conf";
Parts "apt.conf.d/";
Preferences "preferences";
PreferencesParts "preferences.d";
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <map>
#include <apti18n.h>
+
// Internet stuff
#include <netdb.h>
#include "connect.h"
#include "rfc2553emu.h"
#include "http.h"
-
/*}}}*/
using namespace std;
Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
if (Uri.User.empty() == false || Uri.Password.empty() == false)
+ {
+ maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
-
+ }
Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
if (Debug == true)
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
curl_easy_reset(curl);
SetupProxy();
+ 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_WRITEFUNCTION, write_data);
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-26 01:10+0200\n"
+"POT-Creation-Date: 2009-10-16 15:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1897 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1897 methods/ftp.cc:707 methods/connect.cc:112
msgid "Failed"
msgstr ""
msgid "Error reading archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
msgstr ""
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:163
-#: apt-pkg/sourcelist.cc:169 apt-pkg/sourcelist.cc:324 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
+#: methods/ftp.cc:167
msgid "Logging in"
msgstr ""
-#: methods/ftp.cc:168
+#: methods/ftp.cc:173
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:173
+#: methods/ftp.cc:178
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:209 methods/ftp.cc:237
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:210
+#: methods/ftp.cc:215
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:217
+#: methods/ftp.cc:222
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:237
+#: methods/ftp.cc:242
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:265
+#: methods/ftp.cc:270
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:291
+#: methods/ftp.cc:296
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:335
+#: methods/ftp.cc:340
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
+#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
msgid "Read error"
msgstr ""
-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:350 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:367 methods/ftp.cc:379
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
+#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
msgid "Write error"
msgstr ""
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:698
+#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:704
+#: methods/ftp.cc:709
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:722
+#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:736
+#: methods/ftp.cc:741
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:740
+#: methods/ftp.cc:745
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:747
+#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:779
+#: methods/ftp.cc:784
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:789
+#: methods/ftp.cc:794
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:798
+#: methods/ftp.cc:803
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:818
+#: methods/ftp.cc:823
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:825
+#: methods/ftp.cc:830
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:877
+#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr ""
-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:922
+#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:997
+#: methods/ftp.cc:1002
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1109
+#: methods/ftp.cc:1114
msgid "Unable to invoke "
msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:379
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:525
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:533
+#: methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:552 methods/http.cc:559
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:588
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:605
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:629
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:782
+#: methods/http.cc:790
msgid "Select failed"
msgstr ""
-#: methods/http.cc:787
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:810
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:841
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:869
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:883
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:885
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr ""
-#: methods/http.cc:1141
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1158 methods/http.cc:1213
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1305
+#: methods/http.cc:1313
msgid "Internal error"
msgstr ""
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:192 apt-pkg/depcache.cc:196
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:220
+#: apt-pkg/depcache.cc:223
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:226
+#: apt-pkg/depcache.cc:229
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:203
+#: apt-pkg/sourcelist.cc:206
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:243
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:247
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:822
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:851
msgid "Running dpkg"
msgstr ""
projects / apt.git / commitdiff
