From d2f9f91a5c5f655e98ff04a8fd73281638b392c8 Mon Sep 17 00:00:00 2001 From: msramalho <19508417+msramalho@users.noreply.github.com> Date: Sun, 20 Oct 2024 19:14:13 +0100 Subject: [PATCH] relocating security file --- src/db/crud.py | 2 +- src/endpoints/default.py | 2 +- src/endpoints/interoperability.py | 2 +- src/endpoints/sheet.py | 2 +- src/endpoints/task.py | 2 +- src/endpoints/url.py | 2 +- src/tests/conftest.py | 2 +- src/tests/db/test_crud.py | 12 ++++++------ src/tests/endpoints/test_default.py | 2 +- src/web/main.py | 2 +- src/{ => web}/security.py | 0 11 files changed, 15 insertions(+), 15 deletions(-) rename src/{ => web}/security.py (100%) diff --git a/src/db/crud.py b/src/db/crud.py index 4a4c383..b251e6d 100644 --- a/src/db/crud.py +++ b/src/db/crud.py @@ -4,7 +4,7 @@ from sqlalchemy import Column, or_, func from loguru import logger from datetime import datetime, timedelta -from security import ALLOW_ANY_EMAIL +from web.security import ALLOW_ANY_EMAIL from shared.settings import Settings from . import models, schemas import yaml diff --git a/src/endpoints/default.py b/src/endpoints/default.py index 7a6a9ea..da2fc97 100644 --- a/src/endpoints/default.py +++ b/src/endpoints/default.py @@ -7,7 +7,7 @@ from sqlalchemy.orm import Session from core.config import VERSION, BREAKING_CHANGES from db import crud from db.database import get_db_dependency, get_db -from security import get_user_auth, bearer_security +from web.security import get_user_auth, bearer_security default_router = APIRouter() diff --git a/src/endpoints/interoperability.py b/src/endpoints/interoperability.py index 7885b08..d1bcfa4 100644 --- a/src/endpoints/interoperability.py +++ b/src/endpoints/interoperability.py @@ -4,7 +4,7 @@ from auto_archiver import Metadata from loguru import logger import sqlalchemy -from security import token_api_key_auth +from web.security import token_api_key_auth from db import models, schemas from worker import insert_result_into_db diff --git a/src/endpoints/sheet.py b/src/endpoints/sheet.py index 74cee62..5c6a6dd 100644 --- a/src/endpoints/sheet.py +++ b/src/endpoints/sheet.py @@ -4,7 +4,7 @@ from fastapi.responses import JSONResponse from loguru import logger -from security import ALLOW_ANY_EMAIL, get_token_or_user_auth +from web.security import ALLOW_ANY_EMAIL, get_token_or_user_auth from db import schemas from worker import create_sheet_task diff --git a/src/endpoints/task.py b/src/endpoints/task.py index a6b09b4..7544aca 100644 --- a/src/endpoints/task.py +++ b/src/endpoints/task.py @@ -5,7 +5,7 @@ from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse from loguru import logger -from security import get_token_or_user_auth +from web.security import get_token_or_user_auth from db import schemas diff --git a/src/endpoints/url.py b/src/endpoints/url.py index 0771ed6..9a59b77 100644 --- a/src/endpoints/url.py +++ b/src/endpoints/url.py @@ -4,7 +4,7 @@ from fastapi.responses import JSONResponse from datetime import datetime from loguru import logger -from security import get_user_auth, get_token_or_user_auth +from web.security import get_user_auth, get_token_or_user_auth from sqlalchemy.orm import Session from db import crud, schemas diff --git a/src/tests/conftest.py b/src/tests/conftest.py index bfe52cb..407616d 100644 --- a/src/tests/conftest.py +++ b/src/tests/conftest.py @@ -71,7 +71,7 @@ def client(app): @pytest.fixture() def app_with_auth(app): - from security import get_token_or_user_auth, get_user_auth, token_api_key_auth + from web.security import get_token_or_user_auth, get_user_auth, token_api_key_auth app.dependency_overrides[get_token_or_user_auth] = lambda: "rick@example.com" app.dependency_overrides[get_user_auth] = lambda: "morty@example.com" app.dependency_overrides[token_api_key_auth] = lambda: "jerry@example.com" diff --git a/src/tests/db/test_crud.py b/src/tests/db/test_crud.py index 7603191..a4fdeff 100644 --- a/src/tests/db/test_crud.py +++ b/src/tests/db/test_crud.py @@ -57,7 +57,7 @@ def test_data(db_session): def test_get_archive(test_data, db_session): from db import crud - from security import ALLOW_ANY_EMAIL + from web.security import ALLOW_ANY_EMAIL print(db_session.query(models.Group).all()) @@ -88,7 +88,7 @@ def test_get_archive(test_data, db_session): def test_search_archives_by_url(test_data, db_session): from db import crud - from security import ALLOW_ANY_EMAIL + from web.security import ALLOW_ANY_EMAIL # rick's archives are private assert len(crud.search_archives_by_url(db_session, "https://example-0.com", "rick@example.com")) == 34 @@ -133,9 +133,9 @@ def test_search_archives_by_url(test_data, db_session): def test_search_archives_by_email(test_data, db_session): - from security import ALLOW_ANY_EMAIL + from web.security import ALLOW_ANY_EMAIL from db import crud - from security import ALLOW_ANY_EMAIL + from web.security import ALLOW_ANY_EMAIL # lower/upper case assert len(crud.search_archives_by_email(db_session, "rick@example.com")) == 34 @@ -158,7 +158,7 @@ def test_search_archives_by_email(test_data, db_session): @patch("db.crud.DATABASE_QUERY_LIMIT", new=25) def test_max_query_limit(test_data, db_session): from db import crud - from security import ALLOW_ANY_EMAIL + from web.security import ALLOW_ANY_EMAIL assert len(crud.search_archives_by_url(db_session, "https://example", ALLOW_ANY_EMAIL)) == 25 assert len(crud.search_archives_by_url(db_session, "https://example", ALLOW_ANY_EMAIL, limit=1000)) == 25 @@ -290,7 +290,7 @@ def test_create_tag(db_session): def test_is_user_in_group(test_data, db_session): from db import crud - from security import ALLOW_ANY_EMAIL + from web.security import ALLOW_ANY_EMAIL # see user-groups.test.yaml test_pairs = [ diff --git a/src/tests/endpoints/test_default.py b/src/tests/endpoints/test_default.py index 4242a12..c9a4149 100644 --- a/src/tests/endpoints/test_default.py +++ b/src/tests/endpoints/test_default.py @@ -57,7 +57,7 @@ def test_endpoint_groups_rick_and_morty(client_with_auth): @patch("endpoints.default.crud.get_user_groups", return_value=["group1", "group2"]) def test_endpoint_groups(m1, app): - from security import get_user_auth + from web.security import get_user_auth app.dependency_overrides[get_user_auth] = lambda: True client = TestClient(app) diff --git a/src/web/main.py b/src/web/main.py index 51fbb58..be125c4 100644 --- a/src/web/main.py +++ b/src/web/main.py @@ -15,7 +15,7 @@ from core.logging import logging_middleware from worker import create_archive_task, create_sheet_task, celery, insert_result_into_db from db import crud, models, schemas -from security import get_user_auth, token_api_key_auth, get_token_or_user_auth +from web.security import get_user_auth, token_api_key_auth, get_token_or_user_auth from core.config import VERSION, API_DESCRIPTION from db.database import get_db_dependency from core.events import lifespan diff --git a/src/security.py b/src/web/security.py similarity index 100% rename from src/security.py rename to src/web/security.py