merged lp:~mvo/apt/add-missing-dsc-hashes

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 150c1d315ebe33ee530150a20e8a72c1c6b2bf16..3f814b9f0aa5c394bca23ecc87e3c0ece12bfaee 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,10 +1,13 @@
+#include <config.h>
+

 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>

-#include <apti18n.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexcopy.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/gpgv.h>

 
 

-#include <sys/stat.h>
-#include <unistd.h>

 #include <utime.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <utime.h>
 #include <stdio.h>
 #include <fcntl.h>


@@ -12,6 +15,12 @@
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>

+#include <vector>
+
+#include <apti18n.h>
+
+using std::string;
+using std::vector;

 
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"


@@ -45,100 +54,28 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<string> &WorthlessSigners,
                                         vector<string> &NoPubKeySigners)
 {
                                         vector<string> &WorthlessSigners,
                                         vector<string> &NoPubKeySigners)
 {

+   bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);

    // setup a (empty) stringstream for formating the return value
    std::stringstream ret;
    ret.str("");
 
    // setup a (empty) stringstream for formating the return value
    std::stringstream ret;
    ret.str("");
 

-   if (_config->FindB("Debug::Acquire::gpgv", false))
-   {
-      std::cerr << "inside VerifyGetSigners" << std::endl;
-   }
-   pid_t pid;
+   if (Debug == true)
+      std::clog << "inside VerifyGetSigners" << std::endl;
+

    int fd[2];
    int fd[2];

-   FILE *pipein;
-   int status;
-   struct stat buff;
-   string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
-   string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
-   if (_config->FindB("Debug::Acquire::gpgv", false))
-   {
-      std::cerr << "gpgv path: " << gpgvpath << std::endl;
-      std::cerr << "Keyring path: " << pubringpath << std::endl;
-   }

 
 

-   if (stat(pubringpath.c_str(), &buff) != 0) 
-   {
-      ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno)); 
-      return ret.str();
-   }

    if (pipe(fd) < 0)
    if (pipe(fd) < 0)

-   {

       return "Couldn't create pipe";
       return "Couldn't create pipe";

-   }

 
 

-   pid = fork();
+   pid_t pid = fork();

    if (pid < 0)
    if (pid < 0)

-   {

       return string("Couldn't spawn new process") + strerror(errno);
       return string("Couldn't spawn new process") + strerror(errno);

-   }

    else if (pid == 0)
    else if (pid == 0)

-   {
-      const char *Args[400];
-      unsigned int i = 0;
-
-      Args[i++] = gpgvpath.c_str();
-      Args[i++] = "--status-fd";
-      Args[i++] = "3";
-      Args[i++] = "--ignore-time-conflict";
-      Args[i++] = "--keyring";
-      Args[i++] = pubringpath.c_str();
-
-      Configuration::Item const *Opts;
-      Opts = _config->Tree("Acquire::gpgv::Options");
-      if (Opts != 0)
-      {
-         Opts = Opts->Child;
-        for (; Opts != 0; Opts = Opts->Next)
-         {
-            if (Opts->Value.empty() == true)
-               continue;
-            Args[i++] = Opts->Value.c_str();
-           if(i >= 395) { 
-              std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl;
-              exit(111);
-           }
-         }
-      }
-      Args[i++] = file;
-      Args[i++] = outfile;
-      Args[i++] = NULL;
-
-      if (_config->FindB("Debug::Acquire::gpgv", false))
-      {
-         std::cerr << "Preparing to exec: " << gpgvpath;
-        for(unsigned int j=0;Args[j] != NULL; j++)
-           std::cerr << " " << Args[j];
-        std::cerr << std::endl;
-      }
-      int nullfd = open("/dev/null", O_RDONLY);
-      close(fd[0]);
-      // Redirect output to /dev/null; we read from the status fd
-      dup2(nullfd, STDOUT_FILENO); 
-      dup2(nullfd, STDERR_FILENO); 
-      // Redirect the pipe to the status fd (3)
-      dup2(fd[1], 3);
-
-      putenv((char *)"LANG=");
-      putenv((char *)"LC_ALL=");
-      putenv((char *)"LC_MESSAGES=");
-      execvp(gpgvpath.c_str(), (char **)Args);
-             
-      exit(111);
-   }
+      ExecGPGV(outfile, file, 3, fd);

    close(fd[1]);
 
    close(fd[1]);
 

-   pipein = fdopen(fd[0], "r"); 
-   
+   FILE *pipein = fdopen(fd[0], "r");
+

    // Loop over the output of gpgv, and check the signatures.
    size_t buffersize = 64;
    char *buffer = (char *) malloc(buffersize);
    // Loop over the output of gpgv, and check the signatures.
    size_t buffersize = 64;
    char *buffer = (char *) malloc(buffersize);


@@ -150,8 +87,16 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       // Read a line.  Sigh.
       while ((c = getc(pipein)) != EOF && c != '\n')
       {
       // Read a line.  Sigh.
       while ((c = getc(pipein)) != EOF && c != '\n')
       {

-         if (bufferoff == buffersize)
-            buffer = (char *) realloc(buffer, buffersize *= 2);
+        if (bufferoff == buffersize)
+        {
+           char* newBuffer = (char *) realloc(buffer, buffersize *= 2);
+           if (newBuffer == NULL)
+           {
+              free(buffer);
+              return "Couldn't allocate a buffer big enough for reading";
+           }
+           buffer = newBuffer;
+        }

          *(buffer+bufferoff) = c;
          bufferoff++;
       }
          *(buffer+bufferoff) = c;
          bufferoff++;
       }


