Skip to content

Commit

Permalink
black
Browse files Browse the repository at this point in the history
  • Loading branch information
neteler committed Oct 3, 2023
1 parent 0f4b8cb commit b338a89
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions src/imagery/i.landsat/i.landsat.import/i.landsat.import.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@


def _untar(inputdir, untardir):

if not os.path.exists(inputdir):
gs.fatal(_("Directory <{}> does not exist").format(inputdir))
if not os.path.isdir(inputdir):
Expand All @@ -156,25 +155,23 @@ def _untar(inputdir, untardir):

for scene in scenes_to_untar:
with tarfile.open(name=scene, mode="r") as tar:

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)



tar.extractall(path, members, numeric_owner=numeric_owner)

safe_extract(tar, untardir)

untared_tifs = glob.glob(os.path.join(untardir, "*.TIF"))
Expand Down Expand Up @@ -299,7 +296,6 @@ def print_products(filenames):


def main():

inputdir = options["input"]
untardir = options["unzip_dir"]

Expand Down

0 comments on commit b338a89

Please sign in to comment.