#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
+#include <apti18n.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <sys/wait.h>
#include <iostream>
+#include <sstream>
#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:
- 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:
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> &WorthlessSigners,
vector<string> &NoPubKeySigners)
{
+ // setup a (empty) stringstream for formating the return value
+ std::stringstream ret;
+ ret.str("");
+
if (_config->FindB("Debug::Acquire::gpgv", false))
{
std::cerr << "inside VerifyGetSigners" << std::endl;
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");
+ 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;
}
- if (stat(pubringpath.c_str(), &buff) != 0)
- return (string("Couldn't access keyring: ") + strerror(errno)).c_str();
-
+ if (stat(pubringpath.c_str(), &buff) != 0)
+ {
+ ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno));
+ return ret.str();
+ }
if (pipe(fd) < 0)
{
return "Couldn't create pipe";
pid = fork();
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)
{
Args[i++] = gpgvpath.c_str();
Args[i++] = "--status-fd";
Args[i++] = "3";
+ Args[i++] = "--ignore-time-conflict";
Args[i++] = "--keyring";
Args[i++] = pubringpath.c_str();
continue;
Args[i++] = Opts->Value.c_str();
if(i >= 395) {
- std::cerr << "E: Argument list from Acquire::gpgv::Options too long. Exiting." << std::endl;
+ std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl;
exit(111);
}
}
if (_config->FindB("Debug::Acquire::gpgv", false))
{
std::cerr << "Preparing to exec: " << gpgvpath;
- int j;
- for(j=0;Args[j] != NULL; j++)
- std::cerr << Args[j] << " ";
+ for(unsigned int j=0;Args[j] != NULL; j++)
+ std::cerr << " " << Args[j];
std::cerr << std::endl;
}
int nullfd = open("/dev/null", O_RDONLY);
// Redirect the pipe to the status fd (3)
dup2(fd[1], 3);
- putenv("LANG=");
- putenv("LC_ALL=");
- putenv("LC_MESSAGES=");
+ putenv((char *)"LANG=");
+ putenv((char *)"LC_ALL=");
+ putenv((char *)"LC_MESSAGES=");
execvp(gpgvpath.c_str(), (char **)Args);
exit(111);
std::cerr << "Got NO_PUBKEY " << std::endl;
NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
-
- if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0)
+ if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::gpgv", false))
+ std::cerr << "Got NODATA! " << std::endl;
+ BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
+ }
+ if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::gpgv", false))
+ std::cerr << "Got KEYEXPIRED! " << std::endl;
+ WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
+ }
+ if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::gpgv", false))
+ std::cerr << "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 *p = sig + sizeof("VALIDSIG");
+ char *p = sig + sizeof("GOODSIG");
while (*p && isxdigit(*p))
p++;
*p = 0;
if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Got VALIDSIG, key ID:" << sig << std::endl;
+ std::cerr << "Got GOODSIG, key ID:" << sig << std::endl;
GoodSigners.push_back(string(sig));
}
}
waitpid(pid, &status, 0);
if (_config->FindB("Debug::Acquire::gpgv", false))
{
- std::cerr <<"gpgv exited\n";
+ std::cerr << "gpgv exited\n";
}
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)
{
- return "At least one invalid signature was encountered.";
+ return _("At least one invalid signature was encountered.");
}
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 '%s' to verify signature (is gpgv installed?)"), gpgvpath.c_str());
+ return ret.str();
}
else
{
- return "Unknown error executing gpgv";
+ return _("Unknown error executing gpgv");
}
}
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;
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 (BadSigners.empty() && NoPubKeySigners.empty())
+ if (BadSigners.empty() && WorthlessSigners.empty() && NoPubKeySigners.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");
}
+ 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())
{
- 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");
}
}
- 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.
if (_config->FindB("Debug::Acquire::gpgv", false))
{
- std::cerr <<"gpgv suceeded\n";
+ std::cerr << "gpgv succeeded\n";
}
return true;
int main()
{
+ setlocale(LC_ALL, "");
+
GPGVMethod Mth;
return Mth.Run();
projects / apt.git / blobdiff