diff --git a/repackage.py b/repackage.py index 78cb6f8..73aa248 100755 --- a/repackage.py +++ b/repackage.py @@ -62,7 +62,26 @@ def repackage(dcmtgz, outdir=None, args=None): print ('%s exists! We will replace it.' % outname) with TemporaryDirectory() as tempdir_path: with tarfile.open(dcmtgz) as archive: - archive.extractall(path=tempdir_path) + def is_within_directory(directory, target): + + abs_directory = os.path.abspath(directory) + abs_target = os.path.abspath(target) + + prefix = os.path.commonprefix([abs_directory, abs_target]) + + return prefix == abs_directory + + def safe_extract(tar, path=".", members=None, *, numeric_owner=False): + + for member in tar.getmembers(): + member_path = os.path.join(path, member.name) + if not is_within_directory(path, member_path): + raise Exception("Attempted Path Traversal in Tar File") + + tar.extractall(path, members, numeric_owner=numeric_owner) + + + safe_extract(archive, path=tempdir_path) dcm_dir = glob.glob(os.path.join(tempdir_path, '*'))[0] metadata = {'filetype': 'dicom'} if args.group: