diff --git a/Tutorials/MLADS-spring-2018/CNTK_distributed/utils.py b/Tutorials/MLADS-spring-2018/CNTK_distributed/utils.py index 260ea38..afad56d 100644 --- a/Tutorials/MLADS-spring-2018/CNTK_distributed/utils.py +++ b/Tutorials/MLADS-spring-2018/CNTK_distributed/utils.py @@ -60,7 +60,26 @@ def download_cifar(download_dir, src="http://www.cs.toronto.edu/~kriz/cifar-10-p print ('Extracting files...') with tarfile.open(fname) as tar: - tar.extractall(download_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(tar, download_dir) print ('Done.') print ('Preparing train set...') diff --git a/Tutorials/Webinar-10-26-2017/utils.py b/Tutorials/Webinar-10-26-2017/utils.py index 260ea38..afad56d 100644 --- a/Tutorials/Webinar-10-26-2017/utils.py +++ b/Tutorials/Webinar-10-26-2017/utils.py @@ -60,7 +60,26 @@ def download_cifar(download_dir, src="http://www.cs.toronto.edu/~kriz/cifar-10-p print ('Extracting files...') with tarfile.open(fname) as tar: - tar.extractall(download_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(tar, download_dir) print ('Done.') print ('Preparing train set...')