Support /static/ files serving, Ref: #1362

This commit is contained in:
ziajka committed 2018-06-22 15:29:47 +02:00
1 parent 96d5e351f7
commit 867e997b74
10 files changed
+151 -4

No files matched your search

+26
View File
@@ -14,12 +14,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import aiohttp
from gns3server.web.route import Route
from gns3server.controller import Controller
from gns3server.compute.port_manager import PortManager
from gns3server.compute.project_manager import ProjectManager
from gns3server.version import __version__
from gns3server.utils.static import get_static_path
class IndexHandler:
@@ -64,6 +67,29 @@ class IndexHandler:
response.template("project.html",
project=controller.get_project(request.match_info["project_id"]))
@Route.get(
r"/static/{filename:.+}",
parameters={
"filename": "Static filename"
},
status_codes={
200: "Static file returned",
404: "Static cannot be found",
},
raw=True,
description="Get static resource")
def static(request, response):
filename = request.match_info["filename"]
filename = os.path.normpath(filename).strip("/")
# Raise error if user try to escape
if filename[0] == ".":
raise aiohttp.web.HTTPForbidden()
static = get_static_path(filename)
yield from response.file(static)
@Route.get(
r"/v1/version",
description="Old 1.0 API"
View File
Whitespace-only changes.
View File
Whitespace-only changes.
+29
View File
@@ -0,0 +1,29 @@
#!/usr/bin/env python
#
# Copyright (C) 2018 GNS3 Technologies Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
def get_static_path(filename):
"""
Returns full static path for given filename
:param filename: relative filename
:return: absolute path
"""
current_dir = os.path.dirname(os.path.abspath(__file__))
static_directory = os.path.abspath(os.path.join(current_dir, '..', 'static'))
return os.path.join(static_directory, filename)
+3
View File
@@ -117,6 +117,9 @@ class Response(aiohttp.web.Response):
"""
Return a file as a response
"""
if not os.path.exists(path):
raise aiohttp.web.HTTPNotFound()
ct, encoding = mimetypes.guess_type(path)
if not ct:
ct = 'application/octet-stream'