Merge branch 'debian/experimental' into feature/srv-records

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 2b2aba017c45e6df20968700b45f2d4172c21491..41f138be64d12b663896aca6129aad3b68d2498c 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,19 +1,22 @@
 #include <config.h>
 
 #include <config.h>
 

-#include <apt-pkg/error.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/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/indexcopy.h>
-#include <apt-pkg/configuration.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 <apti18n.h>
 #include <vector>
 
 #include <apti18n.h>


@@ -41,12 +44,22 @@ class GPGVMethod : public pkgAcqMethod
    
    protected:
    virtual bool Fetch(FetchItem *Itm);
    
    protected:
    virtual bool Fetch(FetchItem *Itm);

-   
+   virtual bool Configuration(string Message);

    public:
    
    GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 
    public:
    
    GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 

+bool GPGVMethod::Configuration(string Message)
+{
+   if (pkgAcqMethod::Configuration(Message) == false)
+      return false;
+
+   DropPrivsOrDie();
+
+   return true;
+}
+

 string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<string> &GoodSigners,
                                         vector<string> &BadSigners,
 string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<string> &GoodSigners,
                                         vector<string> &BadSigners,


@@ -54,9 +67,6 @@ 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;


@@ -70,43 +80,18 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    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)

-   {
-      _error->PushToStack();
-      bool const success = SigVerify::RunGPGV(outfile, file, 3, fd);
-      if (success == false)
-      {
-        string errmsg;
-        _error->PopMessage(errmsg);
-        _error->RevertToStack();
-        return errmsg;
-      }
-      _error->RevertToStack();
-      exit(111);
-   }
+      ExecGPGV(outfile, file, 3, fd);

    close(fd[1]);
 
    FILE *pipein = fdopen(fd[0], "r");
 
    close(fd[1]);
 
    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);
-   size_t bufferoff = 0;
+   // Loop over the output of apt-key (which really is gnupg), and check the signatures.
+   size_t buffersize = 0;
+   char *buffer = NULL;

    while (1)
    {
    while (1)
    {

-      int c;
-
-      // Read a line.  Sigh.
-      while ((c = getc(pipein)) != EOF && c != '\n')
-      {
-         if (bufferoff == buffersize)
-            buffer = (char *) realloc(buffer, buffersize *= 2);
-         *(buffer+bufferoff) = c;
-         bufferoff++;
-      }
-      if (bufferoff == 0 && c == EOF)
-         break;
-      *(buffer+bufferoff) = '\0';
-      bufferoff = 0;
+      if (getline(&buffer, &buffersize, pipein) == -1)
+        break;

       if (Debug == true)
          std::clog << "Read: " << buffer << std::endl;
 
       if (Debug == true)
          std::clog << "Read: " << buffer << std::endl;
 


@@ -120,7 +105,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
             std::clog << "Got BADSIG! " << std::endl;
          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
             std::clog << "Got BADSIG! " << std::endl;
          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }

-      
+

       if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {
          if (Debug == true)
       if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {
          if (Debug == true)


@@ -158,12 +143,13 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       }
    }
    fclose(pipein);
       }
    }
    fclose(pipein);

+   free(buffer);

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

-      std::clog << "gpgv exited\n";
+      ioprintf(std::clog, "gpgv exited with status %i\n", WEXITSTATUS(status));

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


@@ -173,18 +159,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 'apt-key' to verify signature (is gnupg installed?)");
+   else if (WEXITSTATUS(status) == 112)

    {
    {

-      ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)"));
-      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 apt-key");

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


@@ -202,7 +189,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
    Res.Filename = Itm->DestFile;
    URIStart(Res);
 
    Res.Filename = Itm->DestFile;
    URIStart(Res);
 

-   // Run gpgv on file, extract contents and get the key ID of the signer
+   // Run apt-key on file, extract contents and get the key ID of the signer

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


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

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

    }
 
    return true;
    }
 
    return true;


@@ -264,7 +251,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
 int main()
 {
    setlocale(LC_ALL, "");
 int main()
 {
    setlocale(LC_ALL, "");

-   
+

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