diff --git a/GeoLogonalyzer.py b/GeoLogonalyzer.py index b84d7fa..b842729 100644 --- a/GeoLogonalyzer.py +++ b/GeoLogonalyzer.py @@ -206,7 +206,26 @@ def create_geoip_db(): sys.stderr.write("Extracting GeoLite Database.\n") with tarfile.open("GeoLite2-City.tar.gz", "r:gz") as tar: tar_directory = tar.getnames()[0] - tar.extractall() + 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) # Clean up unnecessary files sys.stderr.write("Cleaning up.\n\n") @@ -251,7 +270,26 @@ def create_asn_db(): sys.stderr.write("Extracting ASN Database.\n") with tarfile.open("GeoLite2-ASN.tar.gz", "r:gz") as tar: tar_directory = tar.getnames()[0] - tar.extractall() + 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) # Clean up unnecessary files sys.stderr.write("Cleaning up.\n\n")