kitos
8f98bdd273
- ruff.toml: select E/W/F/I/N rules, line-length=120, drop legacy ignores - Auto-fix: sort 82 import blocks (isort), remove 29 unused imports, strip 6 trailing-whitespace blank lines in docstrings - main.py: move setup_logging and settings imports to top (E402) - errors.py: noqa N818 on DDD exception names (96 call sites, safe) - intel_service.py: noqa N817 for universal ET alias - atomic/elastic/sigma import services: move _MAX_UNCOMPRESSED_SIZE and _MAX_ENTRIES to module level (N806) - compliance_import_service.py: move SAMPLE_CONTROLS / CIS_CONTROLS to module level; wrap long description strings (N806 + E501) - snapshot_service.py: move STATUS_ORDER dict to module level (N806) - sigma_import_service.py: remove dead dedup_key expression (F841) - threat_actor_import_service.py: remove dead stix_to_actor expression (F841) - data_source.py, seed_demo.py, campaign_scheduler_service.py, lolbas_import_service.py: wrap lines exceeding 120 chars (E501) - d3fend_import_service.py: per-file E501 ignore (data file with long strings) All 439 unit tests pass. ruff check app/ → All checks passed!
93 lines
2.6 KiB
Python
93 lines
2.6 KiB
Python
"""User management service — framework-agnostic CRUD for users.
|
|
|
|
Uses domain exceptions from app.domain.errors. The router handles
|
|
HTTP concerns, auth, audit logging, and commit.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import uuid
|
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.auth import hash_password
|
|
from app.domain.errors import (
|
|
BusinessRuleViolation,
|
|
DuplicateEntityError,
|
|
EntityNotFoundError,
|
|
)
|
|
from app.models.user import User
|
|
|
|
VALID_ROLES = {"admin", "red_tech", "blue_tech", "red_lead", "blue_lead", "viewer"}
|
|
|
|
|
|
def list_users(db: Session) -> list[User]:
|
|
"""Return a list of all users ordered by username."""
|
|
return db.query(User).order_by(User.username).all()
|
|
|
|
|
|
def create_user(
|
|
db: Session,
|
|
*,
|
|
username: str,
|
|
email: str | None,
|
|
password: str,
|
|
role: str,
|
|
) -> User:
|
|
"""Create a new user.
|
|
|
|
Raises DuplicateEntityError if username already exists.
|
|
Raises BusinessRuleViolation if role is invalid.
|
|
Does not commit; the router handles that.
|
|
"""
|
|
existing = db.query(User).filter(User.username == username).first()
|
|
if existing:
|
|
raise DuplicateEntityError("User", "username", username)
|
|
|
|
if role not in VALID_ROLES:
|
|
raise BusinessRuleViolation(
|
|
f"Invalid role '{role}'. Must be one of: {', '.join(sorted(VALID_ROLES))}"
|
|
)
|
|
|
|
user = User(
|
|
username=username,
|
|
email=email,
|
|
hashed_password=hash_password(password),
|
|
role=role,
|
|
)
|
|
db.add(user)
|
|
return user
|
|
|
|
|
|
def get_user_or_raise(db: Session, user_id: uuid.UUID) -> User:
|
|
"""Return a user by ID or raise EntityNotFoundError."""
|
|
user = db.query(User).filter(User.id == user_id).first()
|
|
if user is None:
|
|
raise EntityNotFoundError("User", str(user_id))
|
|
return user
|
|
|
|
|
|
def update_user(db: Session, user_id: uuid.UUID, **fields: object) -> User:
|
|
"""Update one or more fields of an existing user.
|
|
|
|
Raises EntityNotFoundError if user does not exist.
|
|
Raises BusinessRuleViolation if role is invalid.
|
|
Handles 'password' by hashing and storing as 'hashed_password'.
|
|
Does not commit; the router handles that.
|
|
"""
|
|
user = get_user_or_raise(db, user_id)
|
|
update_data = dict(fields)
|
|
|
|
if "role" in update_data and update_data["role"] not in VALID_ROLES:
|
|
raise BusinessRuleViolation(
|
|
f"Invalid role '{update_data['role']}'. Must be one of: {', '.join(sorted(VALID_ROLES))}"
|
|
)
|
|
|
|
if "password" in update_data:
|
|
update_data["hashed_password"] = hash_password(str(update_data.pop("password")))
|
|
|
|
for field, value in update_data.items():
|
|
setattr(user, field, value)
|
|
|
|
return user
|