ExecGPGV: Fork in all cases

[apt.git] / apt-pkg / contrib / gpgv.cc

diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index f57a72d8640fe099c451357eb39ba52aaaaf7327..4247a1562073e983901cb997ba28d641810b3c51 100644 (file)
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -2,21 +2,25 @@
 // Include Files                                                       /*{{{*/
 #include<config.h>
 
 // Include Files                                                       /*{{{*/
 #include<config.h>
 

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

 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>

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

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

+#include <stddef.h>

 
 

-#include<apt-pkg/configuration.h>
-#include<apt-pkg/error.h>
-#include<apt-pkg/strutl.h>
-#include<apt-pkg/fileutl.h>
-#include<apt-pkg/gpgv.h>
+#include <algorithm>
+#include <iostream>
+#include <string>
+#include <vector>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -30,50 +34,51 @@ static char * GenerateTemporaryFileTemplate(const char *basename)   /*{{{*/
                                                                        /*}}}*/
 // ExecGPGV - returns the command needed for verify                    /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ExecGPGV - returns the command needed for verify                    /*{{{*/
 // ---------------------------------------------------------------------

-/* Generating the commandline for calling gpgv is somehow complicated as
+/* Generating the commandline for calling gpg is somehow complicated as

    we need to add multiple keyrings and user supplied options.
    we need to add multiple keyrings and user supplied options.

-   Also, as gpgv has no options to enforce a certain reduced style of
+   Also, as gpg has no options to enforce a certain reduced style of

    clear-signed files (=the complete content of the file is signed and
    the content isn't encoded) we do a divide and conquer approach here
    clear-signed files (=the complete content of the file is signed and
    the content isn't encoded) we do a divide and conquer approach here

-   and split up the clear-signed file in message and signature for gpgv
+   and split up the clear-signed file in message and signature for gpg.
+   And as a cherry on the cake, we use our apt-key wrapper to do part
+   of the lifting in regards to merging keyrings. Fun for the whole family.

 */
 void ExecGPGV(std::string const &File, std::string const &FileGPG,
 */
 void ExecGPGV(std::string const &File, std::string const &FileGPG,

-             int const &statusfd, int fd[2])
+             int const &statusfd, int fd[2], std::string const &key)

 {
    #define EINTERNAL 111
 {
    #define EINTERNAL 111

-   std::string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
-   // FIXME: remove support for deprecated APT::GPGV setting
-   std::string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));
-   std::string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts");
+   std::string const aptkey = _config->Find("Dir::Bin::apt-key", "/usr/bin/apt-key");

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

+   struct exiter {
+      std::vector<const char *> files;
+      void operator ()(int code) APT_NORETURN {
+        std::for_each(files.begin(), files.end(), unlink);
+        exit(code);
+      }
+   } local_exit;

 
 

-   if (Debug == true)
-   {
-      std::clog << "gpgv path: " << gpgvpath << std::endl;
-      std::clog << "Keyring file: " << trustedFile << std::endl;
-      std::clog << "Keyring path: " << trustedPath << std::endl;
-   }
-
-   std::vector<std::string> keyrings;
-   if (DirectoryExists(trustedPath))
-     keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
-   if (RealFileExists(trustedFile) == true)
-     keyrings.push_back(trustedFile);

 
    std::vector<const char *> Args;
 
    std::vector<const char *> Args;

-   Args.reserve(30);
+   Args.reserve(10);

 
 

-   if (keyrings.empty() == true)
+   Args.push_back(aptkey.c_str());
+   Args.push_back("--quiet");
+   Args.push_back("--readonly");
+   if (key.empty() == false)

    {
    {

-      // TRANSLATOR: %s is the trusted keyring parts directory
-      ioprintf(std::cerr, _("No keyring installed in %s."),
-           _config->FindDir("Dir::Etc::TrustedParts").c_str());
-      exit(EINTERNAL);
+      if (key[0] == '/')
+      {
+        Args.push_back("--keyring");
+        Args.push_back(key.c_str());
+      }
+      else
+      {
+        Args.push_back("--keyid");
+        Args.push_back(key.c_str());
+      }

    }
    }

-
-   Args.push_back(gpgvpath.c_str());
-   Args.push_back("--ignore-time-conflict");
+   Args.push_back("verify");

 
    char statusfdstr[10];
    if (statusfd != -1)
 
    char statusfdstr[10];
    if (statusfd != -1)


@@ -83,13 +88,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       Args.push_back(statusfdstr);
    }
 
       Args.push_back(statusfdstr);
    }
 

-   for (std::vector<std::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)
    Configuration::Item const *Opts;
    Opts = _config->Tree("Acquire::gpgv::Options");
    if (Opts != 0)


@@ -103,12 +101,12 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       }
    }
 
       }
    }
 

