fix from David Kalnischkies for the InRelease gpg verification

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 24e945b2c3c772d4dfc62d7a024b930302de4a94..960c06180eede581bdb1ebb0ef687189929ba4b3 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,26 +1,36 @@
 #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 <apt-pkg/fileutl.h>
+#include <apt-pkg/indexcopy.h>
+#include <apti18n.h>

 
 

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

 #include <utime.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/wait.h>
 #include <iostream>
 #include <utime.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/wait.h>
 #include <iostream>

+#include <sstream>
+
+#include <vector>

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

+#define GNUPGGOODSIG "[GNUPG:] GOODSIG"
+#define GNUPGKEYEXPIRED "[GNUPG:] KEYEXPIRED"
+#define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG"
+#define GNUPGNODATA "[GNUPG:] NODATA"

 
 class GPGVMethod : public pkgAcqMethod
 {
    private:
 
 class GPGVMethod : public pkgAcqMethod
 {
    private:

-   const char *VerifyGetSigners(const char *file, const char *outfile,
-                               vector<string> &GoodSigners, vector<string> &BadSigners,
+   string VerifyGetSigners(const char *file, const char *outfile,
+                               vector<string> &GoodSigners, 
+                                vector<string> &BadSigners,
+                                vector<string> &WorthlessSigners,

                                vector<string> &NoPubKeySigners);
    
    protected:
                                vector<string> &NoPubKeySigners);
    
    protected:


@@ -31,98 +41,46 @@ class GPGVMethod : public pkgAcqMethod
    GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 
    GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 

-const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
+string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,

                                         vector<string> &GoodSigners,
                                         vector<string> &BadSigners,
                                         vector<string> &GoodSigners,
                                         vector<string> &BadSigners,

+                                        vector<string> &WorthlessSigners,

                                         vector<string> &NoPubKeySigners)
 {
                                         vector<string> &NoPubKeySigners)
 {

-   if (_config->FindB("Debug::Acquire::gpgv", false))
-   {
-      std::cerr << "inside VerifyGetSigners" << std::endl;
-   }
-   pid_t pid;
-   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;
-   }
+   bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
+   // setup a (empty) stringstream for formating the return value
+   std::stringstream ret;
+   ret.str("");

 
 

-   if (stat(pubringpath.c_str(), &buff) != 0)
-      return (string("Couldn't access keyring: ") + strerror(errno)).c_str();
+   if (Debug == true)
+      std::clog << "inside VerifyGetSigners" << std::endl;
+
+   int fd[2];

 
    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)).c_str();
-   }
+      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++] = "--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))
+      _error->PushToStack();
+      bool const success = SigVerify::RunGPGV(outfile, file, 3, fd);
+      if (success == false)

       {
       {

-         std::cerr << "Preparing to exec: " << gpgvpath;
-        for(unsigned int j=0;Args[j] != NULL; j++)
-           std::cerr << " " << Args[j];
-        std::cerr << std::endl;
+        string errmsg;
+        _error->PopMessage(errmsg);
+        _error->RevertToStack();
+        return errmsg;

       }
       }

-      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("LANG=");
-      putenv("LC_ALL=");
-      putenv("LC_MESSAGES=");
-      execvp(gpgvpath.c_str(), (char **)Args);
-             
+      _error->RevertToStack();

       exit(111);
    }
    close(fd[1]);
 
       exit(111);
    }
    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);


@@ -143,8 +101,8 @@ const char *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


@@ -152,56 +110,74 @@ const char *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)));
       }
          NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }

-
-      if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0)
+      if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0)
+      {
+         if (Debug == true)
+            std::clog << "Got NODATA! " << std::endl;
+         BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
+      }
+      if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0)
+      {
+         if (Debug == true)
+            std::clog << "Got KEYEXPIRED! " << std::endl;
+         WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
+      }
+      if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0)
+      {
+         if (Debug == true)
+            std::clog << "Got REVKEYSIG! " << std::endl;
+         WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
+      }
+      if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0)

       {
          char *sig = buffer + sizeof(GNUPGPREFIX);
       {
          char *sig = buffer + sizeof(GNUPGPREFIX);

-         char *p = sig + sizeof("VALIDSIG");
+         char *p = sig + sizeof("GOODSIG");

          while (*p && isxdigit(*p)) 
             p++;
          *p = 0;
          while (*p && isxdigit(*p)) 
             p++;
          *p = 0;

-         if (_config->FindB("Debug::Acquire::gpgv", false))
-            std::cerr << "Got VALIDSIG, 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 (GoodSigners.empty())
    }
    
    if (WEXITSTATUS(status) == 0)
    {
       if (GoodSigners.empty())

-         return "Internal error: Good signature, but could not determine key fingerprint?!";
-      return NULL;
+         return _("Internal error: Good signature, but could not determine key fingerprint?!");
+      return "";

    }
    else if (WEXITSTATUS(status) == 1)
    {
    }
    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 (string("Could not execute ") + gpgvpath +
-             string(" to verify signature (is gnupg installed?)")).c_str();
+      ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)"));
+      return ret.str();

    }
    else
    {
    }
    else
    {

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

    }
 }
 
    }
 }
 