@@ -159,8 +104,8 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
          break;
       *(buffer+bufferoff) = '\0';
       bufferoff = 0;
          break;
       *(buffer+bufferoff) = '\0';
       bufferoff = 0;

-      if (_config->FindB("Debug::Acquire::gpgv", false))
-         std::cerr << "Read: " << buffer << std::endl;
+      if (Debug == true)
+         std::clog << "Read: " << buffer << std::endl;

 
       // Push the data into three separate vectors, which
       // we later concatenate.  They're kept separate so
 
       // Push the data into three separate vectors, which
       // we later concatenate.  They're kept separate so


@@ -168,33 +113,33 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       // it will be better.
       if (strncmp(buffer, GNUPGBADSIG, sizeof(GNUPGBADSIG)-1) == 0)
       {
       // it will be better.
       if (strncmp(buffer, GNUPGBADSIG, sizeof(GNUPGBADSIG)-1) == 0)
       {

-         if (_config->FindB("Debug::Acquire::gpgv", false))
-            std::cerr << "Got BADSIG! " << std::endl;
+         if (Debug == true)
+            std::clog << "Got BADSIG! " << std::endl;

          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       
       if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {
          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       
       if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {

-         if (_config->FindB("Debug::Acquire::gpgv", false))
-            std::cerr << "Got NO_PUBKEY " << std::endl;
+         if (Debug == true)
+            std::clog << "Got NO_PUBKEY " << std::endl;

          NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0)
       {
          NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0)
       {

-         if (_config->FindB("Debug::Acquire::gpgv", false))
-            std::cerr << "Got NODATA! " << std::endl;
+         if (Debug == true)
+            std::clog << "Got NODATA! " << std::endl;

          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0)
       {
          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0)
       {

-         if (_config->FindB("Debug::Acquire::gpgv", false))
-            std::cerr << "Got KEYEXPIRED! " << std::endl;
+         if (Debug == true)
+            std::clog << "Got KEYEXPIRED! " << std::endl;

          WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0)
       {
          WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0)
       {

-         if (_config->FindB("Debug::Acquire::gpgv", false))
-            std::cerr << "Got REVKEYSIG! " << std::endl;
+         if (Debug == true)
+            std::clog << "Got REVKEYSIG! " << std::endl;

          WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0)
          WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
       if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0)


@@ -204,17 +149,18 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
          while (*p && isxdigit(*p)) 
             p++;
          *p = 0;
          while (*p && isxdigit(*p)) 
             p++;
          *p = 0;

-         if (_config->FindB("Debug::Acquire::gpgv", false))
-            std::cerr << "Got GOODSIG, key ID:" << sig << std::endl;
+         if (Debug == true)
+            std::clog << "Got GOODSIG, key ID:" << sig << std::endl;

          GoodSigners.push_back(string(sig));
       }
    }
    fclose(pipein);
 
          GoodSigners.push_back(string(sig));
       }
    }
    fclose(pipein);
 

+   int status;

    waitpid(pid, &status, 0);
    waitpid(pid, &status, 0);

-   if (_config->FindB("Debug::Acquire::gpgv", false))
+   if (Debug == true)

    {
    {

-      std::cerr << "gpgv exited\n";
+      std::clog << "gpgv exited\n";

    }
    
    if (WEXITSTATUS(status) == 0)
    }
    
    if (WEXITSTATUS(status) == 0)


@@ -229,7 +175,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    }
    else if (WEXITSTATUS(status) == 111)
    {
    }
    else if (WEXITSTATUS(status) == 111)
    {

-      ioprintf(ret, _("Could not execute '%s' to verify signature (is gpgv installed?)"), gpgvpath.c_str());
+      ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)"));

       return ret.str();
    }
    else
       return ret.str();
    }
    else


@@ -270,21 +216,21 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = BadSigners.begin();
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = BadSigners.begin();

-                I != BadSigners.end(); I++)
+                I != BadSigners.end(); ++I)

                errmsg += (*I + "\n");
          }
          if (!WorthlessSigners.empty())
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = WorthlessSigners.begin();
                errmsg += (*I + "\n");
          }
          if (!WorthlessSigners.empty())
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = WorthlessSigners.begin();

-                I != WorthlessSigners.end(); I++)
+                I != WorthlessSigners.end(); ++I)

                errmsg += (*I + "\n");
          }
          if (!NoPubKeySigners.empty())
          {
              errmsg += _("The following signatures couldn't be verified because the public key is not available:\n");
             for (vector<string>::iterator I = NoPubKeySigners.begin();
                errmsg += (*I + "\n");
          }
          if (!NoPubKeySigners.empty())
          {
              errmsg += _("The following signatures couldn't be verified because the public key is not available:\n");
             for (vector<string>::iterator I = NoPubKeySigners.begin();

-                I != NoPubKeySigners.end(); I++)
+                I != NoPubKeySigners.end(); ++I)

                errmsg += (*I + "\n");
          }
       }
                errmsg += (*I + "\n");
          }
       }


@@ -305,7 +251,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
 
    if (_config->FindB("Debug::Acquire::gpgv", false))
    {
 
    if (_config->FindB("Debug::Acquire::gpgv", false))
    {

-      std::cerr << "gpgv succeeded\n";
+      std::clog << "gpgv succeeded\n";

    }
 
    return true;
    }
 
    return true;