arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Fix config option to disable built-in templates.

Browse Source
This commit is contained in:
grossmj 2022-06-21 17:17:44 +02:00
parent d8b928f1c1
commit 410f062721
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/schemas/config.py
View File

@ -138,6 +138,7 @@ class ServerSettings(BaseModel):
allowed_interfaces: List[str] = Field(default_factory=list) allowed_interfaces: List[str] = Field(default_factory=list)
default_nat_interface: str = None default_nat_interface: str = None
allow_remote_console: bool = False allow_remote_console: bool = False
enable_builtin_templates: bool = True
@validator("additional_images_paths", pre=True) @validator("additional_images_paths", pre=True)
def split_additional_images_paths(cls, v): def split_additional_images_paths(cls, v):

6
gns3server/services/templates.py
View File

@ -23,6 +23,7 @@ from fastapi.encoders import jsonable_encoder
from typing import List from typing import List
from gns3server import schemas from gns3server import schemas
from gns3server.config import Config
import gns3server.db.models as models import gns3server.db.models as models
from gns3server.db.repositories.templates import TemplatesRepository from gns3server.db.repositories.templates import TemplatesRepository
from gns3server.controller.controller_error import ( from gns3server.controller.controller_error import (
@ -174,8 +175,9 @@ class TemplatesService:
db_templates = await self._templates_repo.get_templates() db_templates = await self._templates_repo.get_templates()
for db_template in db_templates: for db_template in db_templates:
templates.append(db_template.asjson()) templates.append(db_template.asjson())
for builtin_template in BUILTIN_TEMPLATES: if Config.instance().settings.Server.enable_builtin_templates:
templates.append(jsonable_encoder(builtin_template)) for builtin_template in BUILTIN_TEMPLATES:
templates.append(jsonable_encoder(builtin_template))
return templates return templates
async def _find_image(self, image_path: str): async def _find_image(self, image_path: str):

13
tests/api/routes/controller/test_templates.py
View File

@ -28,6 +28,7 @@ from tests.utils import asyncio_patch
from gns3server.db.repositories.images import ImagesRepository from gns3server.db.repositories.images import ImagesRepository
from gns3server.db.repositories.templates import TemplatesRepository from gns3server.db.repositories.templates import TemplatesRepository
from gns3server.controller import Controller from gns3server.controller import Controller
from gns3server.controller import Config
from gns3server.services.templates import BUILTIN_TEMPLATES from gns3server.services.templates import BUILTIN_TEMPLATES
pytestmark = pytest.mark.asyncio pytestmark = pytest.mark.asyncio
@ -257,6 +258,18 @@ class TestBuiltinTemplates:
response = await client.delete(app.url_path_for("delete_template", template_id=template_id)) response = await client.delete(app.url_path_for("delete_template", template_id=template_id))
assert response.status_code == status.HTTP_403_FORBIDDEN assert response.status_code == status.HTTP_403_FORBIDDEN
async def test_list_builtin_templates_not_enabled(
self,
app: FastAPI,
client: AsyncClient,
controller: Controller
) -> None:
config = Config.instance()
config.settings.Server.enable_builtin_templates = False
response = await client.get(app.url_path_for("get_templates"))
assert not response.json()
class TestDynamipsTemplate: class TestDynamipsTemplate: