Merge remote-tracking branch 'mvo/feature/apt-install-deb' into debian/experimental

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index a149d67ddae8a3450042f2a1551f65b32c946d1e..ae521a2edbd6d831e6a1ecf52d20f080f306133a 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,19 +1,28 @@
-#include <apt-pkg/error.h>
+#include <config.h>
+

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

+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/gpgv.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/fileutl.h>
-#include <apti18n.h>

 
 

-#include <utime.h>
-#include <stdio.h>
-#include <fcntl.h>
+#include <ctype.h>

 #include <errno.h>
 #include <errno.h>

+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

+#include <unistd.h>

 #include <iostream>
 #include <iostream>

-#include <sstream>
-
+#include <string>

 #include <vector>
 
 #include <vector>
 

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

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


@@ -47,104 +56,24 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<string> &NoPubKeySigners)
 {
    bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
                                         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("");

 
    if (Debug == true)
       std::clog << "inside VerifyGetSigners" << std::endl;
 
 
    if (Debug == true)
       std::clog << "inside VerifyGetSigners" << std::endl;
 

-   pid_t pid;

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

-   FILE *pipein;
-   int status;
-   string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
-   // FIXME: remove support for deprecated APT::GPGV setting
-   string const trustedFile = _config->FindFile("Dir::Etc::Trusted",
-                       _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str());
-   string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d");
-   if (Debug == true)
-   {
-      std::clog << "gpgv path: " << gpgvpath << std::endl;
-      std::clog << "Keyring file: " << trustedFile << std::endl;
-      std::clog << "Keyring path: " << trustedPath << std::endl;
-   }
-
-   vector<string> keyrings = GetListOfFilesInDir(trustedPath, "gpg", false);
-   if (FileExists(trustedFile) == true)
-      keyrings.push_back(trustedFile);
-
-   if (keyrings.empty() == true)
-   {
-      // TRANSLATOR: %s is the trusted keyring parts directory
-      ioprintf(ret, _("No keyring installed in %s."), trustedPath.c_str());
-      return ret.str();
-   }

 
    if (pipe(fd) < 0)
       return "Couldn't create pipe";
 
 
    if (pipe(fd) < 0)
       return "Couldn't create pipe";
 

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

    if (pid < 0)
       return string("Couldn't spawn new process") + strerror(errno);
    else if (pid == 0)
    if (pid < 0)
       return string("Couldn't spawn new process") + strerror(errno);
    else if (pid == 0)

-   {
-      std::vector<const char *> Args;
-      Args.reserve(30);
-
-      Args.push_back(gpgvpath.c_str());
-      Args.push_back("--status-fd");
-      Args.push_back("3");
-      Args.push_back("--ignore-time-conflict");
-      for (vector<string>::const_iterator K = keyrings.begin();
-          K != keyrings.end(); ++K)
-      {
-        Args.push_back("--keyring");
-        Args.push_back(K->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.push_back(Opts->Value.c_str());
-         }
-      }
-      Args.push_back(file);
-      Args.push_back(outfile);
-      Args.push_back(NULL);
-
-      if (Debug == true)
-      {
-         std::clog << "Preparing to exec: " << gpgvpath;
-        for(std::vector<const char *>::const_iterator a = Args.begin();*a != NULL; ++a)
-           std::clog << " " << *a;
-        std::clog << std::endl;
-      }
-      int const 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[0]);
-             
-      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);


@@ -156,8 +85,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++;
       }


@@ -216,7 +153,9 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       }
    }
    fclose(pipein);
       }
    }
    fclose(pipein);

+   free(buffer);

 
 

+   int status;

    waitpid(pid, &status, 0);
    if (Debug == true)
    {
    waitpid(pid, &status, 0);
    if (Debug == true)
    {


@@ -230,18 +169,19 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       return "";
    }
    else if (WEXITSTATUS(status) == 1)
       return "";
    }
    else if (WEXITSTATUS(status) == 1)

-   {

       return _("At least one invalid signature was encountered.");
       return _("At least one invalid signature was encountered.");

-   }

    else if (WEXITSTATUS(status) == 111)
    else if (WEXITSTATUS(status) == 111)

+      return _("Could not execute 'gpgv' to verify signature (is gpgv installed?)");
+   else if (WEXITSTATUS(status) == 112)

    {
    {

-      ioprintf(ret, _("Could not execute '%s' to verify signature (is gpgv installed?)"), gpgvpath.c_str());
-      return ret.str();
+      // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings)
+      std::string errmsg;
+      //TRANSLATORS: %s is a single techy word like 'NODATA'
+      strprintf(errmsg, _("Clearsigned file isn't valid, got '%s' (does the network require authentication?)"), "NODATA");
+      return errmsg;

    }
    else
    }
    else

-   {

       return _("Unknown error executing gpgv");
       return _("Unknown error executing gpgv");

-   }

 }
 
 bool GPGVMethod::Fetch(FetchItem *Itm)
 }
 
 bool GPGVMethod::Fetch(FetchItem *Itm)


@@ -276,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");
          }
       }