security-and-privacy/mat2
security-and-privacy/mat2
1
0
Fork 0
mirror of synced 2024-11-22 09:14:23 +01:00
Code Releases Activity

Fix some minor formatting issues

Browse Source
This commit is contained in:
jvoisin 2018-09-24 19:50:24 +02:00
parent 174d4a0ac0
commit 2e243355f5
8 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmat2/office.py
View File

@ -21,7 +21,7 @@ def _parse_xml(full_path: str):
for _, (key, value) in ET.iterparse(full_path, ("start-ns", )): for _, (key, value) in ET.iterparse(full_path, ("start-ns", )):
# The ns[0-9]+ namespaces are reserved for interal usage, so # The ns[0-9]+ namespaces are reserved for interal usage, so
# we have to use an other nomenclature. # we have to use an other nomenclature.
if re.match('^ns[0-9]+$', key, re.I): #pragma: no cover if re.match('^ns[0-9]+$', key, re.I): # pragma: no cover
key = 'mat' + key[2:] key = 'mat' + key[2:]
namespace_map[key] = value namespace_map[key] = value

1
tests/test_climat2.py
View File

@ -77,7 +77,6 @@ class TestCleanFolder(unittest.TestCase):
shutil.rmtree('./tests/data/folder/') shutil.rmtree('./tests/data/folder/')
class TestCleanMeta(unittest.TestCase): class TestCleanMeta(unittest.TestCase):
def test_jpg(self): def test_jpg(self):
shutil.copy('./tests/data/dirty.jpg', './tests/data/clean.jpg') shutil.copy('./tests/data/dirty.jpg', './tests/data/clean.jpg')

16
tests/test_corrupted_files.py
View File

@ -53,16 +53,21 @@ class TestUnsupportedFiles(unittest.TestCase):
class TestCorruptedEmbedded(unittest.TestCase): class TestCorruptedEmbedded(unittest.TestCase):
def test_docx(self): def test_docx(self):
shutil.copy('./tests/data/embedded_corrupted.docx', './tests/data/clean.docx') shutil.copy('./tests/data/embedded_corrupted.docx', './tests/data/clean.docx')
parser, mimetype = parser_factory.get_parser('./tests/data/clean.docx') parser, _ = parser_factory.get_parser('./tests/data/clean.docx')
self.assertFalse(parser.remove_all()) self.assertFalse(parser.remove_all())
self.assertIsNotNone(parser.get_meta()) self.assertIsNotNone(parser.get_meta())
os.remove('./tests/data/clean.docx') os.remove('./tests/data/clean.docx')
def test_odt(self): def test_odt(self):
expected = {
'create_system': 'Weird',
'date_time': '2018-06-10 17:18:18',
'meta.xml': 'harmful content'
}
shutil.copy('./tests/data/embedded_corrupted.odt', './tests/data/clean.odt') shutil.copy('./tests/data/embedded_corrupted.odt', './tests/data/clean.odt')
parser, mimetype = parser_factory.get_parser('./tests/data/clean.odt') parser, _ = parser_factory.get_parser('./tests/data/clean.odt')
self.assertFalse(parser.remove_all()) self.assertFalse(parser.remove_all())
self.assertEqual(parser.get_meta(), {'create_system': 'Weird', 'date_time': '2018-06-10 17:18:18', 'meta.xml': 'harmful content'}) self.assertEqual(parser.get_meta(), expected)
os.remove('./tests/data/clean.odt') os.remove('./tests/data/clean.odt')
@ -90,7 +95,7 @@ class TestCorruptedFiles(unittest.TestCase):
def test_png2(self): def test_png2(self):
shutil.copy('./tests/test_libmat2.py', './tests/clean.png') shutil.copy('./tests/test_libmat2.py', './tests/clean.png')
parser, mimetype = parser_factory.get_parser('./tests/clean.png') parser, _ = parser_factory.get_parser('./tests/clean.png')
self.assertIsNone(parser) self.assertIsNone(parser)
os.remove('./tests/clean.png') os.remove('./tests/clean.png')
@ -134,7 +139,8 @@ class TestCorruptedFiles(unittest.TestCase):
def test_bmp(self): def test_bmp(self):
shutil.copy('./tests/data/dirty.png', './tests/data/clean.bmp') shutil.copy('./tests/data/dirty.png', './tests/data/clean.bmp')
harmless.HarmlessParser('./tests/data/clean.bmp') ret = harmless.HarmlessParser('./tests/data/clean.bmp')
self.assertIsNotNone(ret)
os.remove('./tests/data/clean.bmp') os.remove('./tests/data/clean.bmp')
def test_docx(self): def test_docx(self):

2
tests/test_deep_cleaning.py
View File

@ -23,7 +23,6 @@ class TestZipMetadata(unittest.TestCase):
self.assertEqual(inside_p.get_meta(), {}) self.assertEqual(inside_p.get_meta(), {})
shutil.rmtree(tempdir) shutil.rmtree(tempdir)
def __check_zip_meta(self, p): def __check_zip_meta(self, p):
zipin = zipfile.ZipFile(p.filename) zipin = zipfile.ZipFile(p.filename)
for item in zipin.infolist(): for item in zipin.infolist():
@ -135,4 +134,3 @@ class TestRsidRemoval(unittest.TestCase):
os.remove('./tests/data/clean.docx') os.remove('./tests/data/clean.docx')
os.remove('./tests/data/clean.cleaned.docx') os.remove('./tests/data/clean.cleaned.docx')

2
tests/test_libmat2.py
View File

@ -12,7 +12,7 @@ from libmat2 import check_dependencies
class TestCheckDependencies(unittest.TestCase): class TestCheckDependencies(unittest.TestCase):
def test_deps(self): def test_deps(self):
ret = check_dependencies() ret = check_dependencies()
for key, value in ret.items(): for value in ret.values():
self.assertTrue(value) self.assertTrue(value)

1
tests/test_policy.py
View File

@ -29,4 +29,3 @@ class TestPolicy(unittest.TestCase):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
p.unknown_member_policy = UnknownMemberPolicy('unknown_policy_name_totally_invalid') p.unknown_member_policy = UnknownMemberPolicy('unknown_policy_name_totally_invalid')
os.remove('./tests/data/clean.docx') os.remove('./tests/data/clean.docx')