security-and-privacy/mat2
security-and-privacy/mat2
1
0
Fork 0
mirror of synced 2024-11-25 18:54:22 +01:00
Code Releases Activity

Rework the way we're outputing files

Browse Source
This commit is contained in:
jvoisin 2018-04-30 23:46:37 +02:00
parent d2b2a54a72
commit 23bc7e8f5f
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/abstract.py
View File

@ -1,4 +1,5 @@
import abc import abc
import os
class AbstractParser(abc.ABC): class AbstractParser(abc.ABC):
@ -7,7 +8,8 @@ class AbstractParser(abc.ABC):
def __init__(self, filename: str): def __init__(self, filename: str):
self.filename = filename self.filename = filename
self.output_filename = filename + '.cleaned' fname, extension = os.path.splitext(filename)
self.output_filename = fname + '.cleaned' + extension
@abc.abstractmethod @abc.abstractmethod
def get_meta(self) -> dict: def get_meta(self) -> dict:

2
tests/test_climat2.py
View File

@ -45,7 +45,7 @@ class TestCleanMeta(unittest.TestCase):
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
stdout, _ = proc.communicate() stdout, _ = proc.communicate()
proc = subprocess.Popen(['./main.py', '--show', './tests/data/clean.jpg.cleaned'], proc = subprocess.Popen(['./main.py', '--show', './tests/data/clean.cleaned.jpg'],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
stdout, _ = proc.communicate() stdout, _ = proc.communicate()
self.assertNotIn(b'Comment: Created with GIMP', stdout) self.assertNotIn(b'Comment: Created with GIMP', stdout)

34
tests/test_libmat2.py
View File

@ -116,7 +116,7 @@ class TestDeepCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = office.MSOfficeParser('./tests/data/clean.docx.cleaned') p = office.MSOfficeParser('./tests/data/clean.cleaned.docx')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
self.__check_zip_meta(p) self.__check_zip_meta(p)
@ -135,7 +135,7 @@ class TestDeepCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = office.LibreOfficeParser('./tests/data/clean.odt.cleaned') p = office.LibreOfficeParser('./tests/data/clean.cleaned.odt')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
self.__check_zip_meta(p) self.__check_zip_meta(p)
@ -154,7 +154,7 @@ class TestLightWeightCleaning(unittest.TestCase):
ret = p.remove_all_lightweight() ret = p.remove_all_lightweight()
self.assertTrue(ret) self.assertTrue(ret)
p = pdf.PDFParser('./tests/data/clean.pdf.cleaned') p = pdf.PDFParser('./tests/data/clean.cleaned.pdf')
expected_meta = {'creation-date': -1, 'format': 'PDF-1.5', 'mod-date': -1} expected_meta = {'creation-date': -1, 'format': 'PDF-1.5', 'mod-date': -1}
self.assertEqual(p.get_meta(), expected_meta) self.assertEqual(p.get_meta(), expected_meta)
@ -170,7 +170,7 @@ class TestLightWeightCleaning(unittest.TestCase):
ret = p.remove_all_lightweight() ret = p.remove_all_lightweight()
self.assertTrue(ret) self.assertTrue(ret)
p = images.PNGParser('./tests/data/clean.png.cleaned') p = images.PNGParser('./tests/data/clean.cleaned.png')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.png') os.remove('./tests/data/clean.png')
@ -186,7 +186,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = pdf.PDFParser('./tests/data/clean.pdf.cleaned') p = pdf.PDFParser('./tests/data/clean.cleaned.pdf')
expected_meta = {'creation-date': -1, 'format': 'PDF-1.5', 'mod-date': -1} expected_meta = {'creation-date': -1, 'format': 'PDF-1.5', 'mod-date': -1}
self.assertEqual(p.get_meta(), expected_meta) self.assertEqual(p.get_meta(), expected_meta)
@ -202,7 +202,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = images.PNGParser('./tests/data/clean.png.cleaned') p = images.PNGParser('./tests/data/clean.cleaned.png')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.png') os.remove('./tests/data/clean.png')
@ -217,7 +217,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = images.JPGParser('./tests/data/clean.jpg.cleaned') p = images.JPGParser('./tests/data/clean.cleaned.jpg')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.jpg') os.remove('./tests/data/clean.jpg')
@ -232,7 +232,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = audio.MP3Parser('./tests/data/clean.mp3.cleaned') p = audio.MP3Parser('./tests/data/clean.cleaned.mp3')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.mp3') os.remove('./tests/data/clean.mp3')
@ -247,7 +247,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = audio.OGGParser('./tests/data/clean.ogg.cleaned') p = audio.OGGParser('./tests/data/clean.cleaned.ogg')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.ogg') os.remove('./tests/data/clean.ogg')
@ -262,7 +262,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = audio.FLACParser('./tests/data/clean.flac.cleaned') p = audio.FLACParser('./tests/data/clean.cleaned.flac')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.flac') os.remove('./tests/data/clean.flac')
@ -277,7 +277,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = office.MSOfficeParser('./tests/data/clean.docx.cleaned') p = office.MSOfficeParser('./tests/data/clean.cleaned.docx')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.docx') os.remove('./tests/data/clean.docx')
@ -293,7 +293,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = office.LibreOfficeParser('./tests/data/clean.odt.cleaned') p = office.LibreOfficeParser('./tests/data/clean.cleaned.odt')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.odt') os.remove('./tests/data/clean.odt')
@ -308,7 +308,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = images.TiffParser('./tests/data/clean.tiff.cleaned') p = images.TiffParser('./tests/data/clean.cleaned.tiff')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.tiff') os.remove('./tests/data/clean.tiff')
@ -323,7 +323,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = images.BMPParser('./tests/data/clean.bmp.cleaned') p = images.BMPParser('./tests/data/clean.cleaned.bmp')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.bmp') os.remove('./tests/data/clean.bmp')
@ -338,7 +338,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = torrent.TorrentParser('./tests/data/clean.torrent.cleaned') p = torrent.TorrentParser('./tests/data/clean.cleaned.torrent')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.torrent') os.remove('./tests/data/clean.torrent')
@ -353,7 +353,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = office.LibreOfficeParser('./tests/data/clean.odf.cleaned') p = office.LibreOfficeParser('./tests/data/clean.cleaned.odf')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.odf') os.remove('./tests/data/clean.odf')
@ -369,7 +369,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all() ret = p.remove_all()
self.assertTrue(ret) self.assertTrue(ret)
p = office.LibreOfficeParser('./tests/data/clean.odg.cleaned') p = office.LibreOfficeParser('./tests/data/clean.cleaned.odg')
self.assertEqual(p.get_meta(), {}) self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.odg') os.remove('./tests/data/clean.odg')