Merge remote-tracking branch 'origin/master'

decalage2
2 parents 6b7a773f 180a24ba
Showing 5 changed files with 33 additions and 5 deletions
tests/ooxml/test_basic.py
tests/rtfobj/test_issue_185.py
tests/test-data/rtfobj/issue_185.rtf
tests/test-data/rtfobj/issue_185.rtf.zip
tests/test_utils/testdata_reader.py
@@ -39,7 +39,7 @@ class TestOOXML(unittest.TestCase):
         # files that are neither OLE nor xml:
         except_files = 'empty', 'text'
-        except_extns = 'rtf', 'csv'
+        except_extns = 'rtf', 'csv', 'zip'
         # analyse all files in data dir
         for base_dir, _, files in os.walk(DATA_BASE_DIR):
@@ -5,7 +5,7 @@ from oletools import rtfobj
 class TestRtfObjIssue185(unittest.TestCase):
     def test_skip_space_after_bin_control_word(self):
-        data = testdata_reader.read('rtfobj/issue_185.rtf')
+        data = testdata_reader.read_encrypted('rtfobj/issue_185.rtf.zip')
         rtfp = rtfobj.RtfObjParser(data)
         rtfp.parse()
         objects = rtfp.objects
-{\rt{\object\objautlink\objupdate\rsltpict\objw37542\objh829\objscalex59286\objscaley86308{\*\objclass \'77}{\*\objdata 32\bin6 FF}}}
 \ No newline at end of file
-import os
+import os, sys, zipfile
 from os.path import dirname, abspath, normpath, join
 from . import DATA_BASE_DIR
+ENCRYPTED_FILES_PASSWORD='infected-test'
+
+if sys.version_info[0] <= 2:
+    # Python 2.x
+    if sys.version_info[1] <= 6:
+        # Python 2.6
+        # use is_zipfile backported from Python 2.7:
+        from thirdparty.zipfile27 import is_zipfile
+    else:
+        # Python 2.7
+        from zipfile import is_zipfile
+else:
+    # Python 3.x+
+    from zipfile import is_zipfile
+    ENCRYPTED_FILES_PASSWORD = ENCRYPTED_FILES_PASSWORD.encode()
 def read(relative_path):
-    with open(join(DATA_BASE_DIR, relative_path), 'rb') as file_handle:
+    with open(get_path_from_root(relative_path), 'rb') as file_handle:
         return file_handle.read()
+
+def read_encrypted(relative_path, filename=None):
+    z = zipfile.ZipFile(get_path_from_root(relative_path))
+
+    if filename == None:
+        contents = z.read(z.namelist()[0], pwd=ENCRYPTED_FILES_PASSWORD)
+    else:
+        contents = z.read(filename, pwd=ENCRYPTED_FILES_PASSWORD)
+
+    z.close()
+    return contents
+
+def get_path_from_root(relative_path):
+    return join(DATA_BASE_DIR, relative_path)
 \ No newline at end of file