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

Achieve 100% coverage!

Browse Source
This commit is contained in:
jvoisin 2018-07-08 22:27:37 +02:00
parent 52a2c800b7
commit f49aa5cab7
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmat2/office.py
View File

@ -22,8 +22,7 @@ def _parse_xml(full_path: str):
def parse_map(f): # etree support for ns is a bit rough def parse_map(f): # etree support for ns is a bit rough
ns_map = dict() ns_map = dict()
for event, (k, v) in ET.iterparse(f, ("start-ns", )): for event, (k, v) in ET.iterparse(f, ("start-ns", )):
if event == "start-ns": ns_map[k] = v
ns_map[k] = v
return ns_map return ns_map
ns = parse_map(full_path) ns = parse_map(full_path)
@ -166,7 +165,7 @@ class MSOfficeParser(ArchiveBasedAbstractParser):
elements = list() elements = list()
for element in tree.iterfind('.//w:ins', ns): for element in tree.iterfind('.//w:ins', ns):
for position, item in enumerate(tree.iter()): for position, item in enumerate(tree.iter()): #pragma: no cover
if item == element: if item == element:
for children in element.iterfind('./*'): for children in element.iterfind('./*'):
elements.append((element, position, children)) elements.append((element, position, children))

6
libmat2/torrent.py
View File

@ -69,9 +69,11 @@ class _BencodeHandler(object):
@staticmethod @staticmethod
def __decode_string(s: bytes) -> Tuple[bytes, bytes]: def __decode_string(s: bytes) -> Tuple[bytes, bytes]:
colon = s.index(b':') colon = s.index(b':')
str_len = int(s[:colon]) # FIXME Python3 is broken here, the call to `ord` shouldn't be needed,
if s[0] == '0' and colon != 1: # but apparently it is. This is utterly idiotic.
if (s[0] == ord('0') or s[0] == '0') and colon != 1:
raise ValueError raise ValueError
str_len = int(s[:colon])
s = s[1:] s = s[1:]
return s[colon:colon+str_len], s[colon+str_len:] return s[colon:colon+str_len], s[colon+str_len:]

2
tests/test_corrupted_files.py
View File

@ -80,7 +80,7 @@ class TestCorruptedFiles(unittest.TestCase):
torrent.TorrentParser('./tests/data/clean.torrent') torrent.TorrentParser('./tests/data/clean.torrent')
with open("./tests/data/clean.torrent", "w") as f: with open("./tests/data/clean.torrent", "w") as f:
f.write("d01:AAAAAAAAA") f.write("01:AAAAAAAAA")
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
torrent.TorrentParser('./tests/data/clean.torrent') torrent.TorrentParser('./tests/data/clean.torrent')