Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a63b10c73 | |||
| 25a8900357 | |||
| 5a1f99eb28 | |||
| cb95895612 | |||
| 62889f39f1 | |||
| ef646a8e54 | |||
| e4d3fe566b | |||
| 1d0222d980 | |||
| 433d5d8f9f |
@@ -0,0 +1,30 @@
|
||||
"""add date_of_birth column to users table
|
||||
|
||||
Revision ID: 0002_add_date_of_birth_to_users
|
||||
Revises: 0001_initial
|
||||
Create Date: 2025-01-01 00:00:00.000000
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "0002_add_date_of_birth_to_users"
|
||||
down_revision: Union[str, None] = "0001_initial"
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Add date_of_birth column to users table."""
|
||||
op.add_column(
|
||||
"users",
|
||||
sa.Column("date_of_birth", sa.Date(), nullable=True),
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Remove date_of_birth column from users table."""
|
||||
op.drop_column("users", "date_of_birth")
|
||||
@@ -1,4 +1,7 @@
|
||||
from sqlalchemy import Column, Integer, String, Boolean, DateTime
|
||||
from datetime import date
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date
|
||||
from sqlalchemy.orm import relationship
|
||||
from sqlalchemy.sql import func
|
||||
|
||||
@@ -12,6 +15,7 @@ class User(Base):
|
||||
username = Column(String(50), unique=True, index=True, nullable=False)
|
||||
email = Column(String(120), unique=True, index=True, nullable=False)
|
||||
hashed_password = Column(String(255), nullable=False)
|
||||
date_of_birth = Column(Date, nullable=True)
|
||||
is_active = Column(Boolean, default=True)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
|
||||
@@ -19,3 +23,15 @@ class User(Base):
|
||||
sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
|
||||
worlds = relationship("World", back_populates="owner")
|
||||
assets = relationship("Asset", back_populates="owner")
|
||||
|
||||
@property
|
||||
def is_adult(self) -> bool:
|
||||
"""Return True if the user is 18 or older based on date_of_birth."""
|
||||
if self.date_of_birth is None:
|
||||
return False
|
||||
today = date.today()
|
||||
age = today.year - self.date_of_birth.year
|
||||
# Adjust if birthday hasn't occurred yet this year
|
||||
if (today.month, today.day) < (self.date_of_birth.month, self.date_of_birth.day):
|
||||
age -= 1
|
||||
return age >= 18
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
"""Authentication router - login, register, token refresh."""
|
||||
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from datetime import date, datetime, timedelta, timezone
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from fastapi.security import OAuth2PasswordRequestForm
|
||||
from pydantic import BaseModel, EmailStr
|
||||
from pydantic import BaseModel, EmailStr, field_validator
|
||||
|
||||
from jose import jwt
|
||||
from passlib.context import CryptContext
|
||||
@@ -32,12 +32,24 @@ class RegisterRequest(BaseModel):
|
||||
username: str
|
||||
email: EmailStr
|
||||
password: str
|
||||
date_of_birth: str # ISO format date string (YYYY-MM-DD)
|
||||
|
||||
@field_validator("date_of_birth")
|
||||
@classmethod
|
||||
def validate_date_of_birth(cls, v: str) -> str:
|
||||
"""Validate that the date string is a valid date in YYYY-MM-DD format."""
|
||||
try:
|
||||
datetime.strptime(v, "%Y-%m-%d")
|
||||
except ValueError:
|
||||
raise ValueError("date_of_birth must be in YYYY-MM-DD format")
|
||||
return v
|
||||
|
||||
|
||||
class UserResponse(BaseModel):
|
||||
id: int
|
||||
username: str
|
||||
email: str
|
||||
date_of_birth: str | None = None
|
||||
is_active: bool
|
||||
created_at: datetime | None = None
|
||||
|
||||
@@ -65,11 +77,44 @@ def hash_password(password: str) -> str:
|
||||
return pwd_context.hash(password)
|
||||
|
||||
|
||||
def calculate_age(birth_date: date, today: date | None = None) -> int:
|
||||
"""Calculate age in years from a birth date.
|
||||
|
||||
Args:
|
||||
birth_date: The person's date of birth.
|
||||
today: The reference date. Defaults to today's date (UTC).
|
||||
|
||||
Returns:
|
||||
Age in whole years as of the reference date.
|
||||
"""
|
||||
if today is None:
|
||||
today = datetime.now(timezone.utc).date()
|
||||
|
||||
age = today.year - birth_date.year
|
||||
# Adjust if birthday hasn't occurred yet this year
|
||||
if (today.month, today.day) < (birth_date.month, birth_date.day):
|
||||
age -= 1
|
||||
return age
|
||||
|
||||
|
||||
# --- Endpoints ---
|
||||
|
||||
@router.post("/register", response_model=TokenResponse, status_code=status.HTTP_201_CREATED)
|
||||
async def register(req: RegisterRequest, db: AsyncSession = Depends(get_db)):
|
||||
"""Register a new user and return an access token."""
|
||||
"""Register a new user and return an access token.
|
||||
|
||||
Requires date_of_birth and rejects users under 18.
|
||||
"""
|
||||
# Parse and validate date_of_birth
|
||||
dob = datetime.strptime(req.date_of_birth, "%Y-%m-%d").date()
|
||||
age = calculate_age(dob)
|
||||
|
||||
if age < 18:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Must be 18 or older to register (provided date of birth: {req.date_of_birth})",
|
||||
)
|
||||
|
||||
# Check if username already exists
|
||||
result = await db.execute(select(User).where(User.username == req.username))
|
||||
if result.scalar_one_or_none():
|
||||
@@ -90,6 +135,7 @@ async def register(req: RegisterRequest, db: AsyncSession = Depends(get_db)):
|
||||
username=req.username,
|
||||
email=req.email,
|
||||
hashed_password=hash_password(req.password),
|
||||
date_of_birth=dob,
|
||||
)
|
||||
db.add(user)
|
||||
await db.commit()
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
[pytest]
|
||||
asyncio_mode = auto
|
||||
testpaths = tests
|
||||
@@ -0,0 +1,94 @@
|
||||
"""Tests for the 18+ age gate on user registration."""
|
||||
|
||||
from datetime import date, timedelta
|
||||
|
||||
import pytest
|
||||
|
||||
from app.routers.auth import calculate_age
|
||||
|
||||
|
||||
class TestCalculateAge:
|
||||
"""Unit tests for the calculate_age helper."""
|
||||
|
||||
def test_exactly_18(self):
|
||||
"""A person born exactly 18 years ago today is 18."""
|
||||
today = date(2025, 6, 15)
|
||||
dob = today.replace(year=today.year - 18)
|
||||
assert calculate_age(dob, today=today) == 18
|
||||
|
||||
def test_just_turned_18(self):
|
||||
"""A person who turned 18 yesterday is 18."""
|
||||
today = date(2025, 6, 15)
|
||||
dob = today.replace(year=today.year - 18) - timedelta(days=1)
|
||||
assert calculate_age(dob, today=today) == 18
|
||||
|
||||
def test_one_day_short_of_18(self):
|
||||
"""A person born one day after their 18th birthday is 17."""
|
||||
today = date(2025, 6, 15)
|
||||
dob = today.replace(year=today.year - 18) + timedelta(days=1)
|
||||
assert calculate_age(dob, today=today) == 17
|
||||
|
||||
def test_17_years_old(self):
|
||||
"""A person who is 17 years old today is 17."""
|
||||
today = date(2025, 6, 15)
|
||||
dob = date(2008, 6, 15)
|
||||
assert calculate_age(dob, today=today) == 17
|
||||
|
||||
def test_65_years_old(self):
|
||||
"""A person who is 65 is correctly calculated."""
|
||||
today = date(2025, 6, 15)
|
||||
dob = today.replace(year=today.year - 65)
|
||||
assert calculate_age(dob, today=today) == 65
|
||||
|
||||
def test_newborn(self):
|
||||
"""A newborn is 0."""
|
||||
today = date(2025, 6, 15)
|
||||
dob = today
|
||||
assert calculate_age(dob, today=today) == 0
|
||||
|
||||
def test_birthday_not_yet_this_year(self):
|
||||
"""Person born Dec 31, 2000 — on Jan 1, 2025 they are still 24."""
|
||||
dob = date(2000, 12, 31)
|
||||
assert calculate_age(dob, today=date(2025, 1, 1)) == 24
|
||||
|
||||
def test_birthday_today(self):
|
||||
"""Person born Dec 31, 2000 — on Dec 31, 2024 they turn 24."""
|
||||
dob = date(2000, 12, 31)
|
||||
assert calculate_age(dob, today=date(2024, 12, 31)) == 24
|
||||
|
||||
|
||||
class TestRegisterRequestDateValidation:
|
||||
"""Tests for the RegisterRequest date_of_birth field validator."""
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"dob",
|
||||
[
|
||||
"2000-01-01",
|
||||
"1990-12-31",
|
||||
"2004-02-29", # leap day
|
||||
],
|
||||
)
|
||||
def test_valid_dates(self, dob):
|
||||
"""Valid YYYY-MM-DD dates pass validation."""
|
||||
from app.routers.auth import RegisterRequest
|
||||
|
||||
req = RegisterRequest(username="u", email="u@example.com", password="p", date_of_birth=dob)
|
||||
assert req.date_of_birth == dob
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"dob",
|
||||
[
|
||||
"01-01-2000",
|
||||
"2000/01/01",
|
||||
"2000-13-01",
|
||||
"2000-00-10",
|
||||
"not-a-date",
|
||||
"",
|
||||
],
|
||||
)
|
||||
def test_invalid_dates_rejected(self, dob):
|
||||
"""Invalid dates are rejected by the validator."""
|
||||
from app.routers.auth import RegisterRequest
|
||||
|
||||
with pytest.raises(ValueError):
|
||||
RegisterRequest(username="u", email="u@example.com", password="p", date_of_birth=dob)
|
||||
@@ -0,0 +1,160 @@
|
||||
# Trust & Safety Operations — Plan
|
||||
|
||||
> **Status:** Planned
|
||||
> **Owner:** Platform team
|
||||
> **Feature ID:** `trust_safety`
|
||||
> **Godot version:** 4.6.2 stable
|
||||
> **Backend:** FastAPI + SQLAlchemy (async) + PostgreSQL (+ Redis available, unused)
|
||||
> **Related:** `content_moderation.md` (M5 — content rating/flagging at upload time),
|
||||
> `social.md` (chat + report-message), `app/dependencies.py` (JWT auth)
|
||||
|
||||
## 1. Overview
|
||||
|
||||
This feature is the **enforcement workflow** for content/behavior that is
|
||||
**already live** and has been reported by a real user. M5
|
||||
(`content_moderation.md`) covers rating/flagging at authoring/upload time; this
|
||||
feature covers what happens **after** something is live and someone reports it:
|
||||
|
||||
1. **Reporting** — report a user, an experience (world/asset), or a chat
|
||||
message with a reason and optional detail.
|
||||
2. **Moderation queue** — staff review incoming reports, see report + target
|
||||
context, and resolve them.
|
||||
3. **Ban / suspension** — apply a temporary suspension or permanent ban to a
|
||||
user, with enforcement at the auth boundary.
|
||||
4. **Appeals** — a sanctioned user can appeal; staff can uphold or overturn.
|
||||
|
||||
The userbase being 18+ does **not** shrink the moderation need — harassment,
|
||||
hate speech, spam, griefing, and CSAM/policy violations still require real
|
||||
enforcement. Safety is a **blocking requirement**, not an add-on.
|
||||
|
||||
## 2. Existing constraints (do not re-build)
|
||||
|
||||
- **Auth:** JWT bearer; `get_current_user` / `CurrentUser` in
|
||||
`app/dependencies.py`. Every new endpoint reuses it.
|
||||
- **DB:** async SQLAlchemy + Alembic. Current head is `0002_add_date_of_birth_to_users`.
|
||||
- **Models:** `User`, `World` (owner_id), `Asset` (owner_id, is_public). There
|
||||
is no `role` field yet, and no chat/message table yet (social.md is planned,
|
||||
not built).
|
||||
- **Redis:** configured (`REDIS_URL`) but unused; not required by this feature.
|
||||
- **Client:** Godot 4.6.2, minimal `main_menu.gd`; no report/chat UI yet.
|
||||
|
||||
## 3. Key design decisions
|
||||
|
||||
| Concern | Decision |
|
||||
|---|---|
|
||||
| Report target addressing | Generic `target_type` + `target_id` (string) so user/world/asset/message all flow through one report path; router resolves target existence via a small registry |
|
||||
| Report reasons | Fixed enum `reason_category` (harassment, hate_speech, sexual_content, violence, spam, self_harm, other) + free-text `details` |
|
||||
| Staff roles | Add `role` enum on `User` (`user` / `moderator` / `admin`); `RequireStaff` dependency gates the queue/action/appeal-review endpoints |
|
||||
| Enforcement | Denormalized `banned_until` / `suspended_until` timestamps on `User` (kept in sync by moderation actions); `get_current_user` rejects sanctioned users with `403` so enforcement applies to **all** existing endpoints |
|
||||
| Ban vs. suspension | Suspension = temporary (`expires_at`); ban = permanent (`expires_at IS NULL`). Both are rows in `moderation_actions` for auditability |
|
||||
| Appeals | Appeal references the specific `moderation_action`; approving an appeal revokes the action and clears the user's sanction |
|
||||
| Audit | Every moderation action is an append-only row with `moderator_id`, `reason`, `created_at`, `revoked_at`; reports record `resolved_by` + `resolution` |
|
||||
|
||||
## 4. Data model (target shape)
|
||||
|
||||
```
|
||||
users
|
||||
+ role ENUM(user, moderator, admin) default 'user'
|
||||
+ banned_until TIMESTAMPTZ NULL
|
||||
+ suspended_until TIMESTAMPTZ NULL
|
||||
|
||||
reports
|
||||
id, reporter_id FK users, target_type ENUM(user,world,asset,chat_message),
|
||||
target_id VARCHAR(64), reason_category ENUM(...), details TEXT,
|
||||
status ENUM(open,in_review,resolved,dismissed) default 'open',
|
||||
resolved_by FK users NULL, resolution ENUM(...) NULL,
|
||||
created_at, updated_at, resolved_at
|
||||
|
||||
moderation_actions
|
||||
id, moderator_id FK users, target_user_id FK users,
|
||||
target_type ENUM(user,world,asset,chat_message), target_id VARCHAR(64),
|
||||
action ENUM(warn,suspend,ban,restrict,remove,restore),
|
||||
reason TEXT, report_id FK reports NULL,
|
||||
expires_at TIMESTAMPTZ NULL, revoked_at TIMESTAMPTZ NULL, created_at
|
||||
|
||||
appeals
|
||||
id, moderation_action_id FK moderation_actions,
|
||||
user_id FK users, reason TEXT,
|
||||
status ENUM(pending,approved,rejected) default 'pending',
|
||||
reviewed_by FK users NULL, reviewed_at TIMESTAMPTZ NULL, created_at
|
||||
```
|
||||
|
||||
## 5. User stories
|
||||
|
||||
### US-1 Reporting
|
||||
As a player, I can report a user, an experience (world/asset), or a chat
|
||||
message, choosing a reason and adding optional detail.
|
||||
|
||||
**Acceptance criteria**
|
||||
- Report requires a valid target of the matching type (404 otherwise) and a
|
||||
reason from the fixed category set.
|
||||
- Duplicate reports from the same reporter for the same target are coalesced
|
||||
(409) rather than creating unbounded duplicates.
|
||||
- A report cannot be filed by a banned/suspended user (enforced by existing auth).
|
||||
- Each report stores reporter, target, reason, and created_at; status starts `open`.
|
||||
|
||||
### US-2 Moderation queue & review
|
||||
As a moderator, I can list open reports (filterable by type/status/reason),
|
||||
view a report with its target, and resolve it with an action.
|
||||
|
||||
**Acceptance criteria**
|
||||
- Queue is staff-only (`RequireStaff`); non-staff get 403.
|
||||
- List supports status/type/reason filters + pagination (offset/limit).
|
||||
- Resolving sets `status`, `resolution`, `resolved_by`, `resolved_at` and
|
||||
(where applicable) records a `moderation_actions` row.
|
||||
|
||||
### US-3 Ban / suspension enforcement
|
||||
As a moderator, I can suspend a user temporarily or ban them permanently, and
|
||||
the sanction blocks the user from authenticated endpoints immediately.
|
||||
|
||||
**Acceptance criteria**
|
||||
- Suspension sets `suspended_until`; ban sets `banned_until` (permanent). Warn
|
||||
records an action without blocking.
|
||||
- `get_current_user` returns `403` for any user past a live sanction.
|
||||
- Expired suspensions no longer block (time-based, no cron required).
|
||||
- Removing a ban/suspension is itself a recorded `restore` action.
|
||||
|
||||
### US-4 Appeals
|
||||
As a sanctioned user, I can appeal an active ban/suspension; as a moderator I
|
||||
can approve (overturn) or reject (uphold) it.
|
||||
|
||||
**Acceptance criteria**
|
||||
- A user can submit exactly one open appeal per sanction.
|
||||
- Appeal is tied to the specific `moderation_action`.
|
||||
- Approving revokes the action and clears the user's sanction; rejecting
|
||||
upholds it. Both record reviewer + timestamp.
|
||||
|
||||
## 6. Task breakdown
|
||||
|
||||
Right-sized to ~1–3 files / one coherent piece of functionality. Task IDs are
|
||||
dependency order.
|
||||
|
||||
| # | Task | Story | Depends on |
|
||||
|---|------|-------|-----------|
|
||||
| 1 | Moderation data model + Alembic migration (reports, moderation_actions, appeals, user `role`/`banned_until`/`suspended_until`) | US-1..4 | — |
|
||||
| 2 | Staff authorization + sanction enforcement dependency (`RequireStaff`; extend `get_current_user` to reject sanctioned users) | US-2, US-3 | 1 |
|
||||
| 3 | Report submission endpoints (report user / experience / chat message) | US-1 | 1 |
|
||||
| 4 | Moderation queue + review endpoints (list, detail, resolve→action) | US-2 | 1, 2 |
|
||||
| 5 | Ban/suspend/restore action application + user-sanction sync | US-3 | 2, 4 |
|
||||
| 6 | Appeals endpoints (submit, list, review → uphold/overturn) | US-4 | 1, 5 |
|
||||
| 7 | Integration tests: report → review → ban → appeal → overturn | US-1..4 | 3, 4, 5, 6 |
|
||||
|
||||
## 7. Phasing
|
||||
|
||||
- **Phase 1 (data + enforcement core):** tasks 1–2. Land the schema and make
|
||||
sanctioned users actually unable to act — highest value.
|
||||
- **Phase 2 (report → review → action):** tasks 3–5. The moderation loop.
|
||||
- **Phase 3 (appeals):** task 6.
|
||||
- **Phase 4 (verification):** task 7 integration tests.
|
||||
|
||||
## 8. Out of scope for this feature
|
||||
|
||||
- **Client (Godot) report/appeal UI** — no chat/social UI exists yet; report
|
||||
endpoints are consumed once `social.md` US-6 lands. Client is a follow-up.
|
||||
- Automated content scanning / hash detection (covered by M5 /
|
||||
`content_moderation.md`).
|
||||
- Third-party moderation/CSAM-scanning vendors.
|
||||
- Rate limiting of report submission (Redis is available; add a token-bucket
|
||||
dependency later if abuse is observed).
|
||||
- Voice chat moderation.
|
||||
- Per-jurisdiction legal-takedown workflows (DMCA etc.).
|
||||
Reference in New Issue
Block a user