User authentication with tests.

gns3server/api/routes/controller/dependencies/authentication.py

@@ -23,12 +23,15 @@ from gns3server import schemas
 from gns3server.db.repositories.users import UsersRepository
 from gns3server.services import auth_service
 
+from .database import get_repository
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/v3/users/login")  # FIXME: URL prefix
 
 
-async def get_user_from_token(token: str = Depends(oauth2_scheme),
-                              user_repo: UsersRepository = Depends()) -> schemas.User:
+async def get_user_from_token(
+        token: str = Depends(oauth2_scheme),
+        user_repo: UsersRepository = Depends(get_repository(UsersRepository))
+) -> schemas.User:
 
     username = auth_service.get_username_from_token(token)
     user = await user_repo.get_user_by_username(username)

gns3server/api/routes/controller/dependencies/database.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2020 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/>.
+
+from typing import Callable, Type
+from fastapi import Depends, Request
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from gns3server.db.repositories.base import BaseRepository
+
+
+async def get_db_session(request: Request) -> AsyncSession:
+
+    session = AsyncSession(request.app.state._db_engine)
+    try:
+        yield session
+    finally:
+        await session.close()
+
+
+def get_repository(repo: Type[BaseRepository]) -> Callable:
+
+    def get_repo(db_session: AsyncSession = Depends(get_db_session)) -> Type[BaseRepository]:
+        return repo(db_session)
+    return get_repo

gns3server/api/routes/controller/users.py

@@ -20,7 +20,7 @@ API routes for users.
 """
 
 from fastapi import APIRouter, Depends, HTTPException, status
-from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from fastapi.security import OAuth2PasswordRequestForm
 from uuid import UUID
 from typing import List
 
@@ -30,6 +30,7 @@ from gns3server.db.repositories.users import UsersRepository
 from gns3server.services import auth_service
 
 from .dependencies.authentication import get_current_active_user
+from .dependencies.database import get_repository
 
 import logging
 log = logging.getLogger(__name__)
@@ -38,7 +39,7 @@ router = APIRouter()
 
 
 @router.get("", response_model=List[schemas.User])
-async def get_users(user_repo: UsersRepository = Depends()) -> List[schemas.User]:
+async def get_users(user_repo: UsersRepository = Depends(get_repository(UsersRepository))) -> List[schemas.User]:
     """
     Get all users.
     """
@@ -48,7 +49,10 @@ async def get_users(user_repo: UsersRepository = Depends()) -> List[schemas.User
 
 
 @router.post("", response_model=schemas.User, status_code=status.HTTP_201_CREATED)
-async def create_user(new_user: schemas.UserCreate, user_repo: UsersRepository = Depends()) -> schemas.User:
+async def create_user(
+        new_user: schemas.UserCreate,
+        user_repo: UsersRepository = Depends(get_repository(UsersRepository))
+) -> schemas.User:
     """
     Create a new user.
     """
@@ -63,7 +67,10 @@ async def create_user(new_user: schemas.UserCreate, user_repo: UsersRepository =
 
 
 @router.get("/{user_id}", response_model=schemas.User)
-async def get_user(user_id: UUID, user_repo: UsersRepository = Depends()) -> schemas.User:
+async def get_user(
+        user_id: UUID,
+        user_repo: UsersRepository = Depends(get_repository(UsersRepository))
+) -> schemas.User:
     """
     Get an user.
     """
@@ -75,9 +82,11 @@ async def get_user(user_id: UUID, user_repo: UsersRepository = Depends()) -> sch
 
 
 @router.put("/{user_id}", response_model=schemas.User)
-async def update_user(user_id: UUID,
-                      update_user: schemas.UserUpdate,
-                      user_repo: UsersRepository = Depends()) -> schemas.User:
+async def update_user(
+        user_id: UUID,
+        update_user: schemas.UserUpdate,
+        user_repo: UsersRepository = Depends(get_repository(UsersRepository))
+) -> schemas.User:
     """
     Update an user.
     """
@@ -89,7 +98,7 @@ async def update_user(user_id: UUID,
 
 
 @router.delete("/{user_id}", status_code=status.HTTP_204_NO_CONTENT)
-async def delete_user(user_id: UUID, user_repo: UsersRepository = Depends()):
+async def delete_user(user_id: UUID, user_repo: UsersRepository = Depends(get_repository(UsersRepository))):
     """
     Delete an user.
     """
@@ -100,8 +109,10 @@ async def delete_user(user_id: UUID, user_repo: UsersRepository = Depends()):
 
 
 @router.post("/login", response_model=schemas.Token)
-async def login(user_repo: UsersRepository = Depends(),
-                form_data: OAuth2PasswordRequestForm = Depends()) -> schemas.Token:
+async def login(
+        user_repo: UsersRepository = Depends(get_repository(UsersRepository)),
+        form_data: OAuth2PasswordRequestForm = Depends()
+) -> schemas.Token:
     """
     User login.
     """

gns3server/api/server.py

@@ -45,34 +45,43 @@ import logging
 log = logging.getLogger(__name__)
 
 
-app = FastAPI(title="GNS3 controller API",
-              description="This page describes the public controller API for GNS3",
-              version="v3")
+def get_application() -> FastAPI:
 
-origins = [
-    "http://127.0.0.1",
-    "http://localhost",
-    "http://127.0.0.1:8080",
-    "http://localhost:8080",
-    "http://127.0.0.1:3080",
-    "http://localhost:3080",
-    "http://gns3.github.io",
-    "https://gns3.github.io"
-]
+    application = FastAPI(
+        title="GNS3 controller API",
+        description="This page describes the public controller API for GNS3",
+        version="v3"
+    )
 
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=origins,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
+    origins = [
+        "http://127.0.0.1",
+        "http://localhost",
+        "http://127.0.0.1:8080",
+        "http://localhost:8080",
+        "http://127.0.0.1:3080",
+        "http://localhost:3080",
+        "http://gns3.github.io",
+        "https://gns3.github.io"
+    ]
 
-app.add_event_handler("startup", tasks.create_startup_handler(app))
-app.add_event_handler("shutdown", tasks.create_shutdown_handler(app))
-app.include_router(index.router, tags=["Index"])
-app.include_router(controller.router, prefix="/v3")
-app.mount("/v3/compute", compute_api)
+    application.add_middleware(
+            CORSMiddleware,
+            allow_origins=origins,
+            allow_credentials=True,
+            allow_methods=["*"],
+            allow_headers=["*"],
+        )
+
+    application.add_event_handler("startup", tasks.create_startup_handler(application))
+    application.add_event_handler("shutdown", tasks.create_shutdown_handler(application))
+    application.include_router(index.router, tags=["Index"])
+    application.include_router(controller.router, prefix="/v3")
+    application.mount("/v3/compute", compute_api)
+
+    return application
+
+
+app = get_application()
 
 
 @app.exception_handler(ControllerError)