X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/259d88d94843fbce7c8100f8b337b7b8fb58b840..8757a0fdeee00ea6a7cc717188a0e129ad8a553c:/apt-pkg/contrib/gpgv.cc diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index f57a72d86..941f901e8 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -2,21 +2,26 @@ // Include Files /*{{{*/ #include +#include +#include +#include +#include +#include + #include #include #include #include #include -#include -#include #include #include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include /*}}}*/ @@ -30,50 +35,51 @@ static char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/ /*}}}*/ // 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. - 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 - 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, - int const &statusfd, int fd[2]) + int const &statusfd, int fd[2], std::string const &key) { #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", CMAKE_INSTALL_FULL_BINDIR "/apt-key"); bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); + struct exiter { + std::vector 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 keyrings; - if (DirectoryExists(trustedPath)) - keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true); - if (RealFileExists(trustedFile) == true) - keyrings.push_back(trustedFile); std::vector 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) @@ -83,13 +89,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, Args.push_back(statusfdstr); } - for (std::vector::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) @@ -103,12 +102,34 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } } + enum { DETACHED, CLEARSIGNED } releaseSignature = (FileGPG != File) ? DETACHED : CLEARSIGNED; std::vector dataHeader; char * sig = NULL; char * data = NULL; + char * conf = nullptr; - // file with detached signature - if (FileGPG != File) + // Dump the configuration so apt-key picks up the correct Dir values + { + conf = GenerateTemporaryFileTemplate("apt.conf"); + if (conf == nullptr) { + ioprintf(std::cerr, "Couldn't create tempfile names for passing config to apt-key"); + local_exit(EINTERNAL); + } + int confFd = mkstemp(conf); + if (confFd == -1) { + ioprintf(std::cerr, "Couldn't create temporary file %s for passing config to apt-key", conf); + local_exit(EINTERNAL); + } + local_exit.files.push_back(conf); + + std::ofstream confStream(conf); + close(confFd); + _config->Dump(confStream); + confStream.close(); + setenv("APT_CONFIG", conf, 1); + } + + if (releaseSignature == DETACHED) { Args.push_back(FileGPG.c_str()); Args.push_back(File.c_str()); @@ -120,19 +141,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()); - exit(EINTERNAL); + local_exit(EINTERNAL); } 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 (dataFd != -1) - unlink(sig); - if (sigFd != -1) - unlink(data); ioprintf(std::cerr, "Couldn't create tempfiles for splitting up %s", File.c_str()); - exit(EINTERNAL); + local_exit(EINTERNAL); } FileFd signature; @@ -143,12 +164,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 (dataFd != -1) - unlink(sig); - if (sigFd != -1) - unlink(data); 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); @@ -158,7 +175,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, if (Debug == true) { - std::clog << "Preparing to exec: " << gpgvpath; + std::clog << "Preparing to exec: "; for (std::vector::const_iterator a = Args.begin(); *a != NULL; ++a) std::clog << " " << *a; std::clog << std::endl; @@ -166,7 +183,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, 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) @@ -181,67 +198,49 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, 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()); - 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 /*{{{*/ @@ -260,8 +259,7 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, 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) @@ -322,6 +320,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); + if (buf != NULL) + free(buf); if (found_signature == true) return _error->Error("Signature in file %s wasn't closed", InFile.c_str()); @@ -350,12 +350,12 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me 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(); - 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)