oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate isValidRelativePath function

Browse source
This commit is contained in:
shortcutme 2017-07-13 14:58:52 +02:00
parent 1bb3140f5b
commit 96a097e33d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Content/ContentManager.py
View file

@ -477,11 +477,19 @@ class ContentManager(object):
back[file_relative_path] = {"sha512": sha512sum, "size": os.path.getsize(file_path)} back[file_relative_path] = {"sha512": sha512sum, "size": os.path.getsize(file_path)}
return back return back
def isValidRelativePath(self, relative_path):
if ".." in relative_path:
return False
elif len(relative_path) > 255:
return False
else:
return re.match("^[a-z\[\]\(\) A-Z0-9_@=\.\+-/]*$", relative_path)
# Hash files in directory # Hash files in directory
def hashFiles(self, dir_inner_path, ignore_pattern=None, optional_pattern=None): def hashFiles(self, dir_inner_path, ignore_pattern=None, optional_pattern=None):
files_node = {} files_node = {}
files_optional_node = {} files_optional_node = {}
if not re.match("^[a-zA-Z0-9_@=\.\+-/]*$", dir_inner_path): if not isValidRelativePath(dir_inner_path):
ignored = True ignored = True
self.log.error("- [ERROR] Only ascii encoded directories allowed: %s" % dir_inner_path) self.log.error("- [ERROR] Only ascii encoded directories allowed: %s" % dir_inner_path)
@ -495,9 +503,9 @@ class ContentManager(object):
ignored = True ignored = True
elif file_name.startswith(".") or file_name.endswith("-old") or file_name.endswith("-new"): elif file_name.startswith(".") or file_name.endswith("-old") or file_name.endswith("-new"):
ignored = True ignored = True
elif not re.match("^[a-zA-Z0-9_@=\.\+\-/]+$", file_relative_path): elif not self.isValidRelativePath(file_relative_path):
ignored = True ignored = True
self.log.error("- [ERROR] Only ascii encoded filenames allowed: %s" % file_relative_path) self.log.error("- [ERROR] Invalid filename: %s" % file_relative_path)
elif optional_pattern and re.match(optional_pattern, file_relative_path): elif optional_pattern and re.match(optional_pattern, file_relative_path):
optional = True optional = True