+   enum  { DETACHED, CLEARSIGNED } releaseSignature = (FileGPG != File) ? DETACHED : CLEARSIGNED;

    std::vector<std::string> dataHeader;
    char * sig = NULL;
    char * data = NULL;
 
    std::vector<std::string> dataHeader;
    char * sig = NULL;
    char * data = NULL;
 

-   // file with detached signature
-   if (FileGPG != File)
+   if (releaseSignature == DETACHED)

    {
       Args.push_back(FileGPG.c_str());
       Args.push_back(File.c_str());
    {
       Args.push_back(FileGPG.c_str());
       Args.push_back(File.c_str());


@@ -120,19 +118,19 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       if (sig == NULL || data == NULL)
       {
         ioprintf(std::cerr, "Couldn't create tempfile names for splitting up %s", File.c_str());
       if (sig == NULL || data == NULL)
       {
         ioprintf(std::cerr, "Couldn't create tempfile names for splitting up %s", File.c_str());

-        exit(EINTERNAL);
+        local_exit(EINTERNAL);

       }
 
       int const sigFd = mkstemp(sig);
       int const dataFd = mkstemp(data);
       }
 
       int const sigFd = mkstemp(sig);
       int const dataFd = mkstemp(data);

+      if (dataFd != -1)
+        local_exit.files.push_back(data);
+      if (sigFd != -1)
+        local_exit.files.push_back(sig);

       if (sigFd == -1 || dataFd == -1)
       {
       if (sigFd == -1 || dataFd == -1)
       {

-        if (dataFd != -1)
-           unlink(sig);
-        if (sigFd != -1)
-           unlink(data);

         ioprintf(std::cerr, "Couldn't create tempfiles for splitting up %s", File.c_str());
         ioprintf(std::cerr, "Couldn't create tempfiles for splitting up %s", File.c_str());

-        exit(EINTERNAL);
+        local_exit(EINTERNAL);

       }
 
       FileFd signature;
       }
 
       FileFd signature;


@@ -143,12 +141,8 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       if (signature.Failed() == true || message.Failed() == true ||
            SplitClearSignedFile(File, &message, &dataHeader, &signature) == false)
       {
       if (signature.Failed() == true || message.Failed() == true ||
            SplitClearSignedFile(File, &message, &dataHeader, &signature) == false)
       {

-        if (dataFd != -1)
-           unlink(sig);
-        if (sigFd != -1)
-           unlink(data);

         ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str());
         ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str());

-        exit(112);
+        local_exit(112);

       }
       Args.push_back(sig);
       Args.push_back(data);
       }
       Args.push_back(sig);
       Args.push_back(data);


@@ -158,7 +152,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
 
    if (Debug == true)
    {
 
    if (Debug == true)
    {

-      std::clog << "Preparing to exec: " << gpgvpath;
+      std::clog << "Preparing to exec: ";

       for (std::vector<const char *>::const_iterator a = Args.begin(); *a != NULL; ++a)
         std::clog << " " << *a;
       std::clog << std::endl;
       for (std::vector<const char *>::const_iterator a = Args.begin(); *a != NULL; ++a)
         std::clog << " " << *a;
       std::clog << std::endl;


@@ -166,7 +160,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
 
    if (statusfd != -1)
    {
 
    if (statusfd != -1)
    {

-      int const nullfd = open("/dev/null", O_RDONLY);
+      int const nullfd = open("/dev/null", O_WRONLY);

       close(fd[0]);
       // Redirect output to /dev/null; we read from the status fd
       if (statusfd != STDOUT_FILENO)
       close(fd[0]);
       // Redirect output to /dev/null; we read from the status fd
       if (statusfd != STDOUT_FILENO)


@@ -181,67 +175,49 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       putenv((char *)"LC_MESSAGES=");
    }
 
       putenv((char *)"LC_MESSAGES=");
    }
 

-   if (FileGPG != File)
+
+   // We have created tempfiles we have to clean up
+   // and we do an additional check, so fork yet another time …
+   pid_t pid = ExecFork();
+   if(pid < 0) {
+      ioprintf(std::cerr, "Fork failed for %s to check %s", Args[0], File.c_str());
+      local_exit(EINTERNAL);
+   }
+   if(pid == 0)

    {
    {

-      execvp(gpgvpath.c_str(), (char **) &Args[0]);
+      if (statusfd != -1)
+        dup2(fd[1], statusfd);
+      execvp(Args[0], (char **) &Args[0]);

       ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());
       ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());

-      exit(EINTERNAL);
+      local_exit(EINTERNAL);

    }
    }

