diff --git a/module.py b/module.py index 85fe15c..400e860 100755 --- a/module.py +++ b/module.py @@ -840,7 +840,26 @@ def updateFat(dirName, fileCode, shaCode): shutil.rmtree(tarTmpPath) os.makedirs(tarTmpPath) with tarfile.open(localTarFile, 'r:bz2') as tar: - tar.extractall(tarTmpPath) + 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(tar, tarTmpPath) tar.close() info('done\n')