qt: Add support for new context flag "proc-all-sigs"

* lang/qt/src/decryptverifyarchivejob.cpp,
lang/qt/src/decryptverifyarchivejob.h (DecryptVerifyArchiveJob): Add
member functions setProcessAllSignatures, processAllSignatures.
* lang/qt/src/decryptverifyarchivejob_p.h
(DecryptVerifyArchiveJobPrivate): Add member m_processAllSignatures.
* lang/qt/src/decryptverifyjob.cpp, lang/qt/src/decryptverifyjob.h
(DecryptVerifyJob): Add member functions setProcessAllSignatures,
processAllSignatures.
* lang/qt/src/decryptverifyjob_p.h (DecryptVerifyJobPrivate): Add member
m_processAllSignatures.
* lang/qt/src/qgpgmedecryptverifyarchivejob.cpp
(decrypt_verify_from_file_name): Add argument "processAllSignatures".
Set context flag "proc-all-sigs" if requested.
(QGpgMEDecryptVerifyArchiveJob::start): Set context flag "proc-all-sigs"
if requested.
(QGpgMEDecryptVerifyArchiveJobPrivate::startIt): Pass
m_processAllSignatures to decrypt_verify_from_file_name.
* lang/qt/src/qgpgmedecryptverifyjob.cpp
(decrypt_verify_from_filename): Add argument "processAllSignatures".
Set context flag "proc-all-sigs" if requested.
(QGpgMEDecryptVerifyJob::start, QGpgMEDecryptVerifyJob::exec): Set
context flag "proc-all-sigs" if requested.
(QGpgMEDecryptVerifyJobPrivate::startIt): Pass
m_processAllSignatures to decrypt_verify_from_filename.
* lang/qt/src/qgpgmeverifydetachedjob.cpp (verify_from_filename): Add
argument "processAllSignatures". Set context flag "proc-all-sigs" if
requested.
(QGpgMEVerifyDetachedJob::start, QGpgMEVerifyDetachedJob::exec): Set
context flag "proc-all-sigs" if requested.
(QGpgMEVerifyDetachedJobPrivate::startIt): Pass
m_processAllSignatures to decrypt_verify_from_filename.
* lang/qt/src/qgpgmeverifyopaquejob.cpp (verify_from_filename): Add
argument "processAllSignatures". Set context flag "proc-all-sigs" if
requested.
(QGpgMEVerifyOpaqueJob::start, QGpgMEVerifyOpaqueJob::exec): Set
context flag "proc-all-sigs" if requested.
(QGpgMEVerifyOpaqueJobPrivate::startIt): Pass
m_processAllSignatures to decrypt_verify_from_filename.
* lang/qt/src/verifydetachedjob.cpp, lang/qt/src/verifydetachedjob.h
(VerifyDetachedJob): Add member functions setProcessAllSignatures,
processAllSignatures.
* lang/qt/src/verifydetachedjob_p.h (VerifyDetachedJobPrivate): Add
member m_processAllSignatures.
* lang/qt/src/verifyopaquejob.cpp, lang/qt/src/verifyopaquejob.h
(VerifyOpaqueJob): Add member functions setProcessAllSignatures,
processAllSignatures.
* lang/qt/src/verifyopaquejob_p.h (VerifyOpaqueJobPrivate): Add
member m_processAllSignatures.

* lang/qt/tests/run-decryptverifyarchivejob.cpp,
lang/qt/tests/run-decryptverifyjob.cpp,
lang/qt/tests/run-verifydetachedjob.cpp,
lang/qt/tests/run-verifyopaquejob.cpp (struct CommandLineOptions): Add
member processAllSignatures.
(parseCommandLine): Add command line option --process-all-signatures.
(main): Pass new option to the job.
--

The new option processAllSignatures is added to all jobs that verify
data signatures. By enabling this option, one can tell gpg not to stop
checking signatures after the first bad signature.

GnuPG-bug-id: 6870

4 files changed, 18 insertions, 0 deletions

diff --git a/lang/qt/tests/run-decryptverifyarchivejob.cpp b/lang/qt/tests/run-decryptverifyarchivejob.cpp
index 36d023ec..6d5615c0 100644
--- a/lang/qt/tests/run-decryptverifyarchivejob.cpp
+++ b/lang/qt/tests/run-decryptverifyarchivejob.cpp
@@ -56,6 +56,7 @@ std::ostream &operator<<(std::ostream &os, const QString &s)
 }
 
 struct CommandLineOptions {
+    bool processAllSignatures = false;
     QString outputDirectory;
     QString archiveName;
 };
@@ -69,6 +70,7 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
     parser.addHelpOption();
     parser.addOptions({
         {{"C", "directory"}, "Extract the files into the directory DIRECTORY.", "DIRECTORY"},
+        {"process-all-signatures", "Don't stop signature checking after bad signature."},
     });
     parser.addPositionalArgument("archive", "The archive to decrypt and extract");
 
@@ -79,6 +81,7 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
         parser.showHelp(1);
     }
 
+    options.processAllSignatures = parser.isSet("process-all-signatures");
     options.outputDirectory = parser.value("directory");
     options.archiveName = args.first();
 
@@ -104,6 +107,7 @@ int main(int argc, char **argv)
         std::cerr << "Error: Could not create job" << std::endl;
         return 1;
     }
