summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2013-03-19 10:49:57 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2013-03-19 10:49:57 +0100
commitb408e4ad0010b273dac0af7dc87ab61062d89e49 (patch)
treed6a95f98a91af2b36ae93cbc5ab1684eced3358e
parent233b78083f6f79730fcb5a6faeb74e2a78b6038a (diff)
use FileFd instead of int fds to tidy up the interface a bit
-rw-r--r--apt-pkg/contrib/gpgv.cc103
-rw-r--r--apt-pkg/contrib/gpgv.h12
2 files changed, 53 insertions, 62 deletions
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 7e244c623..54cc4c6d0 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -41,6 +41,7 @@ static char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/
Also, as gpgv 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
*/
void ExecGPGV(std::string const &File, std::string const &FileGPG,
int const &statusfd, int fd[2])
@@ -108,8 +109,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
}
}
- int sigFd = -1;
- int dataFd = -1;
std::vector<std::string> dataHeader;
char * sig = NULL;
char * data = NULL;
@@ -126,17 +125,29 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
data = GenerateTemporaryFileTemplate("apt.data");
if (sig == NULL || data == NULL)
{
+ ioprintf(std::cerr, "Couldn't create tempfile names for splitting up %s", File.c_str());
+ exit(EINTERNAL);
+ }
+
+ int const sigFd = mkstemp(sig);
+ int const dataFd = mkstemp(data);
+ 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);
}
- sigFd = mkstemp(sig);
- dataFd = mkstemp(data);
- int const duppedSigFd = dup(sigFd);
- int const duppedDataFd = dup(dataFd);
+ FileFd signature;
+ signature.OpenDescriptor(sigFd, FileFd::WriteOnly, true);
+ FileFd message;
+ message.OpenDescriptor(dataFd, FileFd::WriteOnly, true);
- if (dataFd == -1 || sigFd == -1 || duppedDataFd == -1 || duppedSigFd == -1 ||
- SplitClearSignedFile(File, duppedDataFd, &dataHeader, duppedSigFd) == false)
+ if (signature.Failed() == true || message.Failed() == true ||
+ SplitClearSignedFile(File, &message, &dataHeader, &signature) == false)
{
if (dataFd != -1)
unlink(sig);
@@ -145,8 +156,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str());
exit(EINTERNAL);
}
- lseek(dataFd, 0, SEEK_SET);
- lseek(sigFd, 0, SEEK_SET);
Args.push_back(sig);
Args.push_back(data);
}
@@ -242,36 +251,13 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
}
/*}}}*/
// SplitClearSignedFile - split message into data/signature /*{{{*/
-bool SplitClearSignedFile(std::string const &InFile, int const ContentFile,
- std::vector<std::string> * const ContentHeader, int const SignatureFile)
+bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
+ std::vector<std::string> * const ContentHeader, FileFd * const SignatureFile)
{
FILE *in = fopen(InFile.c_str(), "r");
if (in == NULL)
return _error->Errno("fopen", "can not open %s", InFile.c_str());
- FILE *out_content = NULL;
- FILE *out_signature = NULL;
- if (ContentFile != -1)
- {
- out_content = fdopen(ContentFile, "w");
- if (out_content == NULL)
- {
- fclose(in);
- return _error->Errno("fdopen", "Failed to open file to write content to from %s", InFile.c_str());
- }
- }
- if (SignatureFile != -1)
- {
- out_signature = fdopen(SignatureFile, "w");
- if (out_signature == NULL)
- {
- fclose(in);
- if (out_content != NULL)
- fclose(out_content);
- return _error->Errno("fdopen", "Failed to open file to write signature to from %s", InFile.c_str());
- }
- }
-
bool found_message_start = false;
bool found_message_end = false;
bool skip_until_empty_line = false;
@@ -280,7 +266,8 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile,
char *buf = NULL;
size_t buf_size = 0;
- while (getline(&buf, &buf_size, in) != -1)
+ ssize_t line_len = 0;
+ while ((line_len = getline(&buf, &buf_size, in)) != -1)
{
_strrstrip(buf);
if (found_message_start == false)
@@ -305,35 +292,40 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile,
{
found_signature = true;
found_message_end = true;
- if (out_signature != NULL)
- fprintf(out_signature, "%s\n", buf);
+ if (SignatureFile != NULL)
+ {
+ SignatureFile->Write(buf, strlen(buf));
+ SignatureFile->Write("\n", 1);
+ }
}
else if (found_message_end == false)
{
// we are in the message block
if(first_line == true) // first line does not need a newline
{
- if (out_content != NULL)
- fprintf(out_content, "%s", buf);
+ if (ContentFile != NULL)
+ ContentFile->Write(buf, strlen(buf));
first_line = false;
}
- else if (out_content != NULL)
- fprintf(out_content, "\n%s", buf);
+ else if (ContentFile != NULL)
+ {
+ ContentFile->Write("\n", 1);
+ ContentFile->Write(buf, strlen(buf));
+ }
}
}
else if (found_signature == true)
{
- if (out_signature != NULL)
- fprintf(out_signature, "%s\n", buf);
+ if (SignatureFile != NULL)
+ {
+ SignatureFile->Write(buf, strlen(buf));
+ SignatureFile->Write("\n", 1);
+ }
if (strcmp(buf, "-----END PGP SIGNATURE-----") == 0)
found_signature = false; // look for other signatures
}
// all the rest is whitespace, unsigned garbage or additional message blocks we ignore
}
- if (out_content != NULL)
- fclose(out_content);
- if (out_signature != NULL)
- fclose(out_signature);
fclose(in);
if (found_signature == true)
@@ -363,17 +355,17 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me
unlink(message);
free(message);
- int const duppedMsg = dup(messageFd);
- if (duppedMsg == -1)
- return _error->Errno("dup", "Couldn't duplicate FD to work with %s", ClearSignedFileName.c_str());
+ MessageFile.OpenDescriptor(messageFd, FileFd::ReadWrite, 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(), messageFd, NULL, -1);
+ bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), &MessageFile, NULL, NULL);
bool const errorDone = _error->PendingError();
_error->MergeWithStack();
if (splitDone == false)
{
- close(duppedMsg);
+ MessageFile.Close();
if (errorDone == true)
return false;
@@ -383,9 +375,8 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me
}
else // clear-signed
{
- if (lseek(duppedMsg, 0, SEEK_SET) < 0)
- return _error->Errno("lseek", "Unable to seek back in message fd for file %s", ClearSignedFileName.c_str());
- MessageFile.OpenDescriptor(duppedMsg, FileFd::ReadOnly, true);
+ if (MessageFile.Seek(0) == false)
+ return _error->Errno("lseek", "Unable to seek back in message for file %s", ClearSignedFileName.c_str());
}
return MessageFile.Failed() == false;
diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
index 8cbe553bc..1f877fc2d 100644
--- a/apt-pkg/contrib/gpgv.h
+++ b/apt-pkg/contrib/gpgv.h
@@ -48,8 +48,8 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig,
* whitespaces are discarded. The resulting files are suitable to
* be checked with gpgv.
*
- * If one or all Fds are -1 they will not be used and the content
- * which would have been written to them is discarded.
+ * If a FileFd pointers is NULL it will not be used and the content
+ * which would have been written to it is silently discarded.
*
* The code doesn't support dash-encoded lines as these are not
* expected to be present in files we have to deal with.
@@ -61,13 +61,13 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig,
* not generate an error message.
*
* @param InFile is the clear-signed file
- * @param ContentFile is the Fd the message will be written to
+ * @param ContentFile is the FileFd the message will be written to
* @param ContentHeader is a list of all required Amored Headers for the message
- * @param SignatureFile is the Fd all signatures will be written to
+ * @param SignatureFile is the FileFd all signatures will be written to
* @return true if the splitting was successful, false otherwise
*/
-bool SplitClearSignedFile(std::string const &InFile, int const ContentFile,
- std::vector<std::string> * const ContentHeader, int const SignatureFile);
+bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
+ std::vector<std::string> * const ContentHeader, FileFd * const SignatureFile);
/** \brief open a file which might be clear-signed
*