Merge branch 'master' into topic-digest-check

Changelog.rst

@@ -10,12 +10,16 @@ All notable changes to this project will be documented in this file.
 Added
 -----
 
+* Support for encrypted header (#139, #140)
+
 Changed
 -------
 
 Fixed
 -----
 
+* Allow decryption of data which is encrypted without any compression.(#140)
+
 Deprecated
 ----------
 

py7zr/archiveinfo.py

@@ -901,9 +901,6 @@ def _get_headerdata_from_streams(self, fp: BinaryIO, streams: StreamsInfo) -> By
         buffer = io.BytesIO()
         src_start = self._start_pos
         for folder in streams.unpackinfo.folders:
-            if folder.is_encrypted():
-                raise UnsupportedCompressionMethodError()
-
             uncompressed = folder.unpacksizes
             if not isinstance(uncompressed, (list, tuple)):
                 uncompressed = [uncompressed] * len(folder.coders)

py7zr/extra.py

@@ -123,7 +123,10 @@ def __init__(self, aes_properties: bytes, password: str, coders: List[Dict[str,
             if ivsize < 16:
                 iv += bytes('\x00' * (16 - ivsize), 'ascii')
             key = calculate_key(byte_password, numcyclespower, salt, 'sha256')
-            self.lzma_decompressor = self._set_lzma_decompressor(coders)  # type: lzma.LZMADecompressor
+            if len(coders) > 0:
+                self.lzma_decompressor = self._set_lzma_decompressor(coders)  # type: lzma.LZMADecompressor
+            else:
+                self.lzma_decompressor = CopyDecompressor()
             self.cipher = AES.new(key, AES.MODE_CBC, iv)
             self.buf = Buffer(size=READ_BLOCKSIZE + 16)
             self.flushed = False

tests/test_info.py

@@ -156,3 +156,10 @@ def test_archivetest_lzma_bcj_sparc():
 def test_archivetest_7zaes():
     with py7zr.SevenZipFile(os.path.join(testdata_path, 'encrypted_1.7z'), 'r', password='secret') as ar:
         assert ar.testzip() is None
+
+
+@pytest.mark.files
+def test_list_filename_encryption(tmp_path):
+    with py7zr.SevenZipFile(os.path.join(testdata_path, 'filename_encryption.7z'), 'r', password='hello') as ar:
+        file_list = ar.list()
+        assert file_list[0].filename == "New Text Document.TXT"