ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-19 07:48:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanup code for getting the default project directory

Browse Source
This commit is contained in:
Julien Duponchelle
2016-05-11 18:42:55 +02:00
parent a0344576ba
commit 9ccb55206d
8 changed files with 46 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gns3server/utils/path.py
View File

@ -21,6 +21,22 @@ import aiohttp
from ..config import Config
def get_default_project_directory():
"""
Return the default location for the project directory
depending of the operating system
"""
server_config = Config.instance().get_section_config("Server")
path = os.path.expanduser(server_config.get("projects_path", "~/GNS3/projects"))
path = os.path.normpath(path)
try:
os.makedirs(path, exist_ok=True)
except OSError as e:
raise aiohttp.web.HTTPInternalServerError(text="Could not create project directory: {}".format(e))
return path
def check_path_allowed(path):
"""
If the server is non local raise an error if
@ -30,10 +46,10 @@ def check_path_allowed(path):
"""
config = Config.instance().get_section_config("Server")
project_directory = config.get("project_directory")
project_directory = get_default_project_directory()
if len(os.path.commonprefix([project_directory, path])) == len(project_directory):
return
if config.getboolean("local") is False:
if "local" in config and config.getboolean("local") is False:
raise aiohttp.web.HTTPForbidden(text="The path is not allowed")