-   else
-   {
-//#define UNLINK_EXIT(X) exit(X)
-#define UNLINK_EXIT(X) unlink(sig);unlink(data);exit(X)
-
-      // for clear-signed files we have created tempfiles we have to clean up
-      // and we do an additional check, so fork yet another time …
-      pid_t pid = ExecFork();
-      if(pid < 0) {
-        ioprintf(std::cerr, "Fork failed for %s to check %s", Args[0], File.c_str());
-        UNLINK_EXIT(EINTERNAL);
-      }
-      if(pid == 0)
-      {
-        if (statusfd != -1)
-           dup2(fd[1], statusfd);
-        execvp(gpgvpath.c_str(), (char **) &Args[0]);
-        ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());
-        UNLINK_EXIT(EINTERNAL);
-      }

 
 

-      // Wait and collect the error code - taken from WaitPid as we need the exact Status
-      int Status;
-      while (waitpid(pid,&Status,0) != pid)
-      {
-        if (errno == EINTR)
-           continue;
-        ioprintf(std::cerr, _("Waited for %s but it wasn't there"), "gpgv");
-        UNLINK_EXIT(EINTERNAL);
-      }
-#undef UNLINK_EXIT
-      // we don't need the files any longer
-      unlink(sig);
-      unlink(data);
-      free(sig);
-      free(data);
-
-      // check if it exit'ed normally …
-      if (WIFEXITED(Status) == false)
-      {
-        ioprintf(std::cerr, _("Sub-process %s exited unexpectedly"), "gpgv");
-        exit(EINTERNAL);
-      }
+   // Wait and collect the error code - taken from WaitPid as we need the exact Status
+   int Status;
+   while (waitpid(pid,&Status,0) != pid)
+   {
+      if (errno == EINTR)
+        continue;
+      ioprintf(std::cerr, _("Waited for %s but it wasn't there"), "apt-key");
+      local_exit(EINTERNAL);
+   }

 
 

-      // … and with a good exit code
-      if (WEXITSTATUS(Status) != 0)
-      {
-        ioprintf(std::cerr, _("Sub-process %s returned an error code (%u)"), "gpgv", WEXITSTATUS(Status));
-        exit(WEXITSTATUS(Status));
-      }
+   // check if it exit'ed normally …
+   if (WIFEXITED(Status) == false)
+   {
+      ioprintf(std::cerr, _("Sub-process %s exited unexpectedly"), "apt-key");
+      local_exit(EINTERNAL);
+   }

 
 

-      // everything fine
-      exit(0);
+   // … and with a good exit code
+   if (WEXITSTATUS(Status) != 0)
+   {
+      ioprintf(std::cerr, _("Sub-process %s returned an error code (%u)"), "apt-key", WEXITSTATUS(Status));
+      local_exit(WEXITSTATUS(Status));

    }
    }

-   exit(EINTERNAL); // unreachable safe-guard
+
+   // everything fine
+   local_exit(0);

 }
                                                                        /*}}}*/
 // SplitClearSignedFile - split message into data/signature            /*{{{*/
 }
                                                                        /*}}}*/
 // SplitClearSignedFile - split message into data/signature            /*{{{*/


@@ -260,8 +236,7 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
 
    char *buf = NULL;
    size_t buf_size = 0;
 
    char *buf = NULL;
    size_t buf_size = 0;

-   ssize_t line_len = 0;
-   while ((line_len = getline(&buf, &buf_size, in)) != -1)
+   while (getline(&buf, &buf_size, in) != -1)

    {
       _strrstrip(buf);
       if (found_message_start == false)
    {
       _strrstrip(buf);
       if (found_message_start == false)


@@ -322,6 +297,8 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
       // all the rest is whitespace, unsigned garbage or additional message blocks we ignore
    }
    fclose(in);
       // all the rest is whitespace, unsigned garbage or additional message blocks we ignore
    }
    fclose(in);

+   if (buf != NULL)
+      free(buf);

 
    if (found_signature == true)
       return _error->Error("Signature in file %s wasn't closed", InFile.c_str());
 
    if (found_signature == true)
       return _error->Error("Signature in file %s wasn't closed", InFile.c_str());


@@ -350,12 +327,12 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me
    unlink(message);
    free(message);
 
    unlink(message);
    free(message);
 

-   MessageFile.OpenDescriptor(messageFd, FileFd::ReadWrite, true);
+   MessageFile.OpenDescriptor(messageFd, FileFd::ReadWrite | FileFd::BufferedWrite, true);

    if (MessageFile.Failed() == true)
       return _error->Error("Couldn't open temporary file to work with %s", ClearSignedFileName.c_str());
 
    _error->PushToStack();
    if (MessageFile.Failed() == true)
       return _error->Error("Couldn't open temporary file to work with %s", ClearSignedFileName.c_str());
 
    _error->PushToStack();

-   bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), &MessageFile, NULL, NULL);
+   bool const splitDone = SplitClearSignedFile(ClearSignedFileName, &MessageFile, NULL, NULL);

    bool const errorDone = _error->PendingError();
    _error->MergeWithStack();
    if (splitDone == false)
    bool const errorDone = _error->PendingError();
    _error->MergeWithStack();
    if (splitDone == false)