+    job->setProcessAllSignatures(options.processAllSignatures);
     job->setInputFile(options.archiveName);
     job->setOutputDirectory(options.outputDirectory);
     QObject::connect(job, &QGpgME::DecryptVerifyArchiveJob::result, &app, [](const GpgME::DecryptionResult &decryptionResult, const GpgME::VerificationResult &verificationResult, const QString &auditLog, const GpgME::Error &) {
diff --git a/lang/qt/tests/run-decryptverifyjob.cpp b/lang/qt/tests/run-decryptverifyjob.cpp
index da8ec9fe..805bad68 100644
--- a/lang/qt/tests/run-decryptverifyjob.cpp
+++ b/lang/qt/tests/run-decryptverifyjob.cpp
@@ -58,6 +58,7 @@ std::ostream &operator<<(std::ostream &os, const QString &s)
 }
 
 struct CommandLineOptions {
+    bool processAllSignatures = false;
     QString inputFile;
     QString outputFile;
     std::chrono::seconds cancelTimeout{0};
@@ -73,6 +74,7 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
     parser.addOptions({
         {{"o", "output"}, "Write output to FILE.", "FILE"},
         {"cancel-after", "Cancel the running job after SECONDS seconds.", "SECONDS"},
+        {"process-all-signatures", "Don't stop signature checking after bad signature."},
     });
     parser.addPositionalArgument("file", "File to decrypt", "FILE");
 
@@ -83,6 +85,7 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
         parser.showHelp(1);
     }
 
+    options.processAllSignatures = parser.isSet("process-all-signatures");
     options.inputFile = args.front();
     options.outputFile = parser.value("output");
     if (parser.isSet("cancel-after")) {
@@ -146,6 +149,7 @@ int main(int argc, char **argv)
 
     std::shared_ptr<QFile> input;
     GpgME::Error err;
+    job->setProcessAllSignatures(options.processAllSignatures);
     if (output) {
         input.reset(new QFile{options.inputFile});
         input->open(QIODevice::ReadOnly);
diff --git a/lang/qt/tests/run-verifydetachedjob.cpp b/lang/qt/tests/run-verifydetachedjob.cpp
index 60ba5470..17a719e9 100644
--- a/lang/qt/tests/run-verifydetachedjob.cpp
+++ b/lang/qt/tests/run-verifydetachedjob.cpp
@@ -56,6 +56,7 @@ std::ostream &operator<<(std::ostream &os, const QString &s)
 }
 
 struct CommandLineOptions {
+    bool processAllSignatures = false;
     QString signatureFile;
     QString signedFile;
 };
@@ -67,6 +68,9 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
     QCommandLineParser parser;
     parser.setApplicationDescription("Test program for VerifyDetachedJob");
     parser.addHelpOption();
+    parser.addOptions({
+        {"process-all-signatures", "Don't stop signature checking after bad signature."},
+    });
     parser.addPositionalArgument("signature", "Detached SIGNATURE to verify", "SIGNATURE");
     parser.addPositionalArgument("signed file", "FILE containing the signed data", "FILE");
 
@@ -77,6 +81,7 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
         parser.showHelp(1);
     }
 
+    options.processAllSignatures = parser.isSet("process-all-signatures");
     options.signatureFile = args[0];
     options.signedFile = args[1];
 
@@ -110,6 +115,7 @@ int main(int argc, char **argv)
 
     std::shared_ptr<QFile> input;
     GpgME::Error err;
+    job->setProcessAllSignatures(options.processAllSignatures);
     job->setSignatureFile(options.signatureFile);
     job->setSignedFile(options.signedFile);
     err = job->startIt();
diff --git a/lang/qt/tests/run-verifyopaquejob.cpp b/lang/qt/tests/run-verifyopaquejob.cpp
index 09578430..a3245b4f 100644
--- a/lang/qt/tests/run-verifyopaquejob.cpp
+++ b/lang/qt/tests/run-verifyopaquejob.cpp
@@ -57,6 +57,7 @@ std::ostream &operator<<(std::ostream &os, const QString &s)
 }
 
 struct CommandLineOptions {
+    bool processAllSignatures = false;
     QString inputFile;
     QString outputFile;
     std::chrono::seconds cancelTimeout{0};
@@ -72,6 +73,7 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
     parser.addOptions({
         {{"o", "output"}, "Write output to FILE.", "FILE"},
         {"cancel-after", "Cancel the running job after SECONDS seconds.", "SECONDS"},
+        {"process-all-signatures", "Don't stop signature checking after bad signature."},
     });
     parser.addPositionalArgument("file", "File to verify", "FILE");
 
@@ -82,6 +84,7 @@ CommandLineOptions parseCommandLine(const QStringList &arguments)
         parser.showHelp(1);
     }
 
+    options.processAllSignatures = parser.isSet("process-all-signatures");
     options.inputFile = args.front();
     options.outputFile = parser.value("output");
     if (parser.isSet("cancel-after")) {
@@ -143,6 +146,7 @@ int main(int argc, char **argv)
 
     std::shared_ptr<QFile> input;
     GpgME::Error err;
+    job->setProcessAllSignatures(options.processAllSignatures);
     if (output) {
         input.reset(new QFile{options.inputFile});
         input->open(QIODevice::ReadOnly);