Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
mat2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jvoisin
mat2
Commits
61dce89f
Commit
61dce89f
authored
Nov 23, 2020
by
jvoisin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Raise a ValueError explicitly
parent
88b7ec2c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
21 deletions
+30
-21
libmat2/parser_factory.py
libmat2/parser_factory.py
+6
-7
mat2
mat2
+10
-2
tests/test_corrupted_files.py
tests/test_corrupted_files.py
+14
-12
No files found.
libmat2/parser_factory.py
View file @
61dce89f
...
...
@@ -40,7 +40,10 @@ def _get_parsers() -> List[T]:
def
get_parser
(
filename
:
str
)
->
Tuple
[
Optional
[
T
],
Optional
[
str
]]:
""" Return the appropriate parser for a given filename. """
""" Return the appropriate parser for a given filename.
:raises ValueError: Raised if the instantiation of the parser went wrong.
"""
mtype
,
_
=
mimetypes
.
guess_type
(
filename
)
_
,
extension
=
os
.
path
.
splitext
(
filename
)
...
...
@@ -53,10 +56,6 @@ def get_parser(filename: str) -> Tuple[Optional[T], Optional[str]]:
for
parser_class
in
_get_parsers
():
# type: ignore
if
mtype
in
parser_class
.
mimetypes
:
try
:
return
parser_class
(
filename
),
mtype
except
ValueError
as
e
:
logging
.
info
(
"Got an exception when trying to instantiate "
"%s for %s: %s"
,
parser_class
,
filename
,
e
)
return
None
,
mtype
# This instantiation might raise a ValueError on malformed files
return
parser_class
(
filename
),
mtype
return
None
,
mtype
mat2
View file @
61dce89f
...
...
@@ -85,7 +85,11 @@ def show_meta(filename: str, sandbox: bool):
if
not
__check_file
(
filename
):
return
p
,
mtype
=
parser_factory
.
get_parser
(
filename
)
# type: ignore
try
:
p
,
mtype
=
parser_factory
.
get_parser
(
filename
)
# type: ignore
except
ValueError
as
e
:
print
(
"[-] something went wrong when processing %s: %s"
%
(
filename
,
e
))
return
if
p
is
None
:
print
(
"[-] %s's format (%s) is not supported"
%
(
filename
,
mtype
))
return
...
...
@@ -126,7 +130,11 @@ def clean_meta(filename: str, is_lightweight: bool, inplace: bool, sandbox: bool
if
not
__check_file
(
filename
,
mode
):
return
False
p
,
mtype
=
parser_factory
.
get_parser
(
filename
)
# type: ignore
try
:
p
,
mtype
=
parser_factory
.
get_parser
(
filename
)
# type: ignore
except
ValueError
as
e
:
print
(
"[-] something went wrong when cleaning %s: %s"
%
(
filename
,
e
))
return
False
if
p
is
None
:
print
(
"[-] %s's format (%s) is not supported"
%
(
filename
,
mtype
))
return
False
...
...
tests/test_corrupted_files.py
View file @
61dce89f
...
...
@@ -65,8 +65,10 @@ class TestCorruptedEmbedded(unittest.TestCase):
def
test_docx
(
self
):
shutil
.
copy
(
'./tests/data/embedded_corrupted.docx'
,
'./tests/data/clean.docx'
)
parser
,
_
=
parser_factory
.
get_parser
(
'./tests/data/clean.docx'
)
self
.
assertFalse
(
parser
.
remove_all
())
self
.
assertIsNotNone
(
parser
.
get_meta
())
with
self
.
assertRaises
(
ValueError
):
parser
.
remove_all
()
with
self
.
assertRaises
(
ValueError
):
self
.
assertIsNotNone
(
parser
.
get_meta
())
os
.
remove
(
'./tests/data/clean.docx'
)
def
test_odt
(
self
):
...
...
@@ -120,8 +122,8 @@ class TestCorruptedFiles(unittest.TestCase):
def
test_png2
(
self
):
shutil
.
copy
(
'./tests/test_libmat2.py'
,
'./tests/clean.png'
)
parser
,
_
=
parser_factory
.
get_parser
(
'./tests/clean.png'
)
self
.
assertIsNone
(
parser
)
with
self
.
assertRaises
(
ValueError
):
parser_factory
.
get_parser
(
'./tests/clean.png'
)
os
.
remove
(
'./tests/clean.png'
)
def
test_torrent
(
self
):
...
...
@@ -237,10 +239,10 @@ class TestCorruptedFiles(unittest.TestCase):
zout
.
write
(
'./tests/data/embedded_corrupted.docx'
)
p
,
mimetype
=
parser_factory
.
get_parser
(
'./tests/data/clean.zip'
)
self
.
assertEqual
(
mimetype
,
'application/zip'
)
meta
=
p
.
get_meta
()
self
.
assertEqual
(
meta
[
'tests/data/dirty.flac'
][
'comments'
],
'Thank you for using MAT !'
)
self
.
assertEqual
(
meta
[
'tests/data/dirty.docx'
][
'word/media/image1.png'
][
'Comment'
],
'This is a comment, be careful!'
)
self
.
assertFalse
(
p
.
remove_all
())
with
self
.
assertRaises
(
ValueError
):
p
.
get_meta
(
)
with
self
.
assertRaises
(
ValueError
):
self
.
assertFalse
(
p
.
remove_all
())
os
.
remove
(
'./tests/data/clean.zip'
)
def
test_html
(
self
):
...
...
@@ -315,10 +317,10 @@ class TestCorruptedFiles(unittest.TestCase):
zout
.
addfile
(
tarinfo
,
f
)
p
,
mimetype
=
parser_factory
.
get_parser
(
'./tests/data/clean.tar'
)
self
.
assertEqual
(
mimetype
,
'application/x-tar'
)
meta
=
p
.
get_meta
()
self
.
assertEqual
(
meta
[
'./tests/data/dirty.flac'
][
'comments'
],
'Thank you for using MAT !'
)
self
.
assertEqual
(
meta
[
'./tests/data/dirty.docx'
][
'word/media/image1.png'
][
'Comment'
],
'This is a comment, be careful!'
)
self
.
assertFalse
(
p
.
remove_all
())
with
self
.
assertRaises
(
ValueError
):
p
.
get_meta
(
)
with
self
.
assertRaises
(
ValueError
):
self
.
assertFalse
(
p
.
remove_all
())
os
.
remove
(
'./tests/data/clean.tar'
)
shutil
.
copy
(
'./tests/data/dirty.png'
,
'./tests/data/clean.tar'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment