diff --git a/server/.env.example b/server/.env.example index d397aee..f261c6f 100644 --- a/server/.env.example +++ b/server/.env.example @@ -6,3 +6,14 @@ # GNEXUS_BOOK_REPO_ROOT=/path/to/gnexus-book # MCP transport for development: stdio, sse, or streamable-http # GNEXUS_BOOK_MCP_TRANSPORT=stdio + +# gnexus-auth SSO. Leave the client id empty to run with authentication disabled. +# GNEXUS_BOOK_AUTH_CLIENT_ID= +# GNEXUS_BOOK_AUTH_CLIENT_SECRET= +# GNEXUS_BOOK_AUTH_BASE_URL=https://auth.gnexus.space +# GNEXUS_BOOK_AUTH_REDIRECT_URI=https://book.gnexus.space/auth/callback +# GNEXUS_BOOK_AUTH_WEBHOOK_SECRET= +# GNEXUS_BOOK_AUTH_SESSION_COOKIE=gnb_session +# GNEXUS_BOOK_AUTH_COOKIE_SECURE=true +# GNEXUS_BOOK_AUTH_SESSION_TTL_SECONDS=604800 +# GNEXUS_BOOK_AUTH_SCOPES=openid email profile roles permissions diff --git a/server/alembic/versions/d95b33da4bfb_auth_sessions_and_actor_fields.py b/server/alembic/versions/d95b33da4bfb_auth_sessions_and_actor_fields.py new file mode 100644 index 0000000..5175485 --- /dev/null +++ b/server/alembic/versions/d95b33da4bfb_auth_sessions_and_actor_fields.py @@ -0,0 +1,84 @@ +"""auth sessions and actor fields + +Revision ID: d95b33da4bfb +Revises: ac5f4cd0d7bd +Create Date: 2026-11-19 18:50:55.263043 + +""" +from __future__ import annotations + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision: str = 'd95b33da4bfb' +down_revision: Union[str, None] = 'ac5f4cd0d7bd' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('oauth_states', + sa.Column('state_hash', sa.Text(), nullable=False), + sa.Column('code_verifier', sa.Text(), nullable=True), + sa.Column('return_to', sa.Text(), nullable=True), + sa.Column('created_at', sa.DateTime(timezone=True), nullable=False), + sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False), + sa.PrimaryKeyConstraint('state_hash') + ) + op.create_table('webhook_events', + sa.Column('id', sa.Text(), nullable=False), + sa.Column('event_type', sa.Text(), nullable=False), + sa.Column('received_at', sa.DateTime(timezone=True), nullable=False), + sa.Column('payload', postgresql.JSONB(astext_type=sa.Text()), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('user_sessions', + sa.Column('id', sa.UUID(), nullable=False), + sa.Column('user_id', sa.UUID(), nullable=False), + sa.Column('token_hash', sa.Text(), nullable=False), + sa.Column('created_at', sa.DateTime(timezone=True), nullable=False), + sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False), + sa.Column('last_used_at', sa.DateTime(timezone=True), nullable=True), + sa.Column('revoked_at', sa.DateTime(timezone=True), nullable=True), + sa.Column('user_agent', sa.Text(), nullable=True), + sa.Column('ip_address', sa.Text(), nullable=True), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('token_hash') + ) + op.create_index('ix_user_sessions_user_id', 'user_sessions', ['user_id'], unique=False) + op.add_column('changesets', sa.Column('actor_kind', sa.Text(), server_default=sa.text("'system'"), nullable=False)) + op.add_column('changesets', sa.Column('actor_name', sa.Text(), nullable=True)) + op.add_column('changesets', sa.Column('via', sa.Text(), server_default=sa.text("'import'"), nullable=False)) + op.add_column('inventory_item_versions', sa.Column('actor_kind', sa.Text(), server_default=sa.text("'system'"), nullable=False)) + op.add_column('inventory_item_versions', sa.Column('actor_name', sa.Text(), nullable=True)) + op.add_column('inventory_item_versions', sa.Column('via', sa.Text(), server_default=sa.text("'import'"), nullable=False)) + op.add_column('users', sa.Column('system_role', sa.Text(), nullable=True)) + op.add_column('users', sa.Column('status', sa.Text(), nullable=True)) + op.add_column('users', sa.Column('client_roles', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'[]'::jsonb"), nullable=False)) + op.add_column('users', sa.Column('permissions', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'[]'::jsonb"), nullable=False)) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'permissions') + op.drop_column('users', 'client_roles') + op.drop_column('users', 'status') + op.drop_column('users', 'system_role') + op.drop_column('inventory_item_versions', 'via') + op.drop_column('inventory_item_versions', 'actor_name') + op.drop_column('inventory_item_versions', 'actor_kind') + op.drop_column('changesets', 'via') + op.drop_column('changesets', 'actor_name') + op.drop_column('changesets', 'actor_kind') + op.drop_index('ix_user_sessions_user_id', table_name='user_sessions') + op.drop_table('user_sessions') + op.drop_table('webhook_events') + op.drop_table('oauth_states') + # ### end Alembic commands ### diff --git a/server/app/auth/__init__.py b/server/app/auth/__init__.py new file mode 100644 index 0000000..2493b71 --- /dev/null +++ b/server/app/auth/__init__.py @@ -0,0 +1 @@ +"""gnexus-auth integration for Gnexus Book.""" diff --git a/server/app/auth/actor.py b/server/app/auth/actor.py new file mode 100644 index 0000000..6aafc76 --- /dev/null +++ b/server/app/auth/actor.py @@ -0,0 +1,24 @@ +from __future__ import annotations + +from dataclasses import dataclass +from typing import Any +from uuid import UUID + + +@dataclass(frozen=True) +class Actor: + kind: str = "agent" + name: str | None = None + via: str = "api" + user_id: UUID | None = None + + +def actor_for_current_user(user: Any | None, via: str = "ui") -> Actor: + if user is None: + return Actor(kind="agent", via=via) + return Actor( + kind="user", + name=user.display_name or user.email or user.sub, + via=via, + user_id=user.id, + ) diff --git a/server/app/auth/context.py b/server/app/auth/context.py new file mode 100644 index 0000000..ea3f31b --- /dev/null +++ b/server/app/auth/context.py @@ -0,0 +1,7 @@ +from __future__ import annotations + +from contextvars import ContextVar + +from .actor import Actor + +current_actor: ContextVar[Actor | None] = ContextVar("gnexus_book_actor", default=None) diff --git a/server/app/auth/sessions.py b/server/app/auth/sessions.py new file mode 100644 index 0000000..d2feca0 --- /dev/null +++ b/server/app/auth/sessions.py @@ -0,0 +1,148 @@ +from __future__ import annotations + +import hashlib +import secrets +from dataclasses import dataclass, replace +from datetime import datetime, timedelta +from typing import Any +from uuid import UUID + +from sqlalchemy import select, update + +from ..storage.db import Database +from ..storage.models import User, UserSession, utcnow + +SUPPORTED_LOCALES = {"en", "uk", "ru"} + + +@dataclass(frozen=True) +class CurrentUser: + id: UUID + sub: str + email: str | None + display_name: str | None + profile: dict[str, Any] + locale: str | None + system_role: str | None + status: str | None + client_roles: tuple[str, ...] + permissions: tuple[str, ...] + blocked_at: datetime | None + + @property + def is_blocked(self) -> bool: + return self.blocked_at is not None + + @property + def effective_locale(self) -> str: + candidate = self.locale or self.profile.get("locale") or "en" + normalized = str(candidate).split("-", 1)[0].lower() + return normalized if normalized in SUPPORTED_LOCALES else "en" + + +def token_hash(token: str) -> str: + return hashlib.sha256(token.encode("utf-8")).hexdigest() + + +def _to_current(user: User) -> CurrentUser: + return CurrentUser( + id=user.id, + sub=user.sub, + email=user.email, + display_name=user.display_name, + profile=dict(user.profile or {}), + locale=user.locale, + system_role=user.system_role, + status=user.status, + client_roles=tuple(user.client_roles or []), + permissions=tuple(user.permissions or []), + blocked_at=user.blocked_at, + ) + + +def create_session( + database: Database, + user_id: UUID, + ttl_seconds: int, + user_agent: str | None = None, + ip_address: str | None = None, +) -> tuple[str, datetime]: + token = secrets.token_urlsafe(32) + now = utcnow() + expires_at = now + timedelta(seconds=ttl_seconds) + with database.session() as session: + with session.begin(): + session.add( + UserSession( + user_id=user_id, + token_hash=token_hash(token), + created_at=now, + expires_at=expires_at, + user_agent=user_agent, + ip_address=ip_address, + ) + ) + return token, expires_at + + +def resolve_session(database: Database, token: str) -> CurrentUser | None: + now = utcnow() + with database.session() as session: + row = session.scalars( + select(UserSession).where(UserSession.token_hash == token_hash(token)) + ).first() + if row is None or row.revoked_at is not None or row.expires_at <= now: + return None + + user = session.get(User, row.user_id) + if user is None or user.blocked_at is not None: + return None + + row.last_used_at = now + session.commit() + return _to_current(user) + + +def revoke_session(database: Database, token: str) -> None: + with database.session() as session: + with session.begin(): + session.execute( + update(UserSession) + .where( + UserSession.token_hash == token_hash(token), + UserSession.revoked_at.is_(None), + ) + .values(revoked_at=utcnow()) + ) + + +def revoke_user_sessions(database: Database, user_id: UUID) -> None: + with database.session() as session: + with session.begin(): + session.execute( + update(UserSession) + .where( + UserSession.user_id == user_id, + UserSession.revoked_at.is_(None), + ) + .values(revoked_at=utcnow()) + ) + + +def set_user_locale(database: Database, user_id: UUID, locale: str | None) -> CurrentUser: + normalized = locale or None + if normalized is not None and normalized not in SUPPORTED_LOCALES: + raise ValueError("locale must be en, uk, ru, or empty") + + with database.session() as session: + with session.begin(): + user = session.get(User, user_id) + if user is None: + raise ValueError("User not found") + user.locale = normalized + session.flush() + return _to_current(user) + + +def with_locale(user: CurrentUser, locale: str | None) -> CurrentUser: + return replace(user, locale=locale or None) diff --git a/server/app/auth/users.py b/server/app/auth/users.py new file mode 100644 index 0000000..deb9bb3 --- /dev/null +++ b/server/app/auth/users.py @@ -0,0 +1,91 @@ +from __future__ import annotations + +from typing import Any + +from sqlalchemy import select + +from gnexus_gauth.dto import AuthenticatedUser + +from ..storage.db import Database +from ..storage.models import User, utcnow +from .sessions import CurrentUser + + +def _to_current(user: User) -> CurrentUser: + return CurrentUser( + id=user.id, + sub=user.sub, + email=user.email, + display_name=user.display_name, + profile=dict(user.profile or {}), + locale=user.locale, + system_role=user.system_role, + status=user.status, + client_roles=tuple(user.client_roles or []), + permissions=tuple(user.permissions or []), + blocked_at=user.blocked_at, + ) + + +def upsert_user_from_auth( + database: Database, + auth_user: AuthenticatedUser, + client_id: str, +) -> CurrentUser: + profile = dict(auth_user.profile or {}) + display_name = ( + profile.get("display_name") + or profile.get("username") + or auth_user.email + or auth_user.user_id + ) + access = next( + (item for item in auth_user.client_access_list if item.client_id == client_id), + None, + ) + roles = list(access.role_ids) if access else [] + permissions = list(access.permission_ids) if access else [] + + with database.session() as session: + with session.begin(): + user = session.scalars( + select(User).where(User.sub == auth_user.user_id) + ).first() + if user is None: + user = User( + sub=auth_user.user_id, + email=auth_user.email or None, + display_name=display_name, + profile=profile, + locale=None, + system_role=auth_user.system_role, + status=auth_user.status, + client_roles=roles, + permissions=permissions, + ) + session.add(user) + else: + user.email = auth_user.email or user.email + user.display_name = display_name + user.profile = profile + user.system_role = auth_user.system_role + user.status = auth_user.status + user.client_roles = roles + user.permissions = permissions + if auth_user.status not in {"blocked", "archived", "deleted"}: + user.blocked_at = None + user.updated_at = utcnow() + session.flush() + return _to_current(user) + + +def serialize_user(user: CurrentUser) -> dict[str, Any]: + return { + "user_id": user.sub, + "email": user.email, + "display_name": user.display_name, + "avatar_url": user.profile.get("avatar_url"), + "system_role": user.system_role, + "roles": list(user.client_roles), + "permissions": list(user.permissions), + } diff --git a/server/app/config.py b/server/app/config.py index 810c402..667a361 100644 --- a/server/app/config.py +++ b/server/app/config.py @@ -27,6 +27,43 @@ self.storage_backend = backend self.database_url = database_url or os.environ.get("GNEXUS_BOOK_DATABASE_URL") + self.auth_client_id = os.environ.get("GNEXUS_BOOK_AUTH_CLIENT_ID") + self.auth_client_secret = os.environ.get("GNEXUS_BOOK_AUTH_CLIENT_SECRET") + self.auth_base_url = os.environ.get("GNEXUS_BOOK_AUTH_BASE_URL") + self.auth_redirect_uri = os.environ.get("GNEXUS_BOOK_AUTH_REDIRECT_URI") + self.auth_webhook_secret = os.environ.get("GNEXUS_BOOK_AUTH_WEBHOOK_SECRET") + self.auth_session_cookie = os.environ.get( + "GNEXUS_BOOK_AUTH_SESSION_COOKIE", "gnb_session" + ) + self.auth_session_ttl_seconds = int( + os.environ.get("GNEXUS_BOOK_AUTH_SESSION_TTL_SECONDS", str(7 * 24 * 3600)) + ) + self.auth_state_ttl_seconds = int( + os.environ.get("GNEXUS_BOOK_AUTH_STATE_TTL_SECONDS", "300") + ) + self.auth_webhook_tolerance_seconds = int( + os.environ.get("GNEXUS_BOOK_AUTH_WEBHOOK_TOLERANCE_SECONDS", "300") + ) + self.auth_scopes = tuple( + os.environ.get( + "GNEXUS_BOOK_AUTH_SCOPES", + "openid email profile roles permissions", + ).split() + ) + secure_default = "true" if (self.auth_redirect_uri or "").startswith("https://") else "false" + self.auth_cookie_secure = os.environ.get( + "GNEXUS_BOOK_AUTH_COOKIE_SECURE", secure_default + ).lower() in {"1", "true", "yes", "on"} + + @property + def auth_enabled(self) -> bool: + return bool( + self.auth_client_id + and self.auth_client_secret + and self.auth_base_url + and self.auth_redirect_uri + ) + @lru_cache def get_settings() -> Settings: diff --git a/server/app/storage/models.py b/server/app/storage/models.py index 4f8c68b..27bdfdf 100644 --- a/server/app/storage/models.py +++ b/server/app/storage/models.py @@ -37,6 +37,14 @@ display_name: Mapped[str | None] = mapped_column(Text) profile: Mapped[dict[str, Any]] = mapped_column(JSONB, nullable=False, default=dict) locale: Mapped[str | None] = mapped_column(Text) + system_role: Mapped[str | None] = mapped_column(Text) + status: Mapped[str | None] = mapped_column(Text) + client_roles: Mapped[list[str]] = mapped_column( + JSONB, nullable=False, default=list, server_default=text("'[]'::jsonb") + ) + permissions: Mapped[list[str]] = mapped_column( + JSONB, nullable=False, default=list, server_default=text("'[]'::jsonb") + ) created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=utcnow) updated_at: Mapped[datetime] = mapped_column( DateTime(timezone=True), nullable=False, default=utcnow, onupdate=utcnow @@ -44,6 +52,42 @@ blocked_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True)) +class UserSession(Base): + __tablename__ = "user_sessions" + __table_args__ = (Index("ix_user_sessions_user_id", "user_id"),) + + id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) + user_id: Mapped[uuid.UUID] = mapped_column( + UUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), nullable=False + ) + token_hash: Mapped[str] = mapped_column(Text, unique=True, nullable=False) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=utcnow) + expires_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False) + last_used_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True)) + revoked_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True)) + user_agent: Mapped[str | None] = mapped_column(Text) + ip_address: Mapped[str | None] = mapped_column(Text) + + +class OAuthState(Base): + __tablename__ = "oauth_states" + + state_hash: Mapped[str] = mapped_column(Text, primary_key=True) + code_verifier: Mapped[str | None] = mapped_column(Text) + return_to: Mapped[str | None] = mapped_column(Text) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=utcnow) + expires_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False) + + +class WebhookEvent(Base): + __tablename__ = "webhook_events" + + id: Mapped[str] = mapped_column(Text, primary_key=True) + event_type: Mapped[str] = mapped_column(Text, nullable=False) + received_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=utcnow) + payload: Mapped[dict[str, Any]] = mapped_column(JSONB, nullable=False, default=dict) + + class Blob(Base): __tablename__ = "blobs" @@ -68,6 +112,13 @@ summary: Mapped[str] = mapped_column(Text, nullable=False) reason: Mapped[str] = mapped_column(Text, nullable=False, default="") status: Mapped[str] = mapped_column(Text, nullable=False, default="draft") + actor_kind: Mapped[str] = mapped_column( + Text, nullable=False, default="system", server_default=text("'system'") + ) + actor_name: Mapped[str | None] = mapped_column(Text) + via: Mapped[str] = mapped_column( + Text, nullable=False, default="import", server_default=text("'import'") + ) created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=utcnow) applied_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True)) validation: Mapped[dict[str, Any] | None] = mapped_column(JSONB) @@ -202,6 +253,13 @@ changeset_id: Mapped[uuid.UUID | None] = mapped_column( UUID(as_uuid=True), ForeignKey("changesets.id"), nullable=True ) + actor_kind: Mapped[str] = mapped_column( + Text, nullable=False, default="system", server_default=text("'system'") + ) + actor_name: Mapped[str | None] = mapped_column(Text) + via: Mapped[str] = mapped_column( + Text, nullable=False, default="import", server_default=text("'import'") + ) created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=utcnow) diff --git a/server/pyproject.toml b/server/pyproject.toml index ce04fcb..8f693cf 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -12,6 +12,8 @@ "sqlalchemy>=2.0.36", "alembic>=1.14.0", "psycopg[binary]>=3.2.0", + "httpx>=0.27.0", + "gnexus-gauth @ git+https://git.gnexus.space/git/root/gnexus-auth-client-py.git@9a087f10086593c123ed9e3a1974ef5caec75d9a", ] [project.optional-dependencies]