diff --git a/SFS-port-OpenLambda/openlambda/default-ol/lambda/usr/lib/python3.6/tarfile.py b/SFS-port-OpenLambda/openlambda/default-ol/lambda/usr/lib/python3.6/tarfile.py index 03e70bb2..39022902 100755 --- a/SFS-port-OpenLambda/openlambda/default-ol/lambda/usr/lib/python3.6/tarfile.py +++ b/SFS-port-OpenLambda/openlambda/default-ol/lambda/usr/lib/python3.6/tarfile.py @@ -2508,7 +2508,26 @@ def main(): if is_tarfile(src): with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir) + 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, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src) diff --git a/SFS-port-OpenLambda/openlambda/test-dir/lambda/usr/lib/python3.6/tarfile.py b/SFS-port-OpenLambda/openlambda/test-dir/lambda/usr/lib/python3.6/tarfile.py index 03e70bb2..39022902 100755 --- a/SFS-port-OpenLambda/openlambda/test-dir/lambda/usr/lib/python3.6/tarfile.py +++ b/SFS-port-OpenLambda/openlambda/test-dir/lambda/usr/lib/python3.6/tarfile.py @@ -2508,7 +2508,26 @@ def main(): if is_tarfile(src): with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir) + 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, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src)