Fix code style

own
Bobholamovic 2 years ago
parent 018b0e76d1
commit d4d8ffe2dc
  1. 14
      paddlers/models/ppcls/utils/model_zoo.py
  2. 14
      paddlers/utils/download.py

@ -151,8 +151,8 @@ def _decompress(fname):
if fname.find('tar') >= 0:
with tarfile.open(fname) as tf:
def is_within_directory(directory, target):
def _is_within_directory(directory, target):
abs_directory = os.path.abspath(directory)
abs_target = os.path.abspath(target)
@ -160,17 +160,19 @@ def _decompress(fname):
return prefix == abs_directory
def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
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):
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(tf, path=fpath_tmp)
_safe_extract(tf, path=fpath_tmp)
elif fname.find('zip') >= 0:
with zipfile.ZipFile(fname) as zf:
zf.extractall(path=fpath_tmp)

@ -151,8 +151,8 @@ def decompress(fname):
if fname.find('tar') >= 0 or fname.find('tgz') >= 0:
with tarfile.open(fname) as tf:
def is_within_directory(directory, target):
def _is_within_directory(directory, target):
abs_directory = os.path.abspath(directory)
abs_target = os.path.abspath(target)
@ -160,17 +160,19 @@ def decompress(fname):
return prefix == abs_directory
def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
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):
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(tf, path=fpath_tmp)
_safe_extract(tf, path=fpath_tmp)
elif fname.find('zip') >= 0:
with zipfile.ZipFile(fname) as zf:
zf.extractall(path=fpath_tmp)

Loading…
Cancel
Save