diff --git a/lib/DataFileUtil/DataFileUtilImpl.py b/lib/DataFileUtil/DataFileUtilImpl.py index 1be3e93..03b0399 100644 --- a/lib/DataFileUtil/DataFileUtilImpl.py +++ b/lib/DataFileUtil/DataFileUtilImpl.py @@ -253,7 +253,26 @@ def _unarchive(self, file_path, unpack, file_type): log('unpacking {} ...'.format(file_path)) with tarfile.open(file_path) as tf: self._check_members(tf.getnames()) - tf.extractall(file_dir) + 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(tf, file_dir) if file_type in ['application/' + x for x in ('zip', 'x-zip-compressed')]: # x-compressed is apparently both .Z and .zip? if not unpack: