Add command to copy an archive without encryption

kimci86 · May 17, 2024 · b1e0d7b · b1e0d7b
1 parent df61ea8
commit b1e0d7b
Show file tree

Hide file tree

Showing 5 changed files with 626 additions and 118 deletions.
diff --git a/include/Arguments.hpp b/include/Arguments.hpp
@@ -70,6 +70,9 @@ class Arguments
     /// Tell whether to keep the encryption header or discard it when writing the deciphered text
     bool keepHeader = false;
 
+    /// File to write an unencrypted copy of the encrypted archive
+    std::optional<std::string> decryptedArchive;
+
     /// Arguments needed to change an archive's password
     struct ChangePassword
     {
@@ -152,6 +155,7 @@ class Arguments
         keys,
         decipheredFile,
         keepHeader,
+        decryptedArchive,
         changePassword,
         changeKeys,
         bruteforce,

diff --git a/include/Zip.hpp b/include/Zip.hpp
@@ -171,6 +171,10 @@ class Zip
     /// \exception Error if the archive is not a valid zip archive
     void changeKeys(std::ostream& os, const Keys& oldKeys, const Keys& newKeys, Progress& progress) const;
 
+    /// \brief Copy the zip file into \a os removing encryption using the given keys
+    /// \exception Error if the archive is not a valid zip archive
+    void decrypt(std::ostream& os, const Keys& keys, Progress& progress) const;
+
 private:
     std::optional<std::ifstream> m_file; // optionally own the stream
     std::istream&                m_is;

diff --git a/src/Arguments.cpp b/src/Arguments.cpp
@@ -97,8 +97,8 @@ Arguments::Arguments(int argc, const char* argv[])
     // check constraints on arguments
     if (keys)
     {
-        if (!decipheredFile && !changePassword && !changeKeys && !bruteforce)
-            throw Error{"-d, -U, --change-keys or --bruteforce parameter is missing (required by -k)"};
+        if (!decipheredFile && !decryptedArchive && !changePassword && !changeKeys && !bruteforce)
+            throw Error{"-d, -D, -U, --change-keys or --bruteforce parameter is missing (required by -k)"};
     }
     else if (!password)
     {
@@ -131,6 +131,11 @@ Arguments::Arguments(int argc, const char* argv[])
     if (decipheredFile && !cipherArchive && decipheredFile == cipherFile)
         throw Error{"-c and -d parameters must point to different files"};
 
+    if (decryptedArchive && !cipherArchive)
+        throw Error{"-C parameter is missing (required by -D)"};
+    if (decryptedArchive && decryptedArchive == cipherArchive)
+        throw Error{"-C and -D parameters must point to different files"};
+
     if (changePassword && !cipherArchive)
         throw Error{"-C parameter is missing (required by -U)"};
     if (changePassword && changePassword->unlockedArchive == cipherArchive)
@@ -250,6 +255,9 @@ void Arguments::parseArgument()
     case Option::keepHeader:
         keepHeader = true;
         break;
+    case Option::decryptedArchive:
+        decryptedArchive = readString("decipheredzip");
+        break;
     case Option::changePassword:
         changePassword = {readString("unlockedzip"), readString("password")};
         break;
@@ -338,6 +346,7 @@ auto Arguments::readOption(const std::string& description) -> Arguments::Option
         PAIRS(-k, --keys,              keys),
         PAIRS(-d, --decipher,          decipheredFile),
         PAIR (    --keep-header,       keepHeader),
+        PAIRS(-D, --decrypt,           decryptedArchive),
         PAIRS(-U, --change-password,   changePassword),
         PAIR (    --change-keys,       changeKeys),
         PAIRS(-b, --bruteforce,        bruteforce),