@@ -212,6 +188,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
    string keyID;
    vector<string> GoodSigners;
    vector<string> BadSigners;
    string keyID;
    vector<string> GoodSigners;
    vector<string> BadSigners;

+   // a worthless signature is a expired or revoked one
+   vector<string> WorthlessSigners;

    vector<string> NoPubKeySigners;
    
    FetchResult Res;
    vector<string> NoPubKeySigners;
    
    FetchResult Res;


@@ -219,52 +197,47 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
    URIStart(Res);
 
    // Run gpgv on file, extract contents and get the key ID of the signer
    URIStart(Res);
 
    // Run gpgv on file, extract contents and get the key ID of the signer

-   const char *msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
-                                     GoodSigners, BadSigners, NoPubKeySigners);
+   string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
+                                 GoodSigners, BadSigners, WorthlessSigners,
+                                 NoPubKeySigners);

    if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty())
    {
       string errmsg;
       // In this case, something bad probably happened, so we just go
       // with what the other method gave us for an error message.
    if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty())
    {
       string errmsg;
       // In this case, something bad probably happened, so we just go
       // with what the other method gave us for an error message.

-      if (BadSigners.empty() && NoPubKeySigners.empty())
+      if (BadSigners.empty() && WorthlessSigners.empty() && NoPubKeySigners.empty())

          errmsg = msg;
       else
       {
          if (!BadSigners.empty())
          {
          errmsg = msg;
       else
       {
          if (!BadSigners.empty())
          {

-            errmsg += "The following signatures were invalid:\n";
+            errmsg += _("The following signatures were invalid:\n");

             for (vector<string>::iterator I = BadSigners.begin();
                 I != BadSigners.end(); I++)
                errmsg += (*I + "\n");
          }
             for (vector<string>::iterator I = BadSigners.begin();
                 I != BadSigners.end(); I++)
                errmsg += (*I + "\n");
          }

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

          if (!NoPubKeySigners.empty())
          {
          if (!NoPubKeySigners.empty())
          {

-             errmsg += "The following signatures couldn't be verified because the public key is not available:\n";
+             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++)
                errmsg += (*I + "\n");
          }
       }
             for (vector<string>::iterator I = NoPubKeySigners.begin();
                 I != NoPubKeySigners.end(); I++)
                errmsg += (*I + "\n");
          }
       }

-      return _error->Error(errmsg.c_str());
+      // this is only fatal if we have no good sigs or if we have at
+      // least one bad signature. good signatures and NoPubKey signatures
+      // happen easily when a file is signed with multiple signatures
+      if(GoodSigners.empty() or !BadSigners.empty())
+        return _error->Error("%s", errmsg.c_str());

    }
       
    }
       

-   // Transfer the modification times
-   struct stat Buf;
-   if (stat(Path.c_str(),&Buf) != 0)
-      return _error->Errno("stat","Failed to stat %s", Path.c_str());
-
-   struct utimbuf TimeBuf;
-   TimeBuf.actime = Buf.st_atime;
-   TimeBuf.modtime = Buf.st_mtime;
-   if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
-      return _error->Errno("utime","Failed to set modification time");
-
-   if (stat(Itm->DestFile.c_str(),&Buf) != 0)
-      return _error->Errno("stat","Failed to stat");
-   
-   // Return a Done response
-   Res.LastModified = Buf.st_mtime;
-   Res.Size = Buf.st_size;

    // Just pass the raw output up, because passing it as a real data
    // structure is too difficult with the method stuff.  We keep it
    // as three separate vectors for future extensibility.
    // Just pass the raw output up, because passing it as a real data
    // structure is too difficult with the method stuff.  We keep it
    // as three separate vectors for future extensibility.


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

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

    }
 
    return true;
    }
 
    return true;


@@ -284,6 +257,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+   

    GPGVMethod Mth;
 
    return Mth.Run();
    GPGVMethod Mth;
 
    return Mth.Run();