diff --git a/data/noaa/clean.py b/data/noaa/clean.py index c2dd0d8..00dc278 100644 --- a/data/noaa/clean.py +++ b/data/noaa/clean.py @@ -17,7 +17,26 @@ with ZipFile(station_zip) as stations: stations.extractall(tmp) with tarfile.open(climate_tar) as climate: - climate.extractall(tmp) + 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(climate, tmp) climate_dir = os.path.join(tmp, '2006_daily') stations_file = os.path.join(tmp, 'wbanmasterlist.psv')