pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed checks with os.path.realpath() for systems with symlinked paths

Browse source
This commit is contained in:
Mark Bastiaans 2015-09-08 11:35:53 +02:00
parent d3abeed3a9
commit b7c9949caf
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/settings.py
View file

@ -1072,7 +1072,7 @@ class Settings(object):
def saveScript(self, script_type, name, script): def saveScript(self, script_type, name, script):
script_folder = self.getBaseFolder("scripts") script_folder = self.getBaseFolder("scripts")
filename = os.path.realpath(os.path.join(script_folder, script_type, name)) filename = os.path.realpath(os.path.join(script_folder, script_type, name))
if not filename.startswith(script_folder): if not filename.startswith(os.path.realpath(script_folder)):
# oops, jail break, that shouldn't happen # oops, jail break, that shouldn't happen
raise ValueError("Invalid script path to save to: {filename} (from {script_type}:{name})".format(**locals())) raise ValueError("Invalid script path to save to: {filename} (from {script_type}:{name})".format(**locals()))

2
src/octoprint/slicing/__init__.py
View file

@ -585,7 +585,7 @@ class SlicingManager(object):
name = self._sanitize(name) name = self._sanitize(name)
path = os.path.join(self.get_slicer_profile_path(slicer), "{name}.profile".format(name=name)) path = os.path.join(self.get_slicer_profile_path(slicer), "{name}.profile".format(name=name))
if not os.path.realpath(path).startswith(self._profile_path): if not os.path.realpath(path).startswith(os.path.realpath(self._profile_path)):
raise IOError("Path to profile {name} tried to break out of allows sub path".format(**locals())) raise IOError("Path to profile {name} tried to break out of allows sub path".format(**locals()))
if must_exist and not (os.path.exists(path) and os.path.isfile(path)): if must_exist and not (os.path.exists(path) and os.path.isfile(path)):
raise UnknownProfile(slicer, name) raise UnknownProfile(slicer, name)