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

Change a bit the previous commit

Browse Source
This commit is contained in:
jvoisin 2018-09-06 11:13:11 +02:00
parent f3cef319b9
commit 120b204988
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmat2/__init__.py
View File

@ -2,7 +2,7 @@
import os import os
import collections import collections
from enum import Enum import enum
import importlib import importlib
from typing import Dict, Optional from typing import Dict, Optional
@ -64,7 +64,8 @@ def check_dependencies() -> dict:
return ret return ret
class UnknownMemberPolicy(Enum): @enum.unique
class UnknownMemberPolicy(enum.Enum):
ABORT = 'abort' ABORT = 'abort'
OMIT = 'omit' OMIT = 'omit'
KEEP = 'keep' KEEP = 'keep'

15
mat2
View File

@ -10,8 +10,8 @@ import multiprocessing
import logging import logging
try: try:
from libmat2 import (parser_factory, UNSUPPORTED_EXTENSIONS, check_dependencies, from libmat2 import parser_factory, UNSUPPORTED_EXTENSIONS
UnknownMemberPolicy) from libmat2 import check_dependencies, UnknownMemberPolicy
except ValueError as e: except ValueError as e:
print(e) print(e)
sys.exit(1) sys.exit(1)
@ -44,7 +44,7 @@ def create_arg_parser():
help='show more verbose status information') help='show more verbose status information')
parser.add_argument('--unknown-members', metavar='policy', default='abort', parser.add_argument('--unknown-members', metavar='policy', default='abort',
help='how to handle unknown members of archive-style files (policy should' + help='how to handle unknown members of archive-style files (policy should' +
' be one of: ' + ', '.join([x.value for x in UnknownMemberPolicy]) + ')') ' be one of: %s)' % ', '.join(p.value for p in UnknownMemberPolicy))
info = parser.add_mutually_exclusive_group() info = parser.add_mutually_exclusive_group()
@ -141,11 +141,12 @@ def main():
unknown_member_policy = UnknownMemberPolicy(args.unknown_members) unknown_member_policy = UnknownMemberPolicy(args.unknown_members)
if unknown_member_policy == UnknownMemberPolicy.KEEP: if unknown_member_policy == UnknownMemberPolicy.KEEP:
logging.warning('Keeping unknown member files may leak metadata in the resulting file!') logging.warning('Keeping unknown member files may leak metadata in the resulting file!')
p = multiprocessing.Pool()
mode = (args.lightweight is True)
l = zip(__get_files_recursively(args.files), itertools.repeat(mode),
itertools.repeat(unknown_member_policy))
rep_mode = itertools.repeat(args.lightweight is True)
rep_policy = itertools.repeat(unknown_member_policy)
l = zip(__get_files_recursively(args.files), rep_mode, rep_policy)
p = multiprocessing.Pool()
ret = list(p.imap_unordered(clean_meta, list(l))) ret = list(p.imap_unordered(clean_meta, list(l)))
return 0 if all(ret) else -1 return 0 if all(ret) else -1