Merge branch 'main' into monthly-upload

Author: Iain-S

SECURITY.md

@@ -0,0 +1,6 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you find a security vulnerability in this project, we encourage you to let us know immediately. Please report it privately via [reporting security vulnerabilities](https://github.com/alan-turing-institute/rctab-api/security/advisories).
+We will investigate all legitimate reports and provide a fix as quickly as possible.

poetry.lock

@@ -25,6 +25,7 @@ pydantic = { extras = ["email"], version = "^2.7.1" }
 pydantic-settings = "^2.3.4"
 PyJWT = { extras = ["crypto"], version = "^2.4.0" }
 python-dotenv = "^1.0.1"
+rctab_models = { git = "https://github.com/alan-turing-institute/rctab-models", tag = "0.1.0" }
 redis = {extras = ["hiredis"], version = "^5.0.1"}
 requests = "^2.32.3"
 sendgrid = "^6.9.1"

pyproject.toml

@@ -1,9 +1,8 @@
 """The SQLAlchemy models, Pydantic models and database logic."""
 
-from rctab.crud import accounting_models, models, schema
+from rctab.crud import accounting_models, models
 
 __all__ = [
     "models",
     "accounting_models",
-    "schema",
 ]

rctab/crud/__init__.py

@@ -6,11 +6,11 @@
 import msal
 from asyncpg.exceptions import UniqueViolationError
 from fastapi import Depends, HTTPException
+from rctab_models.models import UserRBAC
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.sql import select
 
 from rctab.crud.models import database, user_cache, user_rbac
-from rctab.crud.schema import UserRBAC
 
 
 # Define cache functions

rctab/crud/auth.py

@@ -5,6 +5,7 @@
 from typing import List, Optional
 from uuid import UUID
 
+from rctab_models.models import DEFAULT_CURRENCY, SubscriptionState
 from sqlalchemy import and_, func, insert, select
 
 from rctab.constants import ABOLISHMENT_ADJUSTMENT_MSG, ADJUSTMENT_DELTA
@@ -14,7 +15,6 @@
 from rctab.crud.accounting_models import subscription as subscription_table
 from rctab.crud.accounting_models import subscription_details
 from rctab.crud.models import database
-from rctab.crud.schema import DEFAULT_CURRENCY, SubscriptionState
 from rctab.routers.accounting.routes import get_subscriptions_summary
 from rctab.routers.accounting.send_emails import (
     MissingEmailParamsError,

rctab/crud/schema.py

@@ -3,12 +3,12 @@
 from typing import Any, List
 
 from fastapi import Depends, HTTPException
+from rctab_models.models import Allocation, AllocationListItem, UserRBAC
 from sqlalchemy import insert
 
 from rctab.crud import accounting_models
 from rctab.crud.auth import token_admin_verified
 from rctab.crud.models import database
-from rctab.crud.schema import Allocation, AllocationListItem, UserRBAC
 from rctab.routers.accounting import send_emails
 from rctab.routers.accounting.desired_states import refresh_desired_states
 from rctab.routers.accounting.routes import (

rctab/routers/accounting/abolishment.py

@@ -5,13 +5,13 @@
 from typing import Any, List
 
 from fastapi import Depends, HTTPException
+from rctab_models.models import Approval, ApprovalListItem, UserRBAC
 from sqlalchemy import insert
 
 from rctab.constants import EMAIL_TYPE_SUB_APPROVAL
 from rctab.crud import accounting_models
 from rctab.crud.auth import token_admin_verified
 from rctab.crud.models import database
-from rctab.crud.schema import Approval, ApprovalListItem, UserRBAC
 from rctab.routers.accounting import send_emails
 from rctab.routers.accounting.desired_states import refresh_desired_states
 from rctab.routers.accounting.routes import (

rctab/routers/accounting/allocations.py

@@ -7,6 +7,7 @@
 import sqlalchemy
 from fastapi import Depends, HTTPException
 from pydantic import BaseModel
+from rctab_models.models import CostRecovery, UserRBAC
 from sqlalchemy import and_, between, desc, func, insert, select
 
 from rctab.constants import ADMIN_OID
@@ -18,7 +19,6 @@
 )
 from rctab.crud.auth import token_admin_verified
 from rctab.crud.models import database
-from rctab.crud.schema import CostRecovery, UserRBAC
 from rctab.routers.accounting.routes import router
 from rctab.routers.accounting.usage import authenticate_usage_app