Compare commits
78
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a3c6a7c633 | ||
|
|
fc3d6cb826 | ||
|
|
f9e798f3b3 | ||
|
|
831ec1d989 | ||
|
|
757536c277 | ||
|
|
d003f0783d | ||
|
|
5666dc4a4b | ||
|
|
c2b0351598 | ||
|
|
a8a3d95c40 | ||
|
|
97e800bfd5 | ||
|
|
d7c65ed551 | ||
|
|
9405f07f06 | ||
|
|
41f17733a5 | ||
|
|
3019172b88 | ||
|
|
b741c181e0 | ||
|
|
e45574779b | ||
|
|
fecb7af3f6 | ||
|
|
e1e046f846 | ||
|
|
d1f0a2d48b | ||
|
|
b9057f6d56 | ||
|
|
44b59edcb3 | ||
|
|
05dffec42e | ||
|
|
aef34791f3 | ||
|
|
5b420a6b62 | ||
|
|
939f248499 | ||
|
|
a8d362ff89 | ||
|
|
068f96880b | ||
|
|
b5119a8e6f | ||
|
|
6b89913efd | ||
|
|
01c8599853 | ||
|
|
43d27cfd27 | ||
|
|
2d2e046c9d | ||
|
|
abee49a335 | ||
|
|
5b5c1c4c0b | ||
|
|
5c8cd98aac | ||
|
|
3db221cce4 | ||
|
|
60939306e7 | ||
|
|
80161fe86e | ||
|
|
4c36ea2e9a | ||
|
|
32432026db | ||
|
|
8a9f3644a1 | ||
|
|
d7f221850f | ||
|
|
4d5f7b4ccd | ||
|
|
9aa43d2753 | ||
|
|
c17a9484ca | ||
|
|
9060905e7a | ||
|
|
159577dff9 | ||
|
|
86c75cea8e | ||
|
|
3f0c607383 | ||
|
|
1cc230985f | ||
|
|
9cd69dc00c | ||
|
|
111d2cada3 | ||
|
|
a55a476d97 | ||
|
|
6724634870 | ||
|
|
797a641263 | ||
|
|
a2d7caa6e4 | ||
|
|
351d635f39 | ||
|
|
9147442822 | ||
|
|
6987fe1bfe | ||
|
|
4b74ee54b0 | ||
|
|
dc22b12df3 | ||
|
|
d9a36a99a7 | ||
|
|
f30e455c2d | ||
|
|
1b950a8f9a | ||
|
|
3a5d7607e3 | ||
|
|
7233e3a534 | ||
|
|
0a669064dd | ||
|
|
cd27f36e3d | ||
|
|
6f6abef5d2 | ||
|
|
a21853c874 | ||
|
|
6850918e3d | ||
|
|
41a9e8f76c | ||
|
|
30f3fe015b | ||
|
|
5fd4a41e64 | ||
|
|
dfadc8ba23 | ||
|
|
ddce0e39b3 | ||
|
|
4a428b9af6 | ||
|
|
768f8cb21c |
@@ -0,0 +1,53 @@
|
|||||||
|
name: ci
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
- staging
|
||||||
|
tags:
|
||||||
|
- '*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
docker:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- service: frontend
|
||||||
|
context: frontend
|
||||||
|
dockerfile: frontend/Dockerfile
|
||||||
|
- service: backend
|
||||||
|
context: backend
|
||||||
|
dockerfile: backend/Dockerfile
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout with submodules
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Login to Docker Registry
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
registry: ${{ vars.REGISTRY_URL }}
|
||||||
|
username: ${{ vars.REGISTRY_USER }}
|
||||||
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
with:
|
||||||
|
driver: remote
|
||||||
|
endpoint: ${{ env.BUILDKIT_ARM64_ENDPOINT }}
|
||||||
|
|
||||||
|
- name: Build and Push ${{ matrix.service }} Image
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: ${{ matrix.context }}
|
||||||
|
file: ${{ matrix.dockerfile }}
|
||||||
|
platforms: linux/arm64
|
||||||
|
push: true
|
||||||
|
provenance: false
|
||||||
|
tags: |
|
||||||
|
${{ vars.REGISTRY_URL }}/${{ gitea.repository }}-${{ matrix.service }}:${{ gitea.ref_type == 'tag' && gitea.ref_name || (gitea.ref_name == 'main' && 'latest' || gitea.ref_name) }}
|
||||||
|
${{ vars.REGISTRY_URL }}/${{ gitea.repository }}-${{ matrix.service }}:${{ gitea.sha }}
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
name: ci
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- staging
|
|
||||||
- dev
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
docker:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
packages: write
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- service: frontend
|
|
||||||
context: frontend
|
|
||||||
dockerfile: frontend/Dockerfile
|
|
||||||
- service: backend
|
|
||||||
context: backend
|
|
||||||
dockerfile: backend/Dockerfile
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout with submodules
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
- name: Derive repository metadata
|
|
||||||
id: repo_meta
|
|
||||||
run: |
|
|
||||||
repo="${GITHUB_REPOSITORY}"
|
|
||||||
owner="${repo%%/*}"
|
|
||||||
name="${repo##*/}"
|
|
||||||
echo "repo_owner=$owner" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "repo_name=$name" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- name: Compute base tag
|
|
||||||
id: compute_tag
|
|
||||||
env:
|
|
||||||
GITHUB_SHA: ${{ github.sha }}
|
|
||||||
GITHUB_REF_TYPE: ${{ github.ref_type }}
|
|
||||||
GITHUB_REF_NAME: ${{ github.ref_name }}
|
|
||||||
run: |
|
|
||||||
sha="${GITHUB_SHA}"
|
|
||||||
ref_type="${GITHUB_REF_TYPE}"
|
|
||||||
ref_name="${GITHUB_REF_NAME}"
|
|
||||||
|
|
||||||
short="${sha:0:7}"
|
|
||||||
tag="$short"
|
|
||||||
|
|
||||||
if [ "$ref_type" = "tag" ]; then
|
|
||||||
tag="$ref_name"
|
|
||||||
elif [ "$ref_name" = "dev" ]; then
|
|
||||||
tag="${tag}-dev"
|
|
||||||
elif [ "$ref_name" = "staging" ]; then
|
|
||||||
tag="${tag}-staging"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "base_tag=$tag" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- name: Login to local registry
|
|
||||||
if: ${{ vars.REGISTRY_URL != '' }}
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
registry: ${{ vars.REGISTRY_URL }}
|
|
||||||
username: ${{ vars.REGISTRY_USER }}
|
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Login to GHCR
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ github.token }}
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Determine branch alias tag
|
|
||||||
id: branch_alias
|
|
||||||
env:
|
|
||||||
REF_NAME: ${{ github.ref_name }}
|
|
||||||
run: |
|
|
||||||
alias=""
|
|
||||||
case "${REF_NAME}" in
|
|
||||||
dev) alias="latest-dev" ;;
|
|
||||||
staging) alias="latest-staging" ;;
|
|
||||||
main) alias="latest" ;;
|
|
||||||
esac
|
|
||||||
echo "alias=$alias" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- name: Assemble image tags
|
|
||||||
id: tag_list
|
|
||||||
env:
|
|
||||||
REGISTRY_URL: ${{ vars.REGISTRY_URL }}
|
|
||||||
REPO_NAME: ${{ steps.repo_meta.outputs.repo_name }}
|
|
||||||
SERVICE: ${{ matrix.service }}
|
|
||||||
BASE_TAG: ${{ steps.compute_tag.outputs.base_tag }}
|
|
||||||
GIT_SHA: ${{ github.sha }}
|
|
||||||
BRANCH_ALIAS: ${{ steps.branch_alias.outputs.alias }}
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
tags=""
|
|
||||||
|
|
||||||
if [ -n "${REGISTRY_URL}" ]; then
|
|
||||||
repo_tag="${REGISTRY_URL}/${REPO_NAME}-${SERVICE}"
|
|
||||||
tags="${tags}${repo_tag}:${BASE_TAG}\n${repo_tag}:${GIT_SHA}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
ghcr_tag="ghcr.io/papercrate-dms/${REPO_NAME}-${SERVICE}"
|
|
||||||
if [ -n "${tags}" ]; then
|
|
||||||
tags="${tags}\n"
|
|
||||||
fi
|
|
||||||
tags="${tags}${ghcr_tag}:${BASE_TAG}\n${ghcr_tag}:${GIT_SHA}"
|
|
||||||
|
|
||||||
if [ -n "${BRANCH_ALIAS}" ]; then
|
|
||||||
if [ -n "${REGISTRY_URL}" ]; then
|
|
||||||
tags="${tags}\n${repo_tag}:${BRANCH_ALIAS}"
|
|
||||||
fi
|
|
||||||
tags="${tags}\n${ghcr_tag}:${BRANCH_ALIAS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
export TAGS="${tags}"
|
|
||||||
|
|
||||||
python -c 'import os; tags=[t.strip() for t in os.environ["TAGS"].split("\\n") if t.strip()]; print("tags=" + ",".join(tags))' | tee -a "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- name: Build and Push ${{ matrix.service }} Image
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
context: ${{ matrix.context }}
|
|
||||||
file: ${{ matrix.dockerfile }}
|
|
||||||
platforms: linux/amd64,linux/arm64
|
|
||||||
push: true
|
|
||||||
provenance: false
|
|
||||||
tags: ${{ steps.tag_list.outputs.tags }}
|
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
||||||
-107
@@ -1,107 +0,0 @@
|
|||||||
# Development
|
|
||||||
|
|
||||||
This document collects runtime assumptions and workflows for local development,
|
|
||||||
integration testing, and infrastructure automation.
|
|
||||||
|
|
||||||
## Local Development
|
|
||||||
|
|
||||||
Use the provided `papercrate.tmux` to spin up the full stack in one tmux session:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
tmux -f papercrate.tmux attach
|
|
||||||
```
|
|
||||||
|
|
||||||
This creates windows for the compose stack, frontend dev server, backend API, and
|
|
||||||
background worker using the repository-relative paths defined in the tmux file.
|
|
||||||
Detach with `Ctrl+b d` and reattach later with the same command.
|
|
||||||
|
|
||||||
The development Postgres container now seeds two database roles:
|
|
||||||
|
|
||||||
- `papercrate_app_login` (password `papercrate_app`) is used by the backend and
|
|
||||||
is subject to row-level security policies.
|
|
||||||
- `papercrate` remains the owner role for running Diesel migrations or other
|
|
||||||
maintenance tasks.
|
|
||||||
|
|
||||||
When connecting manually to inspect RLS behaviour, switch to the application
|
|
||||||
role with `SET ROLE papercrate_app_login;` before querying tenant tables.
|
|
||||||
|
|
||||||
## Backend Integration Tests
|
|
||||||
|
|
||||||
Integration tests require a running Postgres instance (and, optionally, Quickwit
|
|
||||||
for OCR indexing). The repository includes a lightweight compose file for local
|
|
||||||
runs:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose -f docker-compose.test.yml up -d
|
|
||||||
export TEST_DATABASE_URL=postgres://papercrate:papercrate_test@localhost:5433/papercrate_test
|
|
||||||
# optional, enables Quickwit indexing jobs
|
|
||||||
export QUICKWIT_ENDPOINT=http://localhost:7280
|
|
||||||
export QUICKWIT_INDEX=documents
|
|
||||||
cargo test
|
|
||||||
```
|
|
||||||
|
|
||||||
Stop the database when you are done:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose -f docker-compose.test.yml down
|
|
||||||
```
|
|
||||||
|
|
||||||
The compose service uses tmpfs storage, giving each test run a clean database.
|
|
||||||
|
|
||||||
## Runtime Dependencies
|
|
||||||
|
|
||||||
- `ocrmypdf` (optional but recommended): Used by the OCR worker to extract text
|
|
||||||
from PDFs when no embedded text layer is available. Ensure it is installed and
|
|
||||||
available on the worker hosts if OCR is desired.
|
|
||||||
- Quickwit (optional): The Quickwit indexer is used to ingest extracted text for
|
|
||||||
search. Set `QUICKWIT_ENDPOINT` and `QUICKWIT_INDEX` in the environment when
|
|
||||||
running workers if you want indexing jobs to run. The local compose file starts
|
|
||||||
a Quickwit instance on `http://localhost:7280` and seeds the `documents` index
|
|
||||||
automatically.
|
|
||||||
|
|
||||||
## Configuration
|
|
||||||
|
|
||||||
The backend reads its settings from environment variables. In particular:
|
|
||||||
|
|
||||||
- `DATABASE_URL` – connection string for the primary Postgres database (required).
|
|
||||||
- `DATABASE_MAX_POOL_SIZE` – optional override for the r2d2 connection pool size.
|
|
||||||
Defaults to `2`; increase it in staging/production to match expected concurrency.
|
|
||||||
- `PROXY_DOWNLOADS` – set to `true` when the object store is only reachable from
|
|
||||||
the backend network. When enabled, `/api/download/{token}` and asset-object fetches
|
|
||||||
stream bytes through the API instead of redirecting clients to S3/Hetzner.
|
|
||||||
|
|
||||||
On startup each binary logs the effective configuration with secrets redacted
|
|
||||||
(for example, the database password is masked). This makes it easier to confirm
|
|
||||||
runtime settings in staging without exposing credentials.
|
|
||||||
|
|
||||||
## Running Migrations in Kubernetes
|
|
||||||
|
|
||||||
The backend container image ships the `diesel` CLI, so schema migrations can be
|
|
||||||
executed as a short-lived Job (or Helm hook) before rolling out new pods. Example
|
|
||||||
manifest:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
apiVersion: batch/v1
|
|
||||||
kind: Job
|
|
||||||
metadata:
|
|
||||||
name: papercrate-migrate
|
|
||||||
spec:
|
|
||||||
template:
|
|
||||||
spec:
|
|
||||||
restartPolicy: OnFailure
|
|
||||||
containers:
|
|
||||||
- name: migrate
|
|
||||||
image: ghcr.io/example/papercrate-backend:<TAG>
|
|
||||||
command: ["/usr/local/bin/diesel", "migration", "run"]
|
|
||||||
env:
|
|
||||||
- name: DATABASE_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: papercrate-db
|
|
||||||
key: DATABASE_URL
|
|
||||||
```
|
|
||||||
|
|
||||||
Run the Job manually (`kubectl apply -f migrate-job.yaml`) or configure it as a
|
|
||||||
Helm pre-install/pre-upgrade hook so migrations run automatically on each
|
|
||||||
deployment. Once the Job succeeds, deploy/update the backend `Deployment` as
|
|
||||||
usual.
|
|
||||||
@@ -1,48 +1,63 @@
|
|||||||
# Papercrate
|
# Papercrate
|
||||||
|
|
||||||

|
## Backend Integration Tests
|
||||||
|
|
||||||
## Single-Host Deployment (Docker Compose)
|
Integration tests require a running Postgres instance (and, optionally, Quickwit for OCR indexing). The repository includes a lightweight compose file for local runs:
|
||||||
|
|
||||||
For self-hosting (for example on a Raspberry Pi), use the production-oriented
|
|
||||||
`docker-compose.yml`. Define the required secrets in a `.env` file alongside the
|
|
||||||
compose file before starting the stack:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cat <<'EOF' > .env
|
docker compose -f docker-compose.test.yml up -d
|
||||||
POSTGRES_PASSWORD=change-me
|
export TEST_DATABASE_URL=postgres://papercrate:papercrate_test@localhost:5433/papercrate_test
|
||||||
MINIO_ROOT_PASSWORD=change-me-too
|
# optional, enables Quickwit indexing jobs
|
||||||
JWT_SECRET=generate-a-long-random-string
|
export QUICKWIT_ENDPOINT=http://localhost:7280
|
||||||
WEBAUTHN_RP_ID=papercrate.local
|
export QUICKWIT_INDEX=documents
|
||||||
WEBAUTHN_ORIGIN=http://papercrate.local:8080
|
cargo test
|
||||||
# Optional overrides
|
|
||||||
# CORS_ALLOWED_ORIGIN=http://papercrate.local:8080
|
|
||||||
# REFRESH_COOKIE_SECURE=true
|
|
||||||
EOF
|
|
||||||
|
|
||||||
docker compose build
|
|
||||||
docker compose up -d
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**Important:** the WebAuthn settings must match the public URL clients will use.
|
Stop the database when you are done:
|
||||||
The relying party (RP) identifier is the bare host name, while the origin must
|
|
||||||
include scheme and port. Adjust the values above if you serve Papercrate from a
|
|
||||||
different host, domain, or HTTPS endpoint—otherwise passkey registration and
|
|
||||||
login will fail.
|
|
||||||
|
|
||||||
The compose file builds the backend and frontend images locally, then launches
|
```bash
|
||||||
Postgres, MinIO, Quickwit, the API, background worker, WebDAV endpoint, and the
|
docker compose -f docker-compose.test.yml down
|
||||||
SPA frontend. Once the containers report healthy, visit `http://<host>:8080`
|
```
|
||||||
and use the passkey signup flow to provision the first tenant/user. Upgrades are
|
|
||||||
as simple as `git pull` followed by `docker compose up -d`.
|
|
||||||
|
|
||||||
## Screenshots
|
The compose service uses tmpfs storage, giving each test run a clean database.
|
||||||
|
|
||||||

|
## Runtime Dependencies
|
||||||

|
|
||||||

|
|
||||||
|
|
||||||
---
|
- `ocrmypdf` (optional but recommended): Used by the OCR worker to extract text from PDFs when no embedded text layer is available. Ensure it is installed and available on the worker hosts if OCR is desired.
|
||||||
|
- Quickwit (optional): The Quickwit indexer is used to ingest extracted text for search. Set `QUICKWIT_ENDPOINT` and `QUICKWIT_INDEX` in the environment when running workers if you want indexing jobs to run. The local compose file starts a Quickwit instance on `http://localhost:7280` and seeds the `documents` index automatically.
|
||||||
|
|
||||||
For development workflows (local stack, integration tests, migrations, and
|
## Configuration
|
||||||
configuration details) see [DEVELOPMENT.md](./DEVELOPMENT.md).
|
|
||||||
|
The backend reads its settings from environment variables (see `backend/.env` for local defaults). In particular:
|
||||||
|
|
||||||
|
- `DATABASE_URL` – connection string for the primary Postgres database (required).
|
||||||
|
- `DATABASE_MAX_POOL_SIZE` – optional override for the r2d2 connection pool size. Defaults to `2`; increase it in staging/production to match expected concurrency.
|
||||||
|
|
||||||
|
On startup each binary logs the effective configuration with secrets redacted (for example, the database password is masked). This makes it easier to confirm the runtime settings in staging without exposing credentials.
|
||||||
|
|
||||||
|
## Running Migrations in Kubernetes
|
||||||
|
|
||||||
|
The backend container image ships the `diesel` CLI, so schema migrations can be executed as a short-lived Job (or Helm hook) before rolling out new pods. Example manifest:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
apiVersion: batch/v1
|
||||||
|
kind: Job
|
||||||
|
metadata:
|
||||||
|
name: papercrate-migrate
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
restartPolicy: OnFailure
|
||||||
|
containers:
|
||||||
|
- name: migrate
|
||||||
|
image: ghcr.io/example/papercrate-backend:<TAG>
|
||||||
|
command: ["/usr/local/bin/diesel", "migration", "run"]
|
||||||
|
env:
|
||||||
|
- name: DATABASE_URL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: papercrate-db
|
||||||
|
key: DATABASE_URL
|
||||||
|
```
|
||||||
|
|
||||||
|
Run the Job manually (`kubectl apply -f migrate-job.yaml`) or configure it as a Helm pre-install/pre-upgrade hook so migrations run automatically on each deployment. Once the Job succeeds, deploy/update the backend `Deployment` as usual.
|
||||||
|
|||||||
Generated
+1128
-1512
File diff suppressed because it is too large
Load Diff
+19
-56
@@ -1,30 +1,30 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "papercrate"
|
name = "backend"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
# Web framework
|
# Web framework
|
||||||
axum = { version = "0.8", features = ["multipart"] }
|
axum = { version = "0.7", features = ["multipart"] }
|
||||||
tokio = { version = "1.48", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
tower = { version = "0.5", features = ["make", "util"] }
|
tower = { version = "0.4", features = ["make", "util"] }
|
||||||
tower-http = { version = "0.6", features = ["cors", "trace"] }
|
tower-http = { version = "0.6", features = ["cors", "trace"] }
|
||||||
axum-extra = { version = "0.12", features = ["typed-header"] }
|
axum-extra = { version = "0.9", features = ["typed-header"] }
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
diesel = { version = "2.3.3", features = ["postgres", "uuid", "chrono", "serde_json", "r2d2"] }
|
diesel = { version = "2.1", features = ["postgres", "uuid", "chrono", "serde_json", "r2d2"] }
|
||||||
diesel_migrations = "2.1"
|
diesel_migrations = "2.1"
|
||||||
uuid = { version = "1.6", features = ["v4", "serde"] }
|
uuid = { version = "1.6", features = ["v4", "serde"] }
|
||||||
chrono = { version = "0.4", features = ["serde"] }
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
|
|
||||||
# S3
|
# S3
|
||||||
rust-s3 = { version = "0.37", features = ["with-tokio", "tokio-rustls-tls"] }
|
aws-config = "1.1"
|
||||||
|
aws-sdk-s3 = "1.14"
|
||||||
|
aws-credential-types = "1.2"
|
||||||
|
|
||||||
# Serialization
|
# Serialization
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
envy = "0.4"
|
|
||||||
serde-aux = "4.4"
|
|
||||||
|
|
||||||
# Utilities
|
# Utilities
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
@@ -32,68 +32,31 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|||||||
dotenv = "0.15"
|
dotenv = "0.15"
|
||||||
sha2 = "0.10"
|
sha2 = "0.10"
|
||||||
hex = "0.4"
|
hex = "0.4"
|
||||||
hmac = "0.12"
|
|
||||||
bytes = "1.5"
|
bytes = "1.5"
|
||||||
async-trait = "0.1"
|
async-trait = "0.1"
|
||||||
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp"] }
|
image = { version = "0.25", default-features = false, features = ["png", "jpeg"] }
|
||||||
pdfium-render = "0.8.36"
|
pdfium-render = "0.8"
|
||||||
mime_guess = "2.0"
|
mime_guess = "2.0"
|
||||||
tempfile = "3.10"
|
tempfile = "3.10"
|
||||||
reqwest = { version = "0.12.24", default-features = false, features = ["json", "rustls-tls", "stream"] }
|
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "stream"] }
|
||||||
percent-encoding = "2.3"
|
percent-encoding = "2.3"
|
||||||
base64 = "0.22"
|
base64 = "0.21"
|
||||||
quick-xml = "0.38"
|
quick-xml = "0.32"
|
||||||
futures-util = "0.3"
|
futures-util = "0.3"
|
||||||
url = "2.5"
|
url = "2.5"
|
||||||
once_cell = "1.19"
|
|
||||||
regex = "1.11"
|
|
||||||
infer = "0.19"
|
|
||||||
utoipa = { version = "4.2", default-features = false, features = ["chrono", "uuid", "preserve_order"] }
|
|
||||||
clap = { version = "4.5", features = ["derive"] }
|
|
||||||
|
|
||||||
# Error handling
|
# Error handling
|
||||||
thiserror = "2.0"
|
thiserror = "1.0"
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
|
|
||||||
# Authentication & security
|
# Authentication & security
|
||||||
argon2 = "0.5"
|
argon2 = "0.5"
|
||||||
jsonwebtoken = { version = "10", features = ["rust_crypto"] }
|
jsonwebtoken = "9"
|
||||||
webauthn-rs = { version = "0.5", features = ["danger-allow-state-serialisation", "danger-credential-internals"] }
|
|
||||||
serde_bytes = "0.11"
|
|
||||||
serde_cbor_2 = "0.13"
|
|
||||||
|
|
||||||
# Misc
|
# Misc
|
||||||
rand = "0.9"
|
rand = "0.8"
|
||||||
hyper = "1.2"
|
|
||||||
http-body-util = "0.1"
|
|
||||||
chrono-tz = "0.8"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
once_cell = "1.19"
|
once_cell = "1.19"
|
||||||
webauthn-rs-core = "0.5"
|
hyper = "1.2"
|
||||||
serde_yaml = "0.9"
|
http-body-util = "0.1"
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
|
||||||
serde_yaml = "0.9"
|
|
||||||
serde_json = "1.0"
|
|
||||||
regex = "1.11"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "backend"
|
|
||||||
path = "src/main.rs"
|
|
||||||
[[bin]]
|
|
||||||
name = "worker"
|
|
||||||
path = "src/bin/worker.rs"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "webdav"
|
|
||||||
path = "src/bin/webdav.rs"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "admin"
|
|
||||||
path = "src/bin/admin.rs"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "openapi-dump"
|
|
||||||
path = "src/bin/openapi_dump.rs"
|
|
||||||
|
|||||||
+23
-102
@@ -1,114 +1,29 @@
|
|||||||
# syntax=docker/dockerfile:1.7
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG RUST_VERSION=1
|
FROM rust:1-slim AS builder
|
||||||
FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim AS builder
|
|
||||||
ARG TARGETARCH
|
|
||||||
ENV TARGETARCH=${TARGETARCH}
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN cat <<'SCRIPT' >/usr/local/bin/resolve-target.sh
|
RUN apt-get update \
|
||||||
#!/bin/sh
|
&& apt-get install -y --no-install-recommends \
|
||||||
set -e
|
|
||||||
case "$1" in
|
|
||||||
amd64)
|
|
||||||
echo x86_64-unknown-linux-gnu
|
|
||||||
;;
|
|
||||||
arm64)
|
|
||||||
echo aarch64-unknown-linux-gnu
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unsupported TARGETARCH: $1" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
SCRIPT
|
|
||||||
RUN chmod +x /usr/local/bin/resolve-target.sh
|
|
||||||
|
|
||||||
ENV PKG_CONFIG_ALLOW_CROSS=1 \
|
|
||||||
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
|
|
||||||
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
|
|
||||||
PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu/pkgconfig \
|
|
||||||
PKG_CONFIG_PATH_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu/pkgconfig \
|
|
||||||
PKG_CONFIG_SYSROOT_DIR_aarch64_unknown_linux_gnu=/usr/aarch64-linux-gnu \
|
|
||||||
OPENSSL_DIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu \
|
|
||||||
OPENSSL_LIB_DIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu \
|
|
||||||
OPENSSL_INCLUDE_DIR_aarch64_unknown_linux_gnu=/usr/include/aarch64-linux-gnu \
|
|
||||||
CC_x86_64_unknown_linux_gnu=x86_64-linux-gnu-gcc \
|
|
||||||
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc \
|
|
||||||
PKG_CONFIG_LIBDIR_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu/pkgconfig \
|
|
||||||
PKG_CONFIG_PATH_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu/pkgconfig \
|
|
||||||
OPENSSL_DIR_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu \
|
|
||||||
OPENSSL_LIB_DIR_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu \
|
|
||||||
OPENSSL_INCLUDE_DIR_x86_64_unknown_linux_gnu=/usr/include/x86_64-linux-gnu
|
|
||||||
|
|
||||||
RUN set -eux; \
|
|
||||||
case "${TARGETARCH}" in \
|
|
||||||
amd64) TARGET_DEB_ARCH=amd64 ;; \
|
|
||||||
arm64) TARGET_DEB_ARCH=arm64 ;; \
|
|
||||||
*) echo "Unsupported TARGETARCH: ${TARGETARCH}" >&2; exit 1 ;; \
|
|
||||||
esac; \
|
|
||||||
BUILD_DEB_ARCH="$(dpkg --print-architecture)"; \
|
|
||||||
if [ "${TARGET_DEB_ARCH}" != "${BUILD_DEB_ARCH}" ]; then \
|
|
||||||
dpkg --add-architecture "${TARGET_DEB_ARCH}"; \
|
|
||||||
fi; \
|
|
||||||
apt-get update; \
|
|
||||||
apt-get install -y --no-install-recommends \
|
|
||||||
build-essential \
|
build-essential \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
curl \
|
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
zlib1g-dev; \
|
curl \
|
||||||
if [ "${TARGET_DEB_ARCH}" != "${BUILD_DEB_ARCH}" ]; then \
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
case "${TARGETARCH}" in \
|
|
||||||
arm64) CROSS_GCC=gcc-aarch64-linux-gnu ;; \
|
|
||||||
amd64) CROSS_GCC=gcc-x86-64-linux-gnu ;; \
|
|
||||||
esac; \
|
|
||||||
apt-get install -y --no-install-recommends \
|
|
||||||
"${CROSS_GCC}" \
|
|
||||||
"libc6-dev:${TARGET_DEB_ARCH}" \
|
|
||||||
"libssl-dev:${TARGET_DEB_ARCH}" \
|
|
||||||
"libpq-dev:${TARGET_DEB_ARCH}" \
|
|
||||||
"libjpeg-dev:${TARGET_DEB_ARCH}" \
|
|
||||||
"libpng-dev:${TARGET_DEB_ARCH}" \
|
|
||||||
"zlib1g-dev:${TARGET_DEB_ARCH}"; \
|
|
||||||
fi; \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY Cargo.toml Cargo.lock build.rs ./
|
COPY Cargo.toml Cargo.lock ./
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
COPY migrations ./migrations
|
COPY migrations ./migrations
|
||||||
COPY tests ./tests
|
COPY tests ./tests
|
||||||
COPY resources ./resources
|
|
||||||
COPY diesel.toml ./
|
COPY diesel.toml ./
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN cargo build --release --bin backend --bin worker --bin webdav
|
||||||
TARGET="$(/usr/local/bin/resolve-target.sh "${TARGETARCH}")"; \
|
RUN cargo install diesel_cli --no-default-features --features postgres
|
||||||
rustup target add "${TARGET}"; \
|
|
||||||
cargo build --release --target "${TARGET}" --bin backend --bin worker --bin webdav --bin admin; \
|
|
||||||
mkdir -p /artifacts; \
|
|
||||||
for bin in backend worker webdav admin; do \
|
|
||||||
cp "target/${TARGET}/release/${bin}" "/artifacts/${bin}"; \
|
|
||||||
done
|
|
||||||
|
|
||||||
RUN set -eux; \
|
FROM debian:trixie-slim AS runtime
|
||||||
case "${TARGETARCH}" in \
|
|
||||||
amd64) pdfium_package=pdfium-linux-x64.tgz ;; \
|
|
||||||
arm64) pdfium_package=pdfium-linux-arm64.tgz ;; \
|
|
||||||
*) echo "Unsupported TARGETARCH: ${TARGETARCH}" >&2; exit 1 ;; \
|
|
||||||
esac; \
|
|
||||||
curl -fsSL "https://github.com/bblanchon/pdfium-binaries/releases/latest/download/${pdfium_package}" -o /tmp/pdfium.tgz; \
|
|
||||||
mkdir -p /tmp/pdfium; \
|
|
||||||
tar -xzf /tmp/pdfium.tgz -C /tmp/pdfium --strip-components=1; \
|
|
||||||
pdfium_so="$(find /tmp/pdfium -name libpdfium.so -type f | head -n1)"; \
|
|
||||||
[ -n "${pdfium_so}" ]; \
|
|
||||||
cp "${pdfium_so}" /artifacts/libpdfium.so; \
|
|
||||||
rm -rf /tmp/pdfium.tgz /tmp/pdfium
|
|
||||||
|
|
||||||
FROM --platform=$TARGETPLATFORM debian:trixie-slim AS runtime
|
|
||||||
ARG TARGETARCH
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
@@ -123,18 +38,24 @@ RUN apt-get update \
|
|||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
ghostscript \
|
ghostscript \
|
||||||
qpdf \
|
qpdf \
|
||||||
ffmpeg \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& mkdir -p /usr/local/lib \
|
&& mkdir -p /usr/local/lib \
|
||||||
|
&& curl -fsSL https://github.com/bblanchon/pdfium-binaries/releases/latest/download/pdfium-linux-arm64.tgz -o /tmp/pdfium.tgz \
|
||||||
|
&& mkdir -p /tmp/pdfium \
|
||||||
|
&& tar -xzf /tmp/pdfium.tgz -C /tmp/pdfium --strip-components=1 \
|
||||||
|
&& pdfium_so="$(find /tmp/pdfium -name libpdfium.so -type f | head -n1)" \
|
||||||
|
&& [ -n "${pdfium_so}" ] \
|
||||||
|
&& mv "${pdfium_so}" /usr/local/lib/libpdfium.so \
|
||||||
|
&& ldconfig \
|
||||||
|
&& rm -rf /tmp/pdfium.tgz /tmp/pdfium \
|
||||||
&& useradd --system --create-home --uid 10001 appuser
|
&& useradd --system --create-home --uid 10001 appuser
|
||||||
|
|
||||||
COPY --from=builder /artifacts/backend /usr/local/bin/papercrate-backend
|
COPY --from=builder /app/target/release/backend /usr/local/bin/papercrate-backend
|
||||||
COPY --from=builder /artifacts/worker /usr/local/bin/papercrate-worker
|
COPY --from=builder /app/target/release/worker /usr/local/bin/papercrate-worker
|
||||||
COPY --from=builder /artifacts/webdav /usr/local/bin/papercrate-webdav
|
COPY --from=builder /app/target/release/webdav /usr/local/bin/papercrate-webdav
|
||||||
COPY --from=builder /artifacts/admin /usr/local/bin/papercrate-admin
|
COPY --from=builder /usr/local/cargo/bin/diesel /usr/local/bin/diesel
|
||||||
COPY --from=builder /artifacts/libpdfium.so /usr/local/lib/libpdfium.so
|
|
||||||
RUN ldconfig
|
|
||||||
COPY migrations ./migrations
|
COPY migrations ./migrations
|
||||||
|
COPY diesel.toml ./
|
||||||
|
|
||||||
ENV RUST_LOG=info
|
ENV RUST_LOG=info
|
||||||
USER appuser
|
USER appuser
|
||||||
|
|||||||
@@ -1,123 +0,0 @@
|
|||||||
use std::env;
|
|
||||||
use std::fs;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use regex::escape;
|
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct CaseSuite {
|
|
||||||
cases: Vec<CaseName>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct CaseName {
|
|
||||||
name: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct MonthSuite {
|
|
||||||
months: Vec<MonthDefinition>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct MonthDefinition {
|
|
||||||
name: String,
|
|
||||||
month: u32,
|
|
||||||
#[serde(default)]
|
|
||||||
locales: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn sanitize(name: &str) -> String {
|
|
||||||
let mut out = String::with_capacity(name.len());
|
|
||||||
for ch in name.chars() {
|
|
||||||
if ch.is_ascii_alphanumeric() {
|
|
||||||
out.push(ch);
|
|
||||||
} else {
|
|
||||||
out.push('_');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if out.is_empty() {
|
|
||||||
"case".to_string()
|
|
||||||
} else if out.chars().next().unwrap().is_ascii_digit() {
|
|
||||||
format!("_{}", out)
|
|
||||||
} else {
|
|
||||||
out
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn quote(value: &str) -> String {
|
|
||||||
serde_json::to_string(value).expect("string literal")
|
|
||||||
}
|
|
||||||
|
|
||||||
fn generate_tests() -> Result<String, Box<dyn std::error::Error>> {
|
|
||||||
let yaml_path = PathBuf::from("tests/data/issued_at_cases.yaml");
|
|
||||||
let contents = fs::read_to_string(&yaml_path)?;
|
|
||||||
let suite: CaseSuite = serde_yaml::from_str(&contents)?;
|
|
||||||
|
|
||||||
let mut output =
|
|
||||||
String::from("#[cfg(test)]\npub mod issued_at_generated_tests {\n use super::*;\n");
|
|
||||||
|
|
||||||
for case in suite.cases {
|
|
||||||
let ident = sanitize(&case.name);
|
|
||||||
output.push_str(&format!(
|
|
||||||
" #[test]\n fn {}() {{\n run_named_case(\"{}\");\n }}\n",
|
|
||||||
ident, case.name
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
output.push_str("}\n");
|
|
||||||
Ok(output)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn generate_months() -> Result<String, Box<dyn std::error::Error>> {
|
|
||||||
let yaml_path = PathBuf::from("resources/issued_at_months.yaml");
|
|
||||||
let contents = fs::read_to_string(&yaml_path)?;
|
|
||||||
let suite: MonthSuite = serde_yaml::from_str(&contents)?;
|
|
||||||
|
|
||||||
let mut pattern_parts = Vec::with_capacity(suite.months.len());
|
|
||||||
let mut entries = String::new();
|
|
||||||
for entry in &suite.months {
|
|
||||||
pattern_parts.push(escape(&entry.name));
|
|
||||||
let locales_literal = if entry.locales.is_empty() {
|
|
||||||
"&[]".to_string()
|
|
||||||
} else {
|
|
||||||
let joined = entry
|
|
||||||
.locales
|
|
||||||
.iter()
|
|
||||||
.map(|loc| quote(loc))
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.join(", ");
|
|
||||||
format!("&[{}]", joined)
|
|
||||||
};
|
|
||||||
entries.push_str(&format!(
|
|
||||||
" MonthVariant {{ name: {}, month: {}, locales: {} }},\n",
|
|
||||||
quote(&entry.name),
|
|
||||||
entry.month,
|
|
||||||
locales_literal
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
let pattern_literal = quote(&pattern_parts.join("|"));
|
|
||||||
let output = format!(
|
|
||||||
"pub(super) static MONTH_VARIANTS: &[MonthVariant] = &[\n{entries}];\n\n",
|
|
||||||
entries = entries
|
|
||||||
) + &format!(
|
|
||||||
"pub(super) const MONTH_PATTERN: &str = {};\n",
|
|
||||||
pattern_literal
|
|
||||||
);
|
|
||||||
Ok(output)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|
||||||
println!("cargo:rerun-if-changed=tests/data/issued_at_cases.yaml");
|
|
||||||
println!("cargo:rerun-if-changed=resources/issued_at_months.yaml");
|
|
||||||
|
|
||||||
let out_dir = PathBuf::from(env::var("OUT_DIR")?);
|
|
||||||
fs::write(
|
|
||||||
out_dir.join("issued_at_generated_tests.rs"),
|
|
||||||
generate_tests()?,
|
|
||||||
)?;
|
|
||||||
fs::write(out_dir.join("issued_at_months.rs"), generate_months()?)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
use argon2::{
|
||||||
|
password_hash::{PasswordHasher, SaltString},
|
||||||
|
Argon2,
|
||||||
|
};
|
||||||
|
use rand::thread_rng;
|
||||||
|
use std::env;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let password = env::args()
|
||||||
|
.nth(1)
|
||||||
|
.expect("Usage: cargo run --example hash_password <password>");
|
||||||
|
let salt = SaltString::generate(&mut thread_rng());
|
||||||
|
let argon2 = Argon2::default();
|
||||||
|
let hash = argon2
|
||||||
|
.hash_password(password.as_bytes(), &salt)
|
||||||
|
.expect("hashing failed")
|
||||||
|
.to_string();
|
||||||
|
println!("{}", hash);
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
DROP INDEX IF EXISTS idx_document_tags_tag;
|
||||||
|
DROP TABLE IF EXISTS document_tags;
|
||||||
|
DROP INDEX IF EXISTS idx_document_versions_document;
|
||||||
|
DROP TABLE IF EXISTS document_versions;
|
||||||
|
DROP INDEX IF EXISTS idx_documents_deleted_at;
|
||||||
|
DROP INDEX IF EXISTS idx_documents_folder;
|
||||||
|
DROP TABLE IF EXISTS documents;
|
||||||
|
DROP INDEX IF EXISTS idx_folders_parent;
|
||||||
|
DROP TABLE IF EXISTS folders;
|
||||||
|
DROP TABLE IF EXISTS tags;
|
||||||
|
DROP TABLE IF EXISTS users;
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
CREATE EXTENSION IF NOT EXISTS "pgcrypto";
|
||||||
|
|
||||||
|
CREATE TABLE users (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
username VARCHAR(100) NOT NULL UNIQUE,
|
||||||
|
password_hash VARCHAR(255) NOT NULL,
|
||||||
|
role VARCHAR(16) NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE folders (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
name VARCHAR(255) NOT NULL,
|
||||||
|
parent_id UUID REFERENCES folders(id) ON DELETE SET NULL,
|
||||||
|
path_cache VARCHAR(1000),
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
CONSTRAINT folders_parent_name_unique UNIQUE (parent_id, name)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_folders_parent ON folders(parent_id);
|
||||||
|
|
||||||
|
CREATE TABLE documents (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
filename VARCHAR(255) NOT NULL,
|
||||||
|
original_name VARCHAR(255) NOT NULL,
|
||||||
|
content_type VARCHAR(100),
|
||||||
|
folder_id UUID REFERENCES folders(id) ON DELETE SET NULL,
|
||||||
|
current_version INTEGER NOT NULL,
|
||||||
|
uploaded_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
deleted_at TIMESTAMPTZ,
|
||||||
|
metadata JSONB NOT NULL DEFAULT '{}'::jsonb
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_documents_folder ON documents(folder_id);
|
||||||
|
CREATE INDEX idx_documents_deleted_at ON documents(deleted_at);
|
||||||
|
|
||||||
|
CREATE TABLE document_versions (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
document_id UUID NOT NULL REFERENCES documents(id) ON DELETE CASCADE,
|
||||||
|
version_number INTEGER NOT NULL,
|
||||||
|
s3_key VARCHAR(500) NOT NULL,
|
||||||
|
size_bytes BIGINT NOT NULL,
|
||||||
|
checksum VARCHAR(64) NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
operations_summary JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
CONSTRAINT document_versions_unique_version UNIQUE (document_id, version_number)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_document_versions_document ON document_versions(document_id);
|
||||||
|
|
||||||
|
CREATE TABLE tags (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
label VARCHAR(100) NOT NULL UNIQUE,
|
||||||
|
color VARCHAR(7),
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE document_tags (
|
||||||
|
document_id UUID NOT NULL REFERENCES documents(id) ON DELETE CASCADE,
|
||||||
|
tag_id UUID NOT NULL REFERENCES tags(id) ON DELETE CASCADE,
|
||||||
|
assigned_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
assigned_by UUID REFERENCES users(id),
|
||||||
|
PRIMARY KEY (document_id, tag_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_document_tags_tag ON document_tags(tag_id);
|
||||||
|
|
||||||
|
INSERT INTO users (id, username, password_hash, role)
|
||||||
|
VALUES (
|
||||||
|
gen_random_uuid(),
|
||||||
|
'admin',
|
||||||
|
'$argon2id$v=19$m=19456,t=2,p=1$UMkfsNut028fmZupy9JoQg$/YFvGQoEZ2hhMiDCyv68ZROF97GcwAxxRwRgwSbpX5U',
|
||||||
|
'admin'
|
||||||
|
);
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
DROP TRIGGER IF EXISTS trg_jobs_updated_at ON jobs;
|
||||||
|
DROP FUNCTION IF EXISTS touch_jobs_updated_at;
|
||||||
|
DROP INDEX IF EXISTS idx_jobs_job_type;
|
||||||
|
DROP INDEX IF EXISTS idx_jobs_status_run_after;
|
||||||
|
DROP TABLE IF EXISTS jobs;
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
CREATE TABLE jobs (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
job_type TEXT NOT NULL,
|
||||||
|
payload JSONB NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'queued',
|
||||||
|
attempts INTEGER NOT NULL DEFAULT 0,
|
||||||
|
run_after TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
last_error TEXT,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
CONSTRAINT jobs_status_check CHECK (status IN ('queued', 'processing', 'succeeded', 'failed'))
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_jobs_status_run_after ON jobs (status, run_after);
|
||||||
|
CREATE INDEX idx_jobs_job_type ON jobs (job_type);
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION touch_jobs_updated_at()
|
||||||
|
RETURNS TRIGGER AS $$
|
||||||
|
BEGIN
|
||||||
|
NEW.updated_at = now();
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql;
|
||||||
|
|
||||||
|
CREATE TRIGGER trg_jobs_updated_at
|
||||||
|
BEFORE UPDATE ON jobs
|
||||||
|
FOR EACH ROW
|
||||||
|
EXECUTE FUNCTION touch_jobs_updated_at();
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
DROP INDEX IF EXISTS idx_document_assets_type;
|
||||||
|
DROP INDEX IF EXISTS idx_document_assets_version;
|
||||||
|
DROP TABLE IF EXISTS document_assets;
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
CREATE TABLE document_assets (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
document_version_id UUID NOT NULL REFERENCES document_versions(id) ON DELETE CASCADE,
|
||||||
|
asset_type TEXT NOT NULL,
|
||||||
|
s3_key TEXT NOT NULL,
|
||||||
|
mime_type TEXT NOT NULL,
|
||||||
|
width INTEGER,
|
||||||
|
height INTEGER,
|
||||||
|
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
CONSTRAINT document_assets_unique UNIQUE (document_version_id, asset_type)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_document_assets_version ON document_assets(document_version_id);
|
||||||
|
CREATE INDEX idx_document_assets_type ON document_assets(asset_type);
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
DROP INDEX IF EXISTS folders_parent_name_unique_idx;
|
||||||
|
|
||||||
|
ALTER TABLE folders
|
||||||
|
ADD CONSTRAINT folders_parent_name_unique UNIQUE (parent_id, name);
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
ALTER TABLE folders
|
||||||
|
DROP CONSTRAINT IF EXISTS folders_parent_name_unique;
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX folders_parent_name_unique_idx
|
||||||
|
ON folders (COALESCE(parent_id, '00000000-0000-0000-0000-000000000000'::uuid), name);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE documents
|
||||||
|
DROP COLUMN issued_at;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE documents
|
||||||
|
ADD COLUMN issued_at TIMESTAMPTZ;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE documents
|
||||||
|
DROP COLUMN name;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
ALTER TABLE documents
|
||||||
|
ADD COLUMN name VARCHAR(255);
|
||||||
|
|
||||||
|
UPDATE documents
|
||||||
|
SET name = CASE
|
||||||
|
WHEN filename ~ '\\.[^./]+$' THEN regexp_replace(filename, '\\.[^./]+$', '')
|
||||||
|
ELSE filename
|
||||||
|
END;
|
||||||
|
|
||||||
|
ALTER TABLE documents
|
||||||
|
ALTER COLUMN name SET NOT NULL;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE documents
|
||||||
|
RENAME COLUMN title TO name;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE documents
|
||||||
|
RENAME COLUMN name TO title;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE refresh_tokens;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
CREATE TABLE refresh_tokens (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||||
|
token_hash TEXT NOT NULL,
|
||||||
|
issued_at TIMESTAMPTZ NOT NULL,
|
||||||
|
expires_at TIMESTAMPTZ NOT NULL,
|
||||||
|
revoked_at TIMESTAMPTZ,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_refresh_tokens_user_id ON refresh_tokens(user_id);
|
||||||
|
CREATE INDEX idx_refresh_tokens_token_hash ON refresh_tokens(token_hash);
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- Restore width/height columns and repopulate from metadata where available.
|
||||||
|
|
||||||
|
ALTER TABLE document_assets
|
||||||
|
ADD COLUMN width INTEGER,
|
||||||
|
ADD COLUMN height INTEGER;
|
||||||
|
|
||||||
|
UPDATE document_assets
|
||||||
|
SET width = (metadata->>'width')::INTEGER
|
||||||
|
WHERE metadata ? 'width';
|
||||||
|
|
||||||
|
UPDATE document_assets
|
||||||
|
SET height = (metadata->>'height')::INTEGER
|
||||||
|
WHERE metadata ? 'height';
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
-- Backfill existing width/height values into metadata then drop the columns.
|
||||||
|
|
||||||
|
UPDATE document_assets
|
||||||
|
SET metadata = metadata || jsonb_build_object('width', width)
|
||||||
|
WHERE width IS NOT NULL
|
||||||
|
AND NOT (metadata ? 'width');
|
||||||
|
|
||||||
|
UPDATE document_assets
|
||||||
|
SET metadata = metadata || jsonb_build_object('height', height)
|
||||||
|
WHERE height IS NOT NULL
|
||||||
|
AND NOT (metadata ? 'height');
|
||||||
|
|
||||||
|
ALTER TABLE document_assets
|
||||||
|
DROP COLUMN width,
|
||||||
|
DROP COLUMN height;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
ALTER TABLE documents ADD COLUMN current_version INT4;
|
||||||
|
|
||||||
|
UPDATE documents AS d
|
||||||
|
SET current_version = dv.version_number
|
||||||
|
FROM document_versions AS dv
|
||||||
|
WHERE dv.id = d.current_version_id;
|
||||||
|
|
||||||
|
ALTER TABLE documents
|
||||||
|
ALTER COLUMN current_version SET NOT NULL;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_documents_current_version_id;
|
||||||
|
|
||||||
|
ALTER TABLE documents
|
||||||
|
DROP CONSTRAINT IF EXISTS documents_current_version_fk;
|
||||||
|
|
||||||
|
ALTER TABLE documents
|
||||||
|
DROP COLUMN current_version_id;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
ALTER TABLE documents ADD COLUMN current_version_id UUID;
|
||||||
|
|
||||||
|
UPDATE documents AS d
|
||||||
|
SET current_version_id = dv.id
|
||||||
|
FROM document_versions AS dv
|
||||||
|
WHERE dv.document_id = d.id
|
||||||
|
AND dv.version_number = d.current_version;
|
||||||
|
|
||||||
|
ALTER TABLE documents
|
||||||
|
ALTER COLUMN current_version_id SET NOT NULL;
|
||||||
|
|
||||||
|
ALTER TABLE documents
|
||||||
|
ADD CONSTRAINT documents_current_version_fk
|
||||||
|
FOREIGN KEY (current_version_id)
|
||||||
|
REFERENCES document_versions(id)
|
||||||
|
DEFERRABLE INITIALLY DEFERRED;
|
||||||
|
|
||||||
|
CREATE INDEX idx_documents_current_version_id
|
||||||
|
ON documents(current_version_id);
|
||||||
|
|
||||||
|
ALTER TABLE documents DROP COLUMN current_version;
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
DROP INDEX IF EXISTS idx_document_correspondents_role;
|
||||||
|
DROP INDEX IF EXISTS idx_document_correspondents_correspondent;
|
||||||
|
DROP INDEX IF EXISTS idx_document_correspondents_document;
|
||||||
|
DROP TABLE IF EXISTS document_correspondents;
|
||||||
|
DROP TABLE IF EXISTS correspondents;
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
CREATE TABLE correspondents (
|
||||||
|
id UUID PRIMARY KEY,
|
||||||
|
name VARCHAR(255) NOT NULL,
|
||||||
|
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
CONSTRAINT correspondents_name_unique UNIQUE (name)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE document_correspondents (
|
||||||
|
document_id UUID NOT NULL REFERENCES documents(id) ON DELETE CASCADE,
|
||||||
|
correspondent_id UUID NOT NULL REFERENCES correspondents(id) ON DELETE CASCADE,
|
||||||
|
role VARCHAR(32) NOT NULL,
|
||||||
|
assigned_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
assigned_by UUID REFERENCES users(id),
|
||||||
|
PRIMARY KEY (document_id, correspondent_id, role),
|
||||||
|
CONSTRAINT document_correspondents_role_check CHECK (role IN ('sender', 'receiver', 'other'))
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_document_correspondents_document
|
||||||
|
ON document_correspondents(document_id);
|
||||||
|
|
||||||
|
CREATE INDEX idx_document_correspondents_correspondent
|
||||||
|
ON document_correspondents(correspondent_id);
|
||||||
|
|
||||||
|
CREATE INDEX idx_document_correspondents_role
|
||||||
|
ON document_correspondents(role);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP INDEX IF EXISTS idx_documents_folder_filename;
|
||||||
|
DROP INDEX IF EXISTS idx_documents_folder_title;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
CREATE INDEX idx_documents_folder_title
|
||||||
|
ON documents (
|
||||||
|
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
||||||
|
title
|
||||||
|
)
|
||||||
|
WHERE deleted_at IS NULL;
|
||||||
|
|
||||||
|
CREATE INDEX idx_documents_folder_filename
|
||||||
|
ON documents (
|
||||||
|
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
||||||
|
filename
|
||||||
|
)
|
||||||
|
WHERE deleted_at IS NULL;
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
DROP INDEX IF EXISTS documents_unique_folder_filename;
|
||||||
|
DROP INDEX IF EXISTS idx_documents_folder_title;
|
||||||
|
|
||||||
|
CREATE INDEX idx_documents_folder_title
|
||||||
|
ON documents (
|
||||||
|
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
||||||
|
title
|
||||||
|
)
|
||||||
|
WHERE deleted_at IS NULL;
|
||||||
|
|
||||||
|
CREATE INDEX idx_documents_folder_filename
|
||||||
|
ON documents (
|
||||||
|
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
||||||
|
filename
|
||||||
|
)
|
||||||
|
WHERE deleted_at IS NULL;
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
DROP INDEX IF EXISTS idx_documents_folder_title;
|
||||||
|
DROP INDEX IF EXISTS idx_documents_folder_filename;
|
||||||
|
DROP INDEX IF EXISTS documents_unique_folder_title;
|
||||||
|
DROP INDEX IF EXISTS documents_unique_folder_filename;
|
||||||
|
|
||||||
|
CREATE INDEX idx_documents_folder_title
|
||||||
|
ON documents (
|
||||||
|
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
||||||
|
title
|
||||||
|
)
|
||||||
|
WHERE deleted_at IS NULL;
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX documents_unique_folder_filename
|
||||||
|
ON documents (
|
||||||
|
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
||||||
|
filename
|
||||||
|
)
|
||||||
|
WHERE deleted_at IS NULL;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE document_versions
|
||||||
|
DROP COLUMN metadata;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE document_versions
|
||||||
|
ADD COLUMN metadata JSONB NOT NULL DEFAULT '{}'::jsonb;
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE folders
|
||||||
|
ADD COLUMN path_cache VARCHAR(1000);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE folders
|
||||||
|
DROP COLUMN path_cache;
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
DROP TRIGGER IF EXISTS trg_jobs_updated_at ON jobs;
|
|
||||||
DROP FUNCTION IF EXISTS touch_jobs_updated_at();
|
|
||||||
|
|
||||||
DROP TABLE IF EXISTS webauthn_challenges;
|
|
||||||
DROP TABLE IF EXISTS user_passkeys;
|
|
||||||
DROP TABLE IF EXISTS webdav_tokens;
|
|
||||||
ALTER TABLE documents DROP CONSTRAINT IF EXISTS documents_current_version_fk;
|
|
||||||
DROP TABLE IF EXISTS document_asset_objects;
|
|
||||||
DROP TABLE IF EXISTS document_assets;
|
|
||||||
DROP TABLE IF EXISTS document_versions;
|
|
||||||
DROP TABLE IF EXISTS document_tags;
|
|
||||||
DROP TABLE IF EXISTS document_correspondents;
|
|
||||||
DROP TABLE IF EXISTS correspondents;
|
|
||||||
DROP TABLE IF EXISTS documents;
|
|
||||||
DROP TABLE IF EXISTS folders;
|
|
||||||
DROP TABLE IF EXISTS tags;
|
|
||||||
DROP TABLE IF EXISTS jobs;
|
|
||||||
DROP TABLE IF EXISTS refresh_tokens;
|
|
||||||
DROP TABLE IF EXISTS user_memberships;
|
|
||||||
DROP TABLE IF EXISTS users;
|
|
||||||
DROP TABLE IF EXISTS tenants;
|
|
||||||
|
|
||||||
DROP TYPE IF EXISTS tenant_status;
|
|
||||||
|
|
||||||
DROP EXTENSION IF EXISTS "pgcrypto";
|
|
||||||
@@ -1,295 +0,0 @@
|
|||||||
CREATE EXTENSION IF NOT EXISTS "pgcrypto";
|
|
||||||
|
|
||||||
CREATE TYPE tenant_status AS ENUM ('creating', 'active', 'suspended', 'deleting', 'error');
|
|
||||||
|
|
||||||
CREATE TABLE tenants (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
storage_root TEXT,
|
|
||||||
quickwit_index TEXT,
|
|
||||||
config JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
status tenant_status NOT NULL,
|
|
||||||
created_by UUID
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX tenants_storage_root_unique
|
|
||||||
ON tenants (storage_root)
|
|
||||||
WHERE storage_root IS NOT NULL;
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX tenants_quickwit_index_unique
|
|
||||||
ON tenants (quickwit_index)
|
|
||||||
WHERE quickwit_index IS NOT NULL;
|
|
||||||
|
|
||||||
CREATE TABLE users (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
username VARCHAR(100) NOT NULL UNIQUE,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE user_memberships (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id) ON DELETE CASCADE,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
UNIQUE (user_id, tenant_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX user_memberships_tenant_id_idx ON user_memberships(tenant_id);
|
|
||||||
CREATE INDEX user_memberships_user_id_idx ON user_memberships(user_id);
|
|
||||||
|
|
||||||
CREATE TABLE folders (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
name VARCHAR(255) NOT NULL,
|
|
||||||
parent_id UUID REFERENCES folders(id) ON DELETE SET NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_folders_parent ON folders(parent_id);
|
|
||||||
CREATE INDEX folders_tenant_id_idx ON folders(tenant_id);
|
|
||||||
CREATE UNIQUE INDEX folders_tenant_parent_name_unique_idx
|
|
||||||
ON folders (
|
|
||||||
tenant_id,
|
|
||||||
COALESCE(parent_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
|
||||||
name
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE documents (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
filename VARCHAR(255) NOT NULL,
|
|
||||||
original_name VARCHAR(255) NOT NULL,
|
|
||||||
content_type VARCHAR(100),
|
|
||||||
folder_id UUID REFERENCES folders(id) ON DELETE SET NULL,
|
|
||||||
uploaded_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
deleted_at TIMESTAMPTZ,
|
|
||||||
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
issued_at TIMESTAMPTZ,
|
|
||||||
title VARCHAR(255) NOT NULL,
|
|
||||||
current_version_id UUID NOT NULL,
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_documents_folder ON documents(folder_id);
|
|
||||||
CREATE INDEX idx_documents_deleted_at ON documents(deleted_at);
|
|
||||||
CREATE INDEX documents_tenant_id_idx ON documents(tenant_id);
|
|
||||||
CREATE INDEX idx_documents_current_version_id ON documents(current_version_id);
|
|
||||||
CREATE INDEX idx_documents_folder_title
|
|
||||||
ON documents (
|
|
||||||
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
|
||||||
title
|
|
||||||
)
|
|
||||||
WHERE deleted_at IS NULL;
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX documents_tenant_folder_filename_unique
|
|
||||||
ON documents (
|
|
||||||
tenant_id,
|
|
||||||
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
|
||||||
filename
|
|
||||||
)
|
|
||||||
WHERE deleted_at IS NULL;
|
|
||||||
|
|
||||||
CREATE TABLE document_versions (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
document_id UUID NOT NULL REFERENCES documents(id) ON DELETE CASCADE,
|
|
||||||
version_number INT NOT NULL,
|
|
||||||
s3_key VARCHAR(500) NOT NULL,
|
|
||||||
size_bytes BIGINT NOT NULL,
|
|
||||||
checksum VARCHAR(64) NOT NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id),
|
|
||||||
CONSTRAINT document_versions_unique_version UNIQUE (document_id, version_number)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_document_versions_document ON document_versions(document_id);
|
|
||||||
CREATE INDEX document_versions_tenant_id_idx ON document_versions(tenant_id);
|
|
||||||
|
|
||||||
ALTER TABLE documents
|
|
||||||
ADD CONSTRAINT documents_current_version_fk
|
|
||||||
FOREIGN KEY (current_version_id)
|
|
||||||
REFERENCES document_versions(id)
|
|
||||||
DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
|
|
||||||
CREATE TABLE tags (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
label VARCHAR(100) NOT NULL,
|
|
||||||
color VARCHAR(7),
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX tags_tenant_label_unique ON tags(tenant_id, label);
|
|
||||||
CREATE INDEX tags_tenant_id_idx ON tags(tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE document_tags (
|
|
||||||
document_id UUID NOT NULL REFERENCES documents(id) ON DELETE CASCADE,
|
|
||||||
tag_id UUID NOT NULL REFERENCES tags(id) ON DELETE CASCADE,
|
|
||||||
assigned_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
assigned_by UUID REFERENCES users(id),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id),
|
|
||||||
PRIMARY KEY (document_id, tag_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_document_tags_tag ON document_tags(tag_id);
|
|
||||||
CREATE INDEX document_tags_tenant_id_idx ON document_tags(tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE correspondents (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
name VARCHAR(255) NOT NULL,
|
|
||||||
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX correspondents_tenant_name_unique
|
|
||||||
ON correspondents (tenant_id, name);
|
|
||||||
CREATE INDEX correspondents_tenant_id_idx ON correspondents(tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE document_correspondents (
|
|
||||||
document_id UUID NOT NULL REFERENCES documents(id) ON DELETE CASCADE,
|
|
||||||
correspondent_id UUID NOT NULL REFERENCES correspondents(id) ON DELETE CASCADE,
|
|
||||||
assigned_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
assigned_by UUID REFERENCES users(id),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id),
|
|
||||||
PRIMARY KEY (document_id, correspondent_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_document_correspondents_document ON document_correspondents(document_id);
|
|
||||||
CREATE INDEX idx_document_correspondents_correspondent ON document_correspondents(correspondent_id);
|
|
||||||
CREATE INDEX document_correspondents_tenant_id_idx ON document_correspondents(tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE document_assets (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
document_version_id UUID NOT NULL REFERENCES document_versions(id) ON DELETE CASCADE,
|
|
||||||
asset_type TEXT NOT NULL,
|
|
||||||
mime_type TEXT NOT NULL,
|
|
||||||
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
cardinality INTEGER,
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id),
|
|
||||||
CONSTRAINT document_assets_unique UNIQUE (document_version_id, asset_type),
|
|
||||||
CONSTRAINT document_assets_cardinality_positive CHECK (cardinality IS NULL OR cardinality >= 1)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_document_assets_version ON document_assets(document_version_id);
|
|
||||||
CREATE INDEX idx_document_assets_type ON document_assets(asset_type);
|
|
||||||
CREATE INDEX document_assets_tenant_id_idx ON document_assets(tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE document_asset_objects (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
asset_id UUID NOT NULL REFERENCES document_assets(id) ON DELETE CASCADE,
|
|
||||||
ordinal INTEGER NOT NULL,
|
|
||||||
s3_key TEXT NOT NULL,
|
|
||||||
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id),
|
|
||||||
CONSTRAINT document_asset_objects_ordinal_positive CHECK (ordinal >= 1),
|
|
||||||
CONSTRAINT document_asset_objects_asset_ordinal_unique UNIQUE (asset_id, ordinal)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_document_asset_objects_asset_ordinal
|
|
||||||
ON document_asset_objects(asset_id, ordinal);
|
|
||||||
CREATE INDEX document_asset_objects_tenant_id_idx ON document_asset_objects(tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE jobs (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
job_type TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL,
|
|
||||||
status TEXT NOT NULL DEFAULT 'queued',
|
|
||||||
attempts INTEGER NOT NULL DEFAULT 0,
|
|
||||||
run_after TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id),
|
|
||||||
CONSTRAINT jobs_status_check CHECK (status IN ('queued', 'processing', 'succeeded', 'failed'))
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_jobs_status_run_after ON jobs(status, run_after);
|
|
||||||
CREATE INDEX idx_jobs_job_type ON jobs(job_type);
|
|
||||||
CREATE INDEX jobs_tenant_id_idx ON jobs(tenant_id);
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION touch_jobs_updated_at()
|
|
||||||
RETURNS TRIGGER AS $$
|
|
||||||
BEGIN
|
|
||||||
NEW.updated_at = NOW();
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$$ LANGUAGE plpgsql;
|
|
||||||
|
|
||||||
CREATE TRIGGER trg_jobs_updated_at
|
|
||||||
BEFORE UPDATE ON jobs
|
|
||||||
FOR EACH ROW
|
|
||||||
EXECUTE FUNCTION touch_jobs_updated_at();
|
|
||||||
|
|
||||||
CREATE TABLE refresh_tokens (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
token_hash TEXT NOT NULL,
|
|
||||||
issued_at TIMESTAMPTZ NOT NULL,
|
|
||||||
expires_at TIMESTAMPTZ NOT NULL,
|
|
||||||
revoked_at TIMESTAMPTZ,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_refresh_tokens_user_id ON refresh_tokens(user_id);
|
|
||||||
CREATE INDEX idx_refresh_tokens_token_hash ON refresh_tokens(token_hash);
|
|
||||||
CREATE INDEX refresh_tokens_tenant_id_idx ON refresh_tokens(tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE webdav_tokens (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
tenant_id UUID NOT NULL REFERENCES tenants(id) ON DELETE CASCADE,
|
|
||||||
token_prefix TEXT NOT NULL,
|
|
||||||
token_hash TEXT NOT NULL,
|
|
||||||
label TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
last_used_at TIMESTAMPTZ,
|
|
||||||
expires_at TIMESTAMPTZ,
|
|
||||||
revoked_at TIMESTAMPTZ
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX webdav_tokens_token_prefix_key ON webdav_tokens(token_prefix);
|
|
||||||
CREATE INDEX webdav_tokens_user_tenant_idx ON webdav_tokens(user_id, tenant_id);
|
|
||||||
|
|
||||||
CREATE TABLE user_passkeys (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
credential_id BYTEA NOT NULL UNIQUE,
|
|
||||||
public_key BYTEA NOT NULL,
|
|
||||||
credential JSONB NOT NULL,
|
|
||||||
sign_count BIGINT NOT NULL,
|
|
||||||
transports TEXT[] NOT NULL DEFAULT '{}'::text[],
|
|
||||||
aaguid UUID,
|
|
||||||
nickname TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
last_used_at TIMESTAMPTZ,
|
|
||||||
revoked_at TIMESTAMPTZ,
|
|
||||||
revoked_by UUID,
|
|
||||||
revoked_reason TEXT
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX user_passkeys_user_id_idx ON user_passkeys(user_id);
|
|
||||||
|
|
||||||
CREATE TABLE webauthn_challenges (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
user_id UUID REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
purpose TEXT NOT NULL,
|
|
||||||
challenge BYTEA NOT NULL,
|
|
||||||
state BYTEA NOT NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
expires_at TIMESTAMPTZ NOT NULL,
|
|
||||||
CONSTRAINT webauthn_challenges_purpose_check CHECK (purpose IN ('registration', 'authentication'))
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX webauthn_challenges_user_id_idx ON webauthn_challenges(user_id);
|
|
||||||
CREATE INDEX webauthn_challenges_expires_at_idx ON webauthn_challenges(expires_at);
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE documents
|
|
||||||
RENAME COLUMN created_at TO uploaded_at;
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE documents
|
|
||||||
RENAME COLUMN uploaded_at TO created_at;
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE magic_tokens;
|
|
||||||
DROP TYPE magic_token_kind;
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
CREATE TYPE magic_token_kind AS ENUM ('email_login', 'demo_login');
|
|
||||||
|
|
||||||
CREATE TABLE magic_tokens (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
kind magic_token_kind NOT NULL,
|
|
||||||
token_hash VARCHAR NOT NULL UNIQUE,
|
|
||||||
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
expires_at TIMESTAMPTZ NOT NULL,
|
|
||||||
max_uses INTEGER,
|
|
||||||
used_count INTEGER NOT NULL DEFAULT 0,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
created_by UUID REFERENCES users(id) ON DELETE SET NULL,
|
|
||||||
last_used_at TIMESTAMPTZ
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX magic_tokens_token_hash_idx ON magic_tokens (token_hash);
|
|
||||||
CREATE INDEX magic_tokens_expires_at_idx ON magic_tokens (expires_at);
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
-- Move tables and types back to the public schema
|
|
||||||
ALTER TABLE tenant.webdav_tokens SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.user_memberships SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.refresh_tokens SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.tags SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.document_correspondents SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.document_tags SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.document_asset_objects SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.document_assets SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.document_versions SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.documents SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.folders SET SCHEMA public;
|
|
||||||
ALTER TABLE tenant.correspondents SET SCHEMA public;
|
|
||||||
|
|
||||||
ALTER FUNCTION shared.touch_jobs_updated_at() SET SCHEMA public;
|
|
||||||
|
|
||||||
ALTER TABLE shared.magic_tokens SET SCHEMA public;
|
|
||||||
ALTER TABLE shared.jobs SET SCHEMA public;
|
|
||||||
ALTER TABLE shared.webauthn_challenges SET SCHEMA public;
|
|
||||||
ALTER TABLE shared.user_passkeys SET SCHEMA public;
|
|
||||||
ALTER TABLE shared.users SET SCHEMA public;
|
|
||||||
ALTER TABLE shared.tenants SET SCHEMA public;
|
|
||||||
|
|
||||||
ALTER TYPE shared.magic_token_kind SET SCHEMA public;
|
|
||||||
ALTER TYPE shared.tenant_status SET SCHEMA public;
|
|
||||||
|
|
||||||
DROP SCHEMA IF EXISTS tenant CASCADE;
|
|
||||||
DROP SCHEMA IF EXISTS shared CASCADE;
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
CREATE SCHEMA IF NOT EXISTS shared;
|
|
||||||
CREATE SCHEMA IF NOT EXISTS tenant;
|
|
||||||
|
|
||||||
-- Move global types and tables into the shared schema
|
|
||||||
ALTER TYPE tenant_status SET SCHEMA shared;
|
|
||||||
ALTER TYPE magic_token_kind SET SCHEMA shared;
|
|
||||||
|
|
||||||
ALTER TABLE tenants SET SCHEMA shared;
|
|
||||||
ALTER TABLE users SET SCHEMA shared;
|
|
||||||
ALTER TABLE user_passkeys SET SCHEMA shared;
|
|
||||||
ALTER TABLE webauthn_challenges SET SCHEMA shared;
|
|
||||||
ALTER TABLE jobs SET SCHEMA shared;
|
|
||||||
ALTER TABLE magic_tokens SET SCHEMA shared;
|
|
||||||
|
|
||||||
ALTER FUNCTION touch_jobs_updated_at() SET SCHEMA shared;
|
|
||||||
|
|
||||||
-- Move tenant-scoped tables into the tenant schema
|
|
||||||
ALTER TABLE correspondents SET SCHEMA tenant;
|
|
||||||
ALTER TABLE folders SET SCHEMA tenant;
|
|
||||||
ALTER TABLE documents SET SCHEMA tenant;
|
|
||||||
ALTER TABLE document_versions SET SCHEMA tenant;
|
|
||||||
ALTER TABLE document_assets SET SCHEMA tenant;
|
|
||||||
ALTER TABLE document_asset_objects SET SCHEMA tenant;
|
|
||||||
ALTER TABLE document_tags SET SCHEMA tenant;
|
|
||||||
ALTER TABLE document_correspondents SET SCHEMA tenant;
|
|
||||||
ALTER TABLE tags SET SCHEMA tenant;
|
|
||||||
ALTER TABLE refresh_tokens SET SCHEMA tenant;
|
|
||||||
ALTER TABLE user_memberships SET SCHEMA tenant;
|
|
||||||
ALTER TABLE webdav_tokens SET SCHEMA tenant;
|
|
||||||
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'papercrate_app') THEN
|
|
||||||
RETURN;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
GRANT USAGE ON SCHEMA shared TO papercrate_app;
|
|
||||||
GRANT USAGE ON SCHEMA tenant TO papercrate_app;
|
|
||||||
GRANT SELECT ON ALL TABLES IN SCHEMA shared TO papercrate_app;
|
|
||||||
GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA tenant TO papercrate_app;
|
|
||||||
|
|
||||||
ALTER DEFAULT PRIVILEGES IN SCHEMA shared GRANT SELECT ON TABLES TO papercrate_app;
|
|
||||||
ALTER DEFAULT PRIVILEGES IN SCHEMA tenant GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO papercrate_app;
|
|
||||||
END
|
|
||||||
$$;
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
DROP POLICY IF EXISTS tenant_membership_select_policy ON tenant.user_memberships;
|
|
||||||
ALTER TABLE tenant.user_memberships NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.user_memberships DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.webdav_tokens;
|
|
||||||
ALTER TABLE tenant.webdav_tokens NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.webdav_tokens DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.tags;
|
|
||||||
ALTER TABLE tenant.tags NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.tags DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_refresh_token_policy ON tenant.refresh_tokens;
|
|
||||||
ALTER TABLE tenant.refresh_tokens NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.refresh_tokens DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.folders;
|
|
||||||
ALTER TABLE tenant.folders NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.folders DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.documents;
|
|
||||||
ALTER TABLE tenant.documents NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.documents DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.document_versions;
|
|
||||||
ALTER TABLE tenant.document_versions NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.document_versions DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.document_tags;
|
|
||||||
ALTER TABLE tenant.document_tags NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.document_tags DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.document_correspondents;
|
|
||||||
ALTER TABLE tenant.document_correspondents NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.document_correspondents DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.document_assets;
|
|
||||||
ALTER TABLE tenant.document_assets NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.document_assets DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.document_asset_objects;
|
|
||||||
ALTER TABLE tenant.document_asset_objects NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.document_asset_objects DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_isolation_policy ON tenant.correspondents;
|
|
||||||
ALTER TABLE tenant.correspondents NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.correspondents DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_refresh_token_hash();
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_user_id();
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_tenant_id();
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
CREATE OR REPLACE FUNCTION shared.current_tenant_id() RETURNS uuid AS $$
|
|
||||||
SELECT CASE
|
|
||||||
WHEN setting IS NULL OR setting = '' THEN NULL
|
|
||||||
ELSE setting::uuid
|
|
||||||
END
|
|
||||||
FROM (SELECT current_setting('papercrate.tenant_id', true) AS setting) s;
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION shared.current_user_id() RETURNS uuid AS $$
|
|
||||||
SELECT CASE
|
|
||||||
WHEN setting IS NULL OR setting = '' THEN NULL
|
|
||||||
ELSE setting::uuid
|
|
||||||
END
|
|
||||||
FROM (SELECT current_setting('papercrate.user_id', true) AS setting) s;
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION shared.current_refresh_token_hash() RETURNS text AS $$
|
|
||||||
SELECT NULLIF(current_setting('papercrate.refresh_token_hash', true), '')
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
-- Helper to create tenant isolation policy
|
|
||||||
CREATE OR REPLACE FUNCTION shared.ensure_tenant_policy(table_reg regclass) RETURNS void AS $$
|
|
||||||
BEGIN
|
|
||||||
EXECUTE format('ALTER TABLE %s ENABLE ROW LEVEL SECURITY', table_reg);
|
|
||||||
EXECUTE format('ALTER TABLE %s FORCE ROW LEVEL SECURITY', table_reg);
|
|
||||||
EXECUTE format(
|
|
||||||
'CREATE POLICY tenant_isolation_policy ON %s USING (tenant_id = shared.current_tenant_id()) WITH CHECK (tenant_id = shared.current_tenant_id())',
|
|
||||||
table_reg
|
|
||||||
);
|
|
||||||
END;
|
|
||||||
$$ LANGUAGE plpgsql;
|
|
||||||
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.correspondents');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.document_asset_objects');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.document_assets');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.document_correspondents');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.document_tags');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.document_versions');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.documents');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.folders');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.tags');
|
|
||||||
SELECT shared.ensure_tenant_policy('tenant.webdav_tokens');
|
|
||||||
|
|
||||||
-- user_memberships has a special read policy to allow tenant discovery during login
|
|
||||||
ALTER TABLE tenant.user_memberships ENABLE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.user_memberships FORCE ROW LEVEL SECURITY;
|
|
||||||
CREATE POLICY tenant_membership_select_policy ON tenant.user_memberships
|
|
||||||
USING (
|
|
||||||
tenant_id = shared.current_tenant_id()
|
|
||||||
OR (
|
|
||||||
shared.current_user_id() IS NOT NULL
|
|
||||||
AND user_id = shared.current_user_id()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
WITH CHECK (tenant_id = shared.current_tenant_id());
|
|
||||||
|
|
||||||
ALTER TABLE tenant.refresh_tokens ENABLE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.refresh_tokens FORCE ROW LEVEL SECURITY;
|
|
||||||
CREATE POLICY tenant_refresh_token_policy ON tenant.refresh_tokens
|
|
||||||
USING (
|
|
||||||
tenant_id = shared.current_tenant_id()
|
|
||||||
OR (
|
|
||||||
shared.current_refresh_token_hash() IS NOT NULL
|
|
||||||
AND token_hash = shared.current_refresh_token_hash()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
WITH CHECK (tenant_id = shared.current_tenant_id());
|
|
||||||
|
|
||||||
DROP FUNCTION shared.ensure_tenant_policy(regclass);
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
DROP POLICY IF EXISTS tenant_webdav_token_policy ON tenant.webdav_tokens;
|
|
||||||
ALTER TABLE tenant.webdav_tokens NO FORCE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.webdav_tokens DISABLE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_webdav_token_prefix();
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
CREATE OR REPLACE FUNCTION shared.current_webdav_token_prefix() RETURNS text AS $$
|
|
||||||
SELECT NULLIF(current_setting('papercrate.webdav_token_prefix', true), '')
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.webdav_tokens ENABLE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.webdav_tokens FORCE ROW LEVEL SECURITY;
|
|
||||||
CREATE POLICY tenant_webdav_token_policy ON tenant.webdav_tokens
|
|
||||||
USING (
|
|
||||||
tenant_id = shared.current_tenant_id()
|
|
||||||
OR (
|
|
||||||
shared.current_webdav_token_prefix() IS NOT NULL
|
|
||||||
AND token_prefix = shared.current_webdav_token_prefix()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
WITH CHECK (tenant_id = shared.current_tenant_id());
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
DROP POLICY IF EXISTS tenant_api_token_policy ON tenant.api_tokens;
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_api_token_prefix();
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens DISABLE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.api_tokens NO FORCE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens
|
|
||||||
DROP COLUMN IF EXISTS capabilities;
|
|
||||||
|
|
||||||
DROP TYPE IF EXISTS shared.api_token_capability;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens RENAME TO webdav_tokens;
|
|
||||||
ALTER INDEX tenant.api_tokens_token_prefix_key RENAME TO webdav_tokens_token_prefix_key;
|
|
||||||
ALTER INDEX tenant.api_tokens_user_tenant_idx RENAME TO webdav_tokens_user_tenant_idx;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION shared.current_webdav_token_prefix() RETURNS text AS $$
|
|
||||||
SELECT NULLIF(current_setting('papercrate.webdav_token_prefix', true), '')
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.webdav_tokens ENABLE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.webdav_tokens FORCE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
CREATE POLICY tenant_webdav_token_policy ON tenant.webdav_tokens
|
|
||||||
USING (
|
|
||||||
tenant_id = shared.current_tenant_id()
|
|
||||||
OR (
|
|
||||||
shared.current_webdav_token_prefix() IS NOT NULL
|
|
||||||
AND token_prefix = shared.current_webdav_token_prefix()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
WITH CHECK (tenant_id = shared.current_tenant_id());
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
ALTER TABLE tenant.webdav_tokens RENAME TO api_tokens;
|
|
||||||
ALTER INDEX tenant.webdav_tokens_token_prefix_key RENAME TO api_tokens_token_prefix_key;
|
|
||||||
ALTER INDEX tenant.webdav_tokens_user_tenant_idx RENAME TO api_tokens_user_tenant_idx;
|
|
||||||
|
|
||||||
DROP POLICY IF EXISTS tenant_webdav_token_policy ON tenant.api_tokens;
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_webdav_token_prefix();
|
|
||||||
|
|
||||||
CREATE TYPE shared.api_token_capability AS ENUM ('api', 'webdav');
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens
|
|
||||||
ADD COLUMN capabilities shared.api_token_capability[] NOT NULL DEFAULT ARRAY['webdav']::shared.api_token_capability[];
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens ENABLE ROW LEVEL SECURITY;
|
|
||||||
ALTER TABLE tenant.api_tokens FORCE ROW LEVEL SECURITY;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION shared.current_api_token_prefix() RETURNS text AS $$
|
|
||||||
SELECT NULLIF(current_setting('papercrate.api_token_prefix', true), '')
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
CREATE POLICY tenant_api_token_policy ON tenant.api_tokens
|
|
||||||
USING (
|
|
||||||
tenant_id = shared.current_tenant_id()
|
|
||||||
OR (
|
|
||||||
shared.current_api_token_prefix() IS NOT NULL
|
|
||||||
AND token_prefix = shared.current_api_token_prefix()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
WITH CHECK (tenant_id = shared.current_tenant_id());
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
CREATE OR REPLACE FUNCTION shared.current_refresh_token_hash() RETURNS text AS $$
|
|
||||||
SELECT NULLIF(current_setting('papercrate.refresh_token_hash', true), '')
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
ALTER POLICY tenant_user_session_policy ON tenant.user_sessions
|
|
||||||
USING (
|
|
||||||
tenant_id = shared.current_tenant_id()
|
|
||||||
OR (
|
|
||||||
shared.current_refresh_token_hash() IS NOT NULL
|
|
||||||
AND token_hash = shared.current_refresh_token_hash()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER POLICY tenant_user_session_policy ON tenant.user_sessions
|
|
||||||
WITH CHECK (tenant_id = shared.current_tenant_id());
|
|
||||||
|
|
||||||
ALTER POLICY tenant_user_session_policy ON tenant.user_sessions
|
|
||||||
RENAME TO tenant_refresh_token_policy;
|
|
||||||
|
|
||||||
ALTER INDEX tenant.idx_user_sessions_user_id RENAME TO idx_refresh_tokens_user_id;
|
|
||||||
ALTER INDEX tenant.idx_user_sessions_token_hash RENAME TO idx_refresh_tokens_token_hash;
|
|
||||||
ALTER INDEX tenant.user_sessions_tenant_id_idx RENAME TO refresh_tokens_tenant_id_idx;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.user_sessions RENAME TO refresh_tokens;
|
|
||||||
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_user_session_hash();
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
ALTER TABLE tenant.refresh_tokens RENAME TO user_sessions;
|
|
||||||
|
|
||||||
ALTER INDEX tenant.idx_refresh_tokens_user_id RENAME TO idx_user_sessions_user_id;
|
|
||||||
ALTER INDEX tenant.idx_refresh_tokens_token_hash RENAME TO idx_user_sessions_token_hash;
|
|
||||||
ALTER INDEX tenant.refresh_tokens_tenant_id_idx RENAME TO user_sessions_tenant_id_idx;
|
|
||||||
|
|
||||||
ALTER POLICY tenant_refresh_token_policy ON tenant.user_sessions
|
|
||||||
RENAME TO tenant_user_session_policy;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION shared.current_user_session_hash() RETURNS text AS $$
|
|
||||||
SELECT NULLIF(current_setting('papercrate.user_session_hash', true), '')
|
|
||||||
$$ LANGUAGE SQL STABLE;
|
|
||||||
|
|
||||||
ALTER POLICY tenant_user_session_policy ON tenant.user_sessions
|
|
||||||
USING (
|
|
||||||
tenant_id = shared.current_tenant_id()
|
|
||||||
OR (
|
|
||||||
shared.current_user_session_hash() IS NOT NULL
|
|
||||||
AND token_hash = shared.current_user_session_hash()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER POLICY tenant_user_session_policy ON tenant.user_sessions
|
|
||||||
WITH CHECK (tenant_id = shared.current_tenant_id());
|
|
||||||
|
|
||||||
DROP FUNCTION IF EXISTS shared.current_refresh_token_hash();
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
ALTER TABLE tenant.document_tags
|
|
||||||
DROP CONSTRAINT IF EXISTS document_tags_assigned_by_fkey,
|
|
||||||
ADD CONSTRAINT document_tags_assigned_by_fkey
|
|
||||||
FOREIGN KEY (assigned_by)
|
|
||||||
REFERENCES shared.users (id)
|
|
||||||
ON DELETE NO ACTION;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.document_correspondents
|
|
||||||
DROP CONSTRAINT IF EXISTS document_correspondents_assigned_by_fkey,
|
|
||||||
ADD CONSTRAINT document_correspondents_assigned_by_fkey
|
|
||||||
FOREIGN KEY (assigned_by)
|
|
||||||
REFERENCES shared.users (id)
|
|
||||||
ON DELETE NO ACTION;
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
ALTER TABLE tenant.document_tags
|
|
||||||
DROP CONSTRAINT IF EXISTS document_tags_assigned_by_fkey,
|
|
||||||
ADD CONSTRAINT document_tags_assigned_by_fkey
|
|
||||||
FOREIGN KEY (assigned_by)
|
|
||||||
REFERENCES shared.users (id)
|
|
||||||
ON DELETE SET NULL;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.document_correspondents
|
|
||||||
DROP CONSTRAINT IF EXISTS document_correspondents_assigned_by_fkey,
|
|
||||||
ADD CONSTRAINT document_correspondents_assigned_by_fkey
|
|
||||||
FOREIGN KEY (assigned_by)
|
|
||||||
REFERENCES shared.users (id)
|
|
||||||
ON DELETE SET NULL;
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
CREATE TYPE api_token_capability AS ENUM ('api', 'webdav');
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens
|
|
||||||
ADD COLUMN capabilities api_token_capability[] NOT NULL DEFAULT ARRAY[]::api_token_capability[];
|
|
||||||
|
|
||||||
UPDATE tenant.api_tokens t
|
|
||||||
SET capabilities = ARRAY['api']::api_token_capability[]
|
|
||||||
FROM tenant.capability_sets cs
|
|
||||||
WHERE t.capability_set_id = cs.id
|
|
||||||
AND cs.slug = 'owner';
|
|
||||||
|
|
||||||
UPDATE tenant.api_tokens t
|
|
||||||
SET capabilities = ARRAY['webdav']::api_token_capability[]
|
|
||||||
FROM tenant.capability_sets cs
|
|
||||||
WHERE t.capability_set_id = cs.id
|
|
||||||
AND cs.slug = 'webdav'
|
|
||||||
AND (t.capabilities IS NULL OR array_length(t.capabilities, 1) = 0);
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens
|
|
||||||
DROP COLUMN capability_set_id;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.user_memberships
|
|
||||||
DROP COLUMN capability_set_id;
|
|
||||||
|
|
||||||
DROP TABLE IF EXISTS tenant.capability_set_capabilities;
|
|
||||||
DROP TABLE IF EXISTS tenant.capability_sets;
|
|
||||||
|
|
||||||
DROP TYPE IF EXISTS api_capability;
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
CREATE TYPE api_capability AS ENUM (
|
|
||||||
'documents:read',
|
|
||||||
'documents:edit',
|
|
||||||
'documents:write',
|
|
||||||
'documents:upload',
|
|
||||||
'folders:read',
|
|
||||||
'folders:edit',
|
|
||||||
'folders:write',
|
|
||||||
'tags:read',
|
|
||||||
'tags:edit',
|
|
||||||
'tags:write',
|
|
||||||
'correspondents:read',
|
|
||||||
'correspondents:edit',
|
|
||||||
'correspondents:write',
|
|
||||||
'profile:read',
|
|
||||||
'profile:write',
|
|
||||||
'webdav:read',
|
|
||||||
'webdav:write',
|
|
||||||
'capability_sets:read',
|
|
||||||
'capability_sets:write'
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE tenant.capability_sets (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
tenant_id UUID NOT NULL REFERENCES shared.tenants(id) ON DELETE CASCADE,
|
|
||||||
slug TEXT NOT NULL,
|
|
||||||
cap_version INT NOT NULL DEFAULT 1,
|
|
||||||
is_system BOOLEAN NOT NULL DEFAULT FALSE,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
UNIQUE (tenant_id, slug)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE tenant.capability_set_capabilities (
|
|
||||||
capability_set_id UUID NOT NULL REFERENCES tenant.capability_sets(id) ON DELETE CASCADE,
|
|
||||||
capability api_capability NOT NULL,
|
|
||||||
PRIMARY KEY (capability_set_id, capability)
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens
|
|
||||||
ADD COLUMN capability_set_id UUID REFERENCES tenant.capability_sets(id);
|
|
||||||
|
|
||||||
ALTER TABLE tenant.user_memberships
|
|
||||||
ADD COLUMN capability_set_id UUID REFERENCES tenant.capability_sets(id);
|
|
||||||
|
|
||||||
WITH owner_sets AS (
|
|
||||||
INSERT INTO tenant.capability_sets (tenant_id, slug, is_system)
|
|
||||||
SELECT id, 'owner', TRUE
|
|
||||||
FROM shared.tenants
|
|
||||||
RETURNING id, tenant_id
|
|
||||||
),
|
|
||||||
user_sets AS (
|
|
||||||
INSERT INTO tenant.capability_sets (tenant_id, slug, is_system)
|
|
||||||
SELECT id, 'user', TRUE
|
|
||||||
FROM shared.tenants
|
|
||||||
RETURNING id, tenant_id
|
|
||||||
),
|
|
||||||
readonly_sets AS (
|
|
||||||
INSERT INTO tenant.capability_sets (tenant_id, slug, is_system)
|
|
||||||
SELECT id, 'readonly', TRUE
|
|
||||||
FROM shared.tenants
|
|
||||||
RETURNING id, tenant_id
|
|
||||||
),
|
|
||||||
webdav_sets AS (
|
|
||||||
INSERT INTO tenant.capability_sets (tenant_id, slug, is_system)
|
|
||||||
SELECT id, 'webdav', TRUE
|
|
||||||
FROM shared.tenants
|
|
||||||
RETURNING id, tenant_id
|
|
||||||
)
|
|
||||||
INSERT INTO tenant.capability_set_capabilities (capability_set_id, capability)
|
|
||||||
SELECT set_id,
|
|
||||||
capability
|
|
||||||
FROM (
|
|
||||||
SELECT os.id AS set_id,
|
|
||||||
UNNEST(ARRAY[
|
|
||||||
'documents:read'::api_capability,
|
|
||||||
'documents:edit'::api_capability,
|
|
||||||
'documents:write'::api_capability,
|
|
||||||
'documents:upload'::api_capability,
|
|
||||||
'folders:read'::api_capability,
|
|
||||||
'folders:edit'::api_capability,
|
|
||||||
'folders:write'::api_capability,
|
|
||||||
'tags:read'::api_capability,
|
|
||||||
'tags:edit'::api_capability,
|
|
||||||
'tags:write'::api_capability,
|
|
||||||
'correspondents:read'::api_capability,
|
|
||||||
'correspondents:edit'::api_capability,
|
|
||||||
'correspondents:write'::api_capability,
|
|
||||||
'profile:read'::api_capability,
|
|
||||||
'profile:write'::api_capability,
|
|
||||||
'webdav:read'::api_capability,
|
|
||||||
'webdav:write'::api_capability,
|
|
||||||
'capability_sets:read'::api_capability,
|
|
||||||
'capability_sets:write'::api_capability
|
|
||||||
]) AS capability
|
|
||||||
FROM owner_sets os
|
|
||||||
UNION ALL
|
|
||||||
SELECT us.id,
|
|
||||||
UNNEST(ARRAY[
|
|
||||||
'documents:read'::api_capability,
|
|
||||||
'documents:edit'::api_capability,
|
|
||||||
'documents:write'::api_capability,
|
|
||||||
'documents:upload'::api_capability,
|
|
||||||
'folders:read'::api_capability,
|
|
||||||
'folders:edit'::api_capability,
|
|
||||||
'folders:write'::api_capability,
|
|
||||||
'tags:read'::api_capability,
|
|
||||||
'tags:edit'::api_capability,
|
|
||||||
'tags:write'::api_capability,
|
|
||||||
'correspondents:read'::api_capability,
|
|
||||||
'correspondents:edit'::api_capability,
|
|
||||||
'correspondents:write'::api_capability,
|
|
||||||
'profile:read'::api_capability,
|
|
||||||
'profile:write'::api_capability
|
|
||||||
]) AS capability
|
|
||||||
FROM user_sets us
|
|
||||||
UNION ALL
|
|
||||||
SELECT rs.id,
|
|
||||||
UNNEST(ARRAY[
|
|
||||||
'documents:read'::api_capability,
|
|
||||||
'folders:read'::api_capability,
|
|
||||||
'tags:read'::api_capability,
|
|
||||||
'correspondents:read'::api_capability,
|
|
||||||
'webdav:read'::api_capability
|
|
||||||
]) AS capability
|
|
||||||
FROM readonly_sets rs
|
|
||||||
UNION ALL
|
|
||||||
SELECT ws.id,
|
|
||||||
UNNEST(ARRAY['webdav:read'::api_capability]) AS capability
|
|
||||||
FROM webdav_sets ws
|
|
||||||
) seeded;
|
|
||||||
|
|
||||||
UPDATE tenant.user_memberships um
|
|
||||||
SET capability_set_id = cs.id
|
|
||||||
FROM tenant.capability_sets cs
|
|
||||||
WHERE cs.tenant_id = um.tenant_id
|
|
||||||
AND cs.slug = 'owner';
|
|
||||||
|
|
||||||
UPDATE tenant.api_tokens t
|
|
||||||
SET capability_set_id = cs.id
|
|
||||||
FROM tenant.capability_sets cs
|
|
||||||
WHERE cs.tenant_id = t.tenant_id
|
|
||||||
AND cs.slug = 'owner';
|
|
||||||
|
|
||||||
UPDATE tenant.api_tokens t
|
|
||||||
SET capability_set_id = cs.id
|
|
||||||
FROM tenant.capability_sets cs
|
|
||||||
WHERE cs.tenant_id = t.tenant_id
|
|
||||||
AND cs.slug = 'webdav'
|
|
||||||
AND t.capability_set_id IS NULL;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens
|
|
||||||
ALTER COLUMN capability_set_id SET NOT NULL;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.api_tokens
|
|
||||||
DROP COLUMN capabilities;
|
|
||||||
|
|
||||||
DROP TYPE IF EXISTS api_token_capability;
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP INDEX IF EXISTS shared.jobs_purge_document_pending_unique;
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
CREATE UNIQUE INDEX jobs_purge_document_pending_unique
|
|
||||||
ON shared.jobs (
|
|
||||||
tenant_id,
|
|
||||||
((payload ->> 'document_id')::uuid)
|
|
||||||
)
|
|
||||||
WHERE job_type = 'purge-document'
|
|
||||||
AND payload ? 'document_id'
|
|
||||||
AND status IN ('queued', 'processing');
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
DROP INDEX IF EXISTS tenant.idx_documents_tenant_folder_updated_at;
|
|
||||||
DROP INDEX IF EXISTS tenant.idx_documents_tenant_folder_created_at;
|
|
||||||
DROP INDEX IF EXISTS tenant.idx_documents_tenant_folder_issued_at;
|
|
||||||
DROP INDEX IF EXISTS tenant.idx_documents_tenant_folder_title_order;
|
|
||||||
DROP COLLATION IF EXISTS unicode_ci;
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
CREATE COLLATION IF NOT EXISTS unicode_ci
|
|
||||||
(provider = icu, locale = 'und-u-ks-level2');
|
|
||||||
|
|
||||||
CREATE INDEX idx_documents_tenant_folder_title_order
|
|
||||||
ON tenant.documents (
|
|
||||||
tenant_id,
|
|
||||||
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
|
||||||
title COLLATE "unicode_ci"
|
|
||||||
)
|
|
||||||
WHERE deleted_at IS NULL;
|
|
||||||
|
|
||||||
CREATE INDEX idx_documents_tenant_folder_issued_at
|
|
||||||
ON tenant.documents (
|
|
||||||
tenant_id,
|
|
||||||
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
|
||||||
issued_at,
|
|
||||||
title COLLATE "unicode_ci"
|
|
||||||
)
|
|
||||||
WHERE deleted_at IS NULL;
|
|
||||||
|
|
||||||
CREATE INDEX idx_documents_tenant_folder_created_at
|
|
||||||
ON tenant.documents (
|
|
||||||
tenant_id,
|
|
||||||
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
|
||||||
created_at,
|
|
||||||
title COLLATE "unicode_ci"
|
|
||||||
)
|
|
||||||
WHERE deleted_at IS NULL;
|
|
||||||
|
|
||||||
CREATE INDEX idx_documents_tenant_folder_updated_at
|
|
||||||
ON tenant.documents (
|
|
||||||
tenant_id,
|
|
||||||
COALESCE(folder_id, '00000000-0000-0000-0000-000000000000'::uuid),
|
|
||||||
updated_at,
|
|
||||||
title COLLATE "unicode_ci"
|
|
||||||
)
|
|
||||||
WHERE deleted_at IS NULL;
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
ALTER TABLE shared.jobs
|
|
||||||
DROP CONSTRAINT jobs_tenant_id_fkey;
|
|
||||||
|
|
||||||
ALTER TABLE shared.jobs
|
|
||||||
ALTER COLUMN tenant_id SET NOT NULL;
|
|
||||||
|
|
||||||
ALTER TABLE shared.jobs
|
|
||||||
ADD CONSTRAINT jobs_tenant_id_fkey
|
|
||||||
FOREIGN KEY (tenant_id)
|
|
||||||
REFERENCES shared.tenants(id);
|
|
||||||
|
|
||||||
ALTER TABLE shared.jobs
|
|
||||||
DROP COLUMN result;
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
ALTER TABLE shared.jobs
|
|
||||||
ALTER COLUMN tenant_id DROP NOT NULL;
|
|
||||||
|
|
||||||
ALTER TABLE shared.jobs
|
|
||||||
DROP CONSTRAINT jobs_tenant_id_fkey;
|
|
||||||
|
|
||||||
ALTER TABLE shared.jobs
|
|
||||||
ADD CONSTRAINT jobs_tenant_id_fkey
|
|
||||||
FOREIGN KEY (tenant_id)
|
|
||||||
REFERENCES shared.tenants(id)
|
|
||||||
ON DELETE SET NULL;
|
|
||||||
|
|
||||||
ALTER TABLE shared.jobs
|
|
||||||
ADD COLUMN result JSONB;
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-- diesel:run_in_transaction = false
|
|
||||||
|
|
||||||
-- Enum values cannot be removed safely; this down migration intentionally left empty.
|
|
||||||
SELECT 1;
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
-- diesel:run_in_transaction = false
|
|
||||||
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
BEGIN
|
|
||||||
EXECUTE 'ALTER TYPE tenant.api_capability ADD VALUE ''tenants:write''';
|
|
||||||
EXCEPTION
|
|
||||||
WHEN undefined_object THEN
|
|
||||||
BEGIN
|
|
||||||
EXECUTE 'ALTER TYPE api_capability ADD VALUE ''tenants:write''';
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN NULL;
|
|
||||||
END;
|
|
||||||
WHEN duplicate_object THEN NULL;
|
|
||||||
END;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
BEGIN
|
|
||||||
EXECUTE 'ALTER TYPE tenant.api_capability ADD VALUE ''tenants:reset''';
|
|
||||||
EXCEPTION
|
|
||||||
WHEN undefined_object THEN
|
|
||||||
BEGIN
|
|
||||||
EXECUTE 'ALTER TYPE api_capability ADD VALUE ''tenants:reset''';
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN NULL;
|
|
||||||
END;
|
|
||||||
WHEN duplicate_object THEN NULL;
|
|
||||||
END;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
BEGIN
|
|
||||||
EXECUTE 'ALTER TYPE tenant.api_capability ADD VALUE ''tenants:delete''';
|
|
||||||
EXCEPTION
|
|
||||||
WHEN undefined_object THEN
|
|
||||||
BEGIN
|
|
||||||
EXECUTE 'ALTER TYPE api_capability ADD VALUE ''tenants:delete''';
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN NULL;
|
|
||||||
END;
|
|
||||||
WHEN duplicate_object THEN NULL;
|
|
||||||
END;
|
|
||||||
END $$;
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
-- diesel:run_in_transaction = false
|
|
||||||
|
|
||||||
DELETE FROM tenant.capability_set_capabilities
|
|
||||||
WHERE capability IN (
|
|
||||||
'tenants:write'::api_capability,
|
|
||||||
'tenants:reset'::api_capability,
|
|
||||||
'tenants:delete'::api_capability
|
|
||||||
)
|
|
||||||
AND capability_set_id IN (SELECT id FROM tenant.capability_sets WHERE slug = 'owner');
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
-- diesel:run_in_transaction = false
|
|
||||||
|
|
||||||
WITH owner_sets AS (
|
|
||||||
SELECT id FROM tenant.capability_sets WHERE slug = 'owner'
|
|
||||||
)
|
|
||||||
INSERT INTO tenant.capability_set_capabilities (capability_set_id, capability)
|
|
||||||
SELECT id, 'tenants:write'::api_capability FROM owner_sets
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
WITH owner_sets AS (
|
|
||||||
SELECT id FROM tenant.capability_sets WHERE slug = 'owner'
|
|
||||||
)
|
|
||||||
INSERT INTO tenant.capability_set_capabilities (capability_set_id, capability)
|
|
||||||
SELECT id, 'tenants:reset'::api_capability FROM owner_sets
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
WITH owner_sets AS (
|
|
||||||
SELECT id FROM tenant.capability_sets WHERE slug = 'owner'
|
|
||||||
)
|
|
||||||
INSERT INTO tenant.capability_set_capabilities (capability_set_id, capability)
|
|
||||||
SELECT id, 'tenants:delete'::api_capability FROM owner_sets
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
CREATE TABLE tenant.document_asset_objects (
|
|
||||||
id UUID PRIMARY KEY,
|
|
||||||
asset_id UUID NOT NULL REFERENCES tenant.document_assets(id) ON DELETE CASCADE,
|
|
||||||
ordinal INT NOT NULL,
|
|
||||||
s3_key TEXT NOT NULL,
|
|
||||||
metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
tenant_id UUID NOT NULL REFERENCES shared.tenants(id),
|
|
||||||
CONSTRAINT document_asset_objects_ordinal_positive CHECK (ordinal >= 1),
|
|
||||||
CONSTRAINT document_asset_objects_asset_ordinal_unique UNIQUE (asset_id, ordinal)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_document_asset_objects_asset_ordinal
|
|
||||||
ON tenant.document_asset_objects(asset_id, ordinal);
|
|
||||||
|
|
||||||
CREATE INDEX document_asset_objects_tenant_id_idx ON tenant.document_asset_objects(tenant_id);
|
|
||||||
|
|
||||||
ALTER TABLE tenant.document_assets ADD COLUMN cardinality INT;
|
|
||||||
UPDATE tenant.document_assets SET cardinality = 1;
|
|
||||||
|
|
||||||
INSERT INTO tenant.document_asset_objects (id, asset_id, ordinal, s3_key, metadata, tenant_id)
|
|
||||||
SELECT gen_random_uuid(), id, 1, s3_key, metadata, tenant_id
|
|
||||||
FROM tenant.document_assets;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.document_assets DROP COLUMN s3_key;
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
-- Prevent concurrent inserts/updates during backfill.
|
|
||||||
LOCK TABLE tenant.document_asset_objects IN ACCESS EXCLUSIVE MODE;
|
|
||||||
LOCK TABLE tenant.document_assets IN ACCESS EXCLUSIVE MODE;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.document_assets ADD COLUMN s3_key TEXT;
|
|
||||||
|
|
||||||
UPDATE tenant.document_assets AS da
|
|
||||||
SET s3_key = o.s3_key,
|
|
||||||
metadata = COALESCE(da.metadata, '{}'::jsonb) || COALESCE(o.metadata, '{}'::jsonb)
|
|
||||||
FROM tenant.document_asset_objects AS o
|
|
||||||
WHERE o.asset_id = da.id
|
|
||||||
AND o.ordinal = 1;
|
|
||||||
|
|
||||||
DELETE FROM tenant.document_asset_objects WHERE ordinal <> 1;
|
|
||||||
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF EXISTS (SELECT 1 FROM tenant.document_assets WHERE s3_key IS NULL) THEN
|
|
||||||
RAISE EXCEPTION 'cannot drop document_asset_objects: some assets are missing a populated ordinal 1 object (s3_key null)';
|
|
||||||
END IF;
|
|
||||||
END
|
|
||||||
$$;
|
|
||||||
|
|
||||||
ALTER TABLE tenant.document_assets ALTER COLUMN s3_key SET NOT NULL;
|
|
||||||
ALTER TABLE tenant.document_assets DROP COLUMN cardinality;
|
|
||||||
|
|
||||||
DROP TABLE tenant.document_asset_objects;
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
-- Revert column rename.
|
|
||||||
ALTER TABLE tenant.documents
|
|
||||||
RENAME COLUMN mime_type TO content_type;
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
-- Rename document content_type column to mime_type for consistency with API.
|
|
||||||
ALTER TABLE tenant.documents
|
|
||||||
RENAME COLUMN content_type TO mime_type;
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
UPDATE tenant.document_assets
|
|
||||||
SET asset_type = 'ocr-text'
|
|
||||||
WHERE asset_type = 'text-content';
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
UPDATE tenant.document_assets
|
|
||||||
SET asset_type = 'text-content'
|
|
||||||
WHERE asset_type = 'ocr-text';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP INDEX IF EXISTS tenant.idx_documents_title_trgm;
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
CREATE EXTENSION IF NOT EXISTS pg_trgm;
|
|
||||||
|
|
||||||
CREATE INDEX idx_documents_title_trgm
|
|
||||||
ON tenant.documents
|
|
||||||
USING gin (title gin_trgm_ops)
|
|
||||||
WHERE deleted_at IS NULL;
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'papercrate_app') THEN
|
|
||||||
CREATE ROLE papercrate_app NOLOGIN;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'papercrate_app_login') THEN
|
|
||||||
CREATE ROLE papercrate_app_login LOGIN PASSWORD 'papercrate_app';
|
|
||||||
GRANT papercrate_app TO papercrate_app_login;
|
|
||||||
END IF;
|
|
||||||
END
|
|
||||||
$$;
|
|
||||||
|
|
||||||
-- Ensure the login role inherits and uses a sensible search path by default
|
|
||||||
ALTER ROLE papercrate_app_login INHERIT;
|
|
||||||
ALTER ROLE papercrate_app_login SET search_path = 'tenant, shared, public';
|
|
||||||
|
|
||||||
GRANT CONNECT ON DATABASE papercrate TO papercrate_app;
|
|
||||||
GRANT CONNECT ON DATABASE papercrate TO papercrate_app_login;
|
|
||||||
GRANT USAGE ON SCHEMA public TO papercrate_app;
|
|
||||||
GRANT USAGE ON SCHEMA public TO papercrate_app_login;
|
|
||||||
@@ -1,648 +0,0 @@
|
|||||||
months:
|
|
||||||
- name: "january"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "jan"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "janvier"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "janv"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "januar"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "janu\u00e1r"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "hu"
|
|
||||||
- name: "leden"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "sije\u010danj"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "sijecanj"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "stycze\u0144"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "styczen"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "ocak"
|
|
||||||
month: 1
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "february"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "feb"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "f\u00e9vrier"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "fevrier"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "f\u00e9vr"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "fevr"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "februar"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "\u00fanor"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "unor"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "\u00fanora"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "unora"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "velja\u010da"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "veljaca"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "velja\u010de"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "veljace"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "luty"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "\u015fubat"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "subat"
|
|
||||||
month: 2
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "march"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "mar"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "m\u00e4rz"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "maerz"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "mars"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "m\u00e4r"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "marz"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "b\u0159ezen"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "brezen"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "b\u0159ezna"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "brezna"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "o\u017eujak"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "ozujak"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "o\u017eujka"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "ozujka"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "marzec"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "mart"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "sr"
|
|
||||||
- "bs"
|
|
||||||
- name: "m\u00e1rcius"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "hu"
|
|
||||||
- name: "martie"
|
|
||||||
month: 3
|
|
||||||
locales:
|
|
||||||
- "ro"
|
|
||||||
- name: "april"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "apr"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "avril"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "abril"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- "pt"
|
|
||||||
- name: "duben"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "travanj"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "nisan"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "kwiecie\u0144"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "kwiecien"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "aprile"
|
|
||||||
month: 4
|
|
||||||
locales:
|
|
||||||
- "it"
|
|
||||||
- name: "may"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "mai"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- "de"
|
|
||||||
- name: "mayo"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- name: "kv\u011bten"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "kveten"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "kv\u011btna"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "kvetna"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "svibanj"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "maj"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- "bs"
|
|
||||||
- "sr"
|
|
||||||
- "hr"
|
|
||||||
- name: "may\u0131s"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "mayis"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "maggio"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "it"
|
|
||||||
- name: "m\u00e1j"
|
|
||||||
month: 5
|
|
||||||
locales:
|
|
||||||
- "hu"
|
|
||||||
- "sk"
|
|
||||||
- name: "june"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "jun"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- "de"
|
|
||||||
- name: "juin"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "junio"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- name: "juni"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "\u010derven"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "cerven"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "lipanj"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "haziran"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "czerwiec"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "j\u00fanius"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "hu"
|
|
||||||
- name: "giugno"
|
|
||||||
month: 6
|
|
||||||
locales:
|
|
||||||
- "it"
|
|
||||||
- name: "july"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "jul"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- "de"
|
|
||||||
- name: "juillet"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "julio"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- name: "temmuz"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "\u010dervenec"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "cervenec"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "srpanj"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "lipiec"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "luglio"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "it"
|
|
||||||
- name: "j\u00falius"
|
|
||||||
month: 7
|
|
||||||
locales:
|
|
||||||
- "hu"
|
|
||||||
- name: "august"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "aug"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- "de"
|
|
||||||
- name: "ao\u00fbt"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "aout"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "agosto"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- "pt"
|
|
||||||
- "it"
|
|
||||||
- name: "a\u011fustos"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "agustos"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "kolovoz"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "srpen"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "sierpie\u0144"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "sierpien"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "augustus"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "nl"
|
|
||||||
- name: "agost"
|
|
||||||
month: 8
|
|
||||||
locales:
|
|
||||||
- "it"
|
|
||||||
- "ca"
|
|
||||||
- name: "september"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "sept"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- "fr"
|
|
||||||
- name: "sep"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "septembre"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "septiembre"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- name: "eyl\u00fcl"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "eylul"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "z\u00e1\u0159\u00ed"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "zari"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "rujan"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "wrzesie\u0144"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "wrzesien"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "septembrie"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "ro"
|
|
||||||
- name: "settembre"
|
|
||||||
month: 9
|
|
||||||
locales:
|
|
||||||
- "it"
|
|
||||||
- name: "october"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "oct"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "oktober"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "okt\u00f3ber"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "hu"
|
|
||||||
- name: "octobre"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "octubre"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- name: "\u0159\u00edjen"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "rijen"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "pa\u017adziernik"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "pazdziernik"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "ekim"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "octombrie"
|
|
||||||
month: 10
|
|
||||||
locales:
|
|
||||||
- "ro"
|
|
||||||
- name: "november"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "nov"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "novembre"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "noviembre"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "es"
|
|
||||||
- name: "studeni"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "kas\u0131m"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "kasim"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "listopad"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- "cs"
|
|
||||||
- name: "novembro"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "pt"
|
|
||||||
- name: "listopadu"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "noiembrie"
|
|
||||||
month: 11
|
|
||||||
locales:
|
|
||||||
- "ro"
|
|
||||||
- name: "december"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "dec"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "en"
|
|
||||||
- name: "dezember"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "de"
|
|
||||||
- name: "d\u00e9cembre"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "decembre"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "fr"
|
|
||||||
- name: "prosinec"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "cs"
|
|
||||||
- name: "prosinac"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "hr"
|
|
||||||
- name: "grudzie\u0144"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "grudzien"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "grudnia"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "pl"
|
|
||||||
- name: "aral\u0131k"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "aralik"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "tr"
|
|
||||||
- name: "decembrie"
|
|
||||||
month: 12
|
|
||||||
locales:
|
|
||||||
- "ro"
|
|
||||||
@@ -1,324 +0,0 @@
|
|||||||
use argon2::{
|
|
||||||
password_hash::{rand_core::OsRng as PasswordHashOsRng, PasswordHasher, SaltString},
|
|
||||||
Argon2,
|
|
||||||
};
|
|
||||||
use chrono::{NaiveDateTime, Utc};
|
|
||||||
use diesel::prelude::*;
|
|
||||||
use rand::{rngs::OsRng, TryRngCore};
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
auth::capability_sets::{load_capabilities_for_set, load_capability_set},
|
|
||||||
error::AppError,
|
|
||||||
models::{ApiCapability, ApiToken, CapabilitySet, NewApiToken},
|
|
||||||
schema::api_tokens,
|
|
||||||
state::PgPooledConnection,
|
|
||||||
tenants::{apply_api_token_prefix, clear_api_token_prefix},
|
|
||||||
};
|
|
||||||
|
|
||||||
use crate::schema::api_tokens::dsl as api_tokens_dsl;
|
|
||||||
|
|
||||||
const TOKEN_PREFIX_LENGTH: usize = 12;
|
|
||||||
const TOKEN_SECRET_LENGTH: usize = 32;
|
|
||||||
|
|
||||||
/// Represents a newly issued API token and the raw secret that was generated for it.
|
|
||||||
pub struct IssuedApiToken {
|
|
||||||
pub token: String,
|
|
||||||
pub record: ApiToken,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Creates a new API token for the supplied user/tenant combination.
|
|
||||||
pub fn create_api_token(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
user_id: Uuid,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
label: Option<String>,
|
|
||||||
expires_at: Option<NaiveDateTime>,
|
|
||||||
capability_set_id: Uuid,
|
|
||||||
) -> Result<IssuedApiToken, AppError> {
|
|
||||||
let capability_set =
|
|
||||||
validate_capability_set_belongs_to_tenant(conn, capability_set_id, tenant_id)?;
|
|
||||||
|
|
||||||
let raw_secret = generate_secret()?;
|
|
||||||
let token_prefix = raw_secret[..TOKEN_PREFIX_LENGTH].to_string();
|
|
||||||
let token_hash = hash_secret(&raw_secret)?;
|
|
||||||
let new_token = NewApiToken {
|
|
||||||
id: Uuid::new_v4(),
|
|
||||||
user_id,
|
|
||||||
tenant_id,
|
|
||||||
token_prefix,
|
|
||||||
token_hash,
|
|
||||||
label,
|
|
||||||
expires_at,
|
|
||||||
capability_set_id: capability_set.id,
|
|
||||||
};
|
|
||||||
|
|
||||||
let record = diesel::insert_into(api_tokens::table)
|
|
||||||
.values(&new_token)
|
|
||||||
.get_result::<ApiToken>(conn)?;
|
|
||||||
|
|
||||||
Ok(IssuedApiToken {
|
|
||||||
token: raw_secret,
|
|
||||||
record,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Lists API tokens belonging to a user within an optional tenant scope.
|
|
||||||
pub fn list_api_tokens(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
user_id: Uuid,
|
|
||||||
tenant_id: Option<Uuid>,
|
|
||||||
) -> Result<Vec<ApiToken>, AppError> {
|
|
||||||
let mut query = api_tokens::table
|
|
||||||
.filter(api_tokens::user_id.eq(user_id))
|
|
||||||
.into_boxed();
|
|
||||||
|
|
||||||
if let Some(tenant_id) = tenant_id {
|
|
||||||
query = query.filter(api_tokens::tenant_id.eq(tenant_id));
|
|
||||||
}
|
|
||||||
|
|
||||||
let tokens = query
|
|
||||||
.order(api_tokens::created_at.asc())
|
|
||||||
.load::<ApiToken>(conn)?;
|
|
||||||
|
|
||||||
Ok(tokens)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Regenerates the secret value for an API token.
|
|
||||||
pub fn regenerate_api_token(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
token_id: Uuid,
|
|
||||||
user_id: Uuid,
|
|
||||||
tenant_id: Option<Uuid>,
|
|
||||||
) -> Result<IssuedApiToken, AppError> {
|
|
||||||
let record = find_user_token(conn, token_id, user_id, tenant_id)?;
|
|
||||||
|
|
||||||
if record.revoked_at.is_some() {
|
|
||||||
return Err(AppError::bad_request(
|
|
||||||
"cannot regenerate a revoked API token",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
let raw_secret = generate_secret()?;
|
|
||||||
let token_prefix = raw_secret[..TOKEN_PREFIX_LENGTH].to_string();
|
|
||||||
let token_hash = hash_secret(&raw_secret)?;
|
|
||||||
|
|
||||||
let updated = diesel::update(api_tokens::table.find(record.id))
|
|
||||||
.set((
|
|
||||||
api_tokens::token_prefix.eq(&token_prefix),
|
|
||||||
api_tokens::token_hash.eq(&token_hash),
|
|
||||||
api_tokens::last_used_at.eq::<Option<NaiveDateTime>>(None),
|
|
||||||
))
|
|
||||||
.get_result::<ApiToken>(conn)?;
|
|
||||||
|
|
||||||
Ok(IssuedApiToken {
|
|
||||||
token: raw_secret,
|
|
||||||
record: updated,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Attempts to resolve an API token by its secret value while ensuring it provides the
|
|
||||||
/// requested capability.
|
|
||||||
pub fn find_active_token_by_secret(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
tenant_id: Option<Uuid>,
|
|
||||||
secret: &str,
|
|
||||||
required_capability: Option<ApiCapability>,
|
|
||||||
) -> Result<Option<ApiToken>, AppError> {
|
|
||||||
if secret.len() < TOKEN_PREFIX_LENGTH {
|
|
||||||
return Ok(None);
|
|
||||||
}
|
|
||||||
|
|
||||||
let prefix = &secret[..TOKEN_PREFIX_LENGTH];
|
|
||||||
let candidates = with_api_token_prefix(conn, prefix, |conn| {
|
|
||||||
let mut query = api_tokens::table
|
|
||||||
.filter(api_tokens::token_prefix.eq(prefix))
|
|
||||||
.filter(api_tokens::revoked_at.is_null())
|
|
||||||
.into_boxed();
|
|
||||||
|
|
||||||
let now = Utc::now().naive_utc();
|
|
||||||
query = query.filter(
|
|
||||||
api_tokens::expires_at
|
|
||||||
.is_null()
|
|
||||||
.or(api_tokens::expires_at.gt(now)),
|
|
||||||
);
|
|
||||||
|
|
||||||
if let Some(tenant_id) = tenant_id {
|
|
||||||
query = query.filter(api_tokens::tenant_id.eq(tenant_id));
|
|
||||||
}
|
|
||||||
|
|
||||||
query.load::<ApiToken>(conn).map_err(AppError::from)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
for token in candidates {
|
|
||||||
if let Some(required) = required_capability {
|
|
||||||
let capabilities = load_capabilities_for_set(conn, token.capability_set_id)?;
|
|
||||||
if !capabilities.contains(&required) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if verify_token_secret(secret, &token.token_hash)? {
|
|
||||||
return Ok(Some(token));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Revokes an API token belonging to the specified user.
|
|
||||||
pub fn revoke_api_token(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
token_id: Uuid,
|
|
||||||
user_id: Uuid,
|
|
||||||
) -> Result<(), AppError> {
|
|
||||||
let token = find_user_token(conn, token_id, user_id, None)?;
|
|
||||||
|
|
||||||
diesel::update(api_tokens::table.find(token.id))
|
|
||||||
.set(api_tokens::revoked_at.eq(Utc::now().naive_utc()))
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Updates the last-used timestamp for a token.
|
|
||||||
pub fn touch_api_token(conn: &mut PgPooledConnection, token_id: Uuid) -> Result<(), AppError> {
|
|
||||||
diesel::update(api_tokens::table.filter(api_tokens::id.eq(token_id)))
|
|
||||||
.set(api_tokens::last_used_at.eq(Utc::now().naive_utc()))
|
|
||||||
.execute(conn)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Verifies a secret against its stored hash representation.
|
|
||||||
pub fn verify_token_secret(secret: &str, token_hash: &str) -> Result<bool, AppError> {
|
|
||||||
crate::auth::password::verify_password(secret, token_hash).map_err(|err| {
|
|
||||||
tracing::error!(error = ?err, "failed to verify token");
|
|
||||||
AppError::internal("failed to verify token")
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn find_user_token(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
token_id: Uuid,
|
|
||||||
user_id: Uuid,
|
|
||||||
tenant_id: Option<Uuid>,
|
|
||||||
) -> Result<ApiToken, AppError> {
|
|
||||||
let mut query = api_tokens_dsl::api_tokens
|
|
||||||
.filter(api_tokens_dsl::id.eq(token_id))
|
|
||||||
.filter(api_tokens_dsl::user_id.eq(user_id))
|
|
||||||
.into_boxed();
|
|
||||||
|
|
||||||
if let Some(tid) = tenant_id {
|
|
||||||
query = query.filter(api_tokens_dsl::tenant_id.eq(tid));
|
|
||||||
}
|
|
||||||
|
|
||||||
query
|
|
||||||
.first::<ApiToken>(conn)
|
|
||||||
.optional()
|
|
||||||
.map_err(AppError::from)?
|
|
||||||
.ok_or_else(AppError::not_found)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn validate_capability_set_belongs_to_tenant(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
capability_set_id: Uuid,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
) -> Result<CapabilitySet, AppError> {
|
|
||||||
let capability_set = load_capability_set(conn, capability_set_id)?;
|
|
||||||
if capability_set.tenant_id != tenant_id {
|
|
||||||
return Err(AppError::bad_request(
|
|
||||||
"capability set does not belong to the tenant",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(capability_set)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn with_api_token_prefix<T, F>(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
prefix: &str,
|
|
||||||
operation: F,
|
|
||||||
) -> Result<T, AppError>
|
|
||||||
where
|
|
||||||
F: FnOnce(&mut PgPooledConnection) -> Result<T, AppError>,
|
|
||||||
{
|
|
||||||
apply_api_token_prefix(conn, prefix)?;
|
|
||||||
let operation_result = operation(conn);
|
|
||||||
let clear_result = clear_api_token_prefix(conn);
|
|
||||||
|
|
||||||
if let Err(err) = clear_result {
|
|
||||||
return Err(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
operation_result
|
|
||||||
}
|
|
||||||
|
|
||||||
fn generate_secret() -> Result<String, AppError> {
|
|
||||||
let mut buffer = [0u8; TOKEN_SECRET_LENGTH];
|
|
||||||
OsRng.try_fill_bytes(&mut buffer).map_err(|err| {
|
|
||||||
tracing::error!(error = ?err, "failed to generate token");
|
|
||||||
AppError::internal("failed to generate token")
|
|
||||||
})?;
|
|
||||||
Ok(hex::encode(buffer))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn hash_secret(secret: &str) -> Result<String, AppError> {
|
|
||||||
let mut salt_rng = PasswordHashOsRng;
|
|
||||||
let salt = SaltString::generate(&mut salt_rng);
|
|
||||||
let hash = Argon2::default()
|
|
||||||
.hash_password(secret.as_bytes(), &salt)
|
|
||||||
.map_err(|err| {
|
|
||||||
tracing::error!(error = ?err, "failed to hash token");
|
|
||||||
AppError::internal("failed to hash token")
|
|
||||||
})?;
|
|
||||||
Ok(hash.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use crate::auth::capability_sets::{
|
|
||||||
compute_slug, normalize_capabilities, owner_capabilities, webdav_capabilities,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn generated_secret_has_expected_length() {
|
|
||||||
let secret = generate_secret().unwrap();
|
|
||||||
assert_eq!(secret.len(), TOKEN_SECRET_LENGTH * 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn hash_and_verify_secret_round_trip() {
|
|
||||||
let secret = generate_secret().unwrap();
|
|
||||||
let hash = hash_secret(&secret).unwrap();
|
|
||||||
assert!(verify_token_secret(&secret, &hash).unwrap());
|
|
||||||
assert!(!verify_token_secret("wrong", &hash).unwrap());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn normalize_capabilities_deduplicates() {
|
|
||||||
let mut caps = owner_capabilities().to_vec();
|
|
||||||
caps.push(ApiCapability::DocumentsRead);
|
|
||||||
let normalized = normalize_capabilities(caps).unwrap();
|
|
||||||
assert_eq!(normalized.len(), owner_capabilities().len());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn normalize_capabilities_rejects_empty() {
|
|
||||||
assert!(normalize_capabilities(Vec::new()).is_err());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn compute_slug_matches_system_sets() {
|
|
||||||
let owner_slug = compute_slug(owner_capabilities());
|
|
||||||
assert_eq!(owner_slug, "owner");
|
|
||||||
|
|
||||||
let webdav_slug = compute_slug(webdav_capabilities());
|
|
||||||
assert_eq!(webdav_slug, "webdav");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn prefix_length_is_less_than_secret_length() {
|
|
||||||
assert!(TOKEN_PREFIX_LENGTH < TOKEN_SECRET_LENGTH * 2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,120 +0,0 @@
|
|||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use axum::{
|
|
||||||
http::{Request, StatusCode},
|
|
||||||
response::IntoResponse,
|
|
||||||
};
|
|
||||||
use tower::{Layer, Service};
|
|
||||||
|
|
||||||
use crate::{auth::AuthenticatedUser, error::AppError, models::ApiCapability};
|
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
|
||||||
pub enum CapabilityStrategy {
|
|
||||||
All,
|
|
||||||
Any,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct RequireCapabilitiesLayer {
|
|
||||||
required: Arc<Vec<ApiCapability>>,
|
|
||||||
strategy: CapabilityStrategy,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl RequireCapabilitiesLayer {
|
|
||||||
pub fn all<I>(caps: I) -> Self
|
|
||||||
where
|
|
||||||
I: IntoIterator<Item = ApiCapability>,
|
|
||||||
{
|
|
||||||
Self {
|
|
||||||
required: Arc::new(caps.into_iter().collect()),
|
|
||||||
strategy: CapabilityStrategy::All,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn any<I>(caps: I) -> Self
|
|
||||||
where
|
|
||||||
I: IntoIterator<Item = ApiCapability>,
|
|
||||||
{
|
|
||||||
Self {
|
|
||||||
required: Arc::new(caps.into_iter().collect()),
|
|
||||||
strategy: CapabilityStrategy::Any,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<S> Layer<S> for RequireCapabilitiesLayer {
|
|
||||||
type Service = RequireCapabilities<S>;
|
|
||||||
|
|
||||||
fn layer(&self, inner: S) -> Self::Service {
|
|
||||||
RequireCapabilities {
|
|
||||||
inner,
|
|
||||||
required: Arc::clone(&self.required),
|
|
||||||
strategy: self.strategy,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct RequireCapabilities<S> {
|
|
||||||
inner: S,
|
|
||||||
required: Arc<Vec<ApiCapability>>,
|
|
||||||
strategy: CapabilityStrategy,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<S, B> Service<Request<B>> for RequireCapabilities<S>
|
|
||||||
where
|
|
||||||
S: Service<Request<B>, Response = axum::response::Response> + Send,
|
|
||||||
S::Future: Send + 'static,
|
|
||||||
B: Send + 'static,
|
|
||||||
{
|
|
||||||
type Response = S::Response;
|
|
||||||
type Error = S::Error;
|
|
||||||
type Future = std::pin::Pin<
|
|
||||||
Box<dyn std::future::Future<Output = Result<Self::Response, Self::Error>> + Send>,
|
|
||||||
>;
|
|
||||||
|
|
||||||
fn poll_ready(
|
|
||||||
&mut self,
|
|
||||||
cx: &mut std::task::Context<'_>,
|
|
||||||
) -> std::task::Poll<Result<(), Self::Error>> {
|
|
||||||
self.inner.poll_ready(cx)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn call(&mut self, req: Request<B>) -> Self::Future {
|
|
||||||
if self.required.is_empty() {
|
|
||||||
let fut = self.inner.call(req);
|
|
||||||
return Box::pin(async move { fut.await });
|
|
||||||
}
|
|
||||||
|
|
||||||
let (parts, body) = req.into_parts();
|
|
||||||
let user = match parts.extensions.get::<AuthenticatedUser>() {
|
|
||||||
Some(user) => user,
|
|
||||||
None => {
|
|
||||||
let response = AppError::unauthorized().into_response();
|
|
||||||
return Box::pin(async move { Ok(response) });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let allowed = match self.strategy {
|
|
||||||
CapabilityStrategy::All => self
|
|
||||||
.required
|
|
||||||
.iter()
|
|
||||||
.all(|cap| user.capabilities.contains(cap)),
|
|
||||||
CapabilityStrategy::Any => self
|
|
||||||
.required
|
|
||||||
.iter()
|
|
||||||
.any(|cap| user.capabilities.contains(cap)),
|
|
||||||
};
|
|
||||||
|
|
||||||
if !allowed {
|
|
||||||
let response = AppError::new(StatusCode::FORBIDDEN, "missing required capability")
|
|
||||||
.with_code("missing_capability")
|
|
||||||
.into_response();
|
|
||||||
return Box::pin(async move { Ok(response) });
|
|
||||||
}
|
|
||||||
|
|
||||||
let req = Request::from_parts(parts, body);
|
|
||||||
let fut = self.inner.call(req);
|
|
||||||
Box::pin(async move { fut.await })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,323 +0,0 @@
|
|||||||
use chrono::Utc;
|
|
||||||
use diesel::{pg::Pg, prelude::*, Connection};
|
|
||||||
use sha2::{Digest, Sha256};
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
error::AppError,
|
|
||||||
models::{ApiCapability, CapabilitySet, NewCapabilitySet, NewCapabilitySetCapability},
|
|
||||||
schema::{
|
|
||||||
capability_set_capabilities, capability_set_capabilities::dsl as csc_dsl, capability_sets,
|
|
||||||
capability_sets::dsl as cs_dsl,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const OWNER_CAPABILITIES: [ApiCapability; 22] = [
|
|
||||||
ApiCapability::CorrespondentsEdit,
|
|
||||||
ApiCapability::CorrespondentsRead,
|
|
||||||
ApiCapability::CorrespondentsWrite,
|
|
||||||
ApiCapability::DocumentsEdit,
|
|
||||||
ApiCapability::DocumentsRead,
|
|
||||||
ApiCapability::DocumentsUpload,
|
|
||||||
ApiCapability::DocumentsWrite,
|
|
||||||
ApiCapability::FoldersEdit,
|
|
||||||
ApiCapability::FoldersRead,
|
|
||||||
ApiCapability::FoldersWrite,
|
|
||||||
ApiCapability::ProfileRead,
|
|
||||||
ApiCapability::ProfileWrite,
|
|
||||||
ApiCapability::TagsEdit,
|
|
||||||
ApiCapability::TagsRead,
|
|
||||||
ApiCapability::TagsWrite,
|
|
||||||
ApiCapability::WebdavRead,
|
|
||||||
ApiCapability::WebdavWrite,
|
|
||||||
ApiCapability::CapabilitySetsRead,
|
|
||||||
ApiCapability::CapabilitySetsWrite,
|
|
||||||
ApiCapability::TenantsWrite,
|
|
||||||
ApiCapability::TenantsReset,
|
|
||||||
ApiCapability::TenantsDelete,
|
|
||||||
];
|
|
||||||
|
|
||||||
const USER_CAPABILITIES: [ApiCapability; 16] = [
|
|
||||||
ApiCapability::CorrespondentsEdit,
|
|
||||||
ApiCapability::CorrespondentsRead,
|
|
||||||
ApiCapability::CorrespondentsWrite,
|
|
||||||
ApiCapability::DocumentsEdit,
|
|
||||||
ApiCapability::DocumentsRead,
|
|
||||||
ApiCapability::DocumentsUpload,
|
|
||||||
ApiCapability::DocumentsWrite,
|
|
||||||
ApiCapability::FoldersEdit,
|
|
||||||
ApiCapability::FoldersRead,
|
|
||||||
ApiCapability::FoldersWrite,
|
|
||||||
ApiCapability::ProfileRead,
|
|
||||||
ApiCapability::ProfileWrite,
|
|
||||||
ApiCapability::TagsEdit,
|
|
||||||
ApiCapability::TagsRead,
|
|
||||||
ApiCapability::TagsWrite,
|
|
||||||
ApiCapability::WebdavRead,
|
|
||||||
];
|
|
||||||
|
|
||||||
const READONLY_CAPABILITIES: [ApiCapability; 5] = [
|
|
||||||
ApiCapability::CorrespondentsRead,
|
|
||||||
ApiCapability::DocumentsRead,
|
|
||||||
ApiCapability::FoldersRead,
|
|
||||||
ApiCapability::TagsRead,
|
|
||||||
ApiCapability::WebdavRead,
|
|
||||||
];
|
|
||||||
|
|
||||||
const WEBDAV_CAPABILITIES: [ApiCapability; 1] = [ApiCapability::WebdavRead];
|
|
||||||
|
|
||||||
pub fn owner_capabilities() -> &'static [ApiCapability] {
|
|
||||||
&OWNER_CAPABILITIES
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn user_capabilities() -> &'static [ApiCapability] {
|
|
||||||
&USER_CAPABILITIES
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn readonly_capabilities() -> &'static [ApiCapability] {
|
|
||||||
&READONLY_CAPABILITIES
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn webdav_capabilities() -> &'static [ApiCapability] {
|
|
||||||
&WEBDAV_CAPABILITIES
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_system_slug(slug: &str) -> bool {
|
|
||||||
matches!(slug, "owner" | "user" | "readonly" | "webdav")
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn create_capability_set<C>(
|
|
||||||
conn: &mut C,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
slug: &str,
|
|
||||||
capabilities: Vec<ApiCapability>,
|
|
||||||
) -> Result<CapabilitySet, AppError>
|
|
||||||
where
|
|
||||||
C: Connection<Backend = Pg> + diesel::connection::LoadConnection,
|
|
||||||
{
|
|
||||||
let normalized = normalize_capabilities(capabilities)?;
|
|
||||||
|
|
||||||
conn.transaction::<CapabilitySet, AppError, _>(|conn| {
|
|
||||||
if cs_dsl::capability_sets
|
|
||||||
.filter(cs_dsl::tenant_id.eq(tenant_id))
|
|
||||||
.filter(cs_dsl::slug.eq(slug))
|
|
||||||
.first::<CapabilitySet>(conn)
|
|
||||||
.optional()
|
|
||||||
.map_err(AppError::from)?
|
|
||||||
.is_some()
|
|
||||||
{
|
|
||||||
return Err(AppError::conflict("capability set slug already exists"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let set = NewCapabilitySet {
|
|
||||||
id: Uuid::new_v4(),
|
|
||||||
tenant_id,
|
|
||||||
slug: slug.to_owned(),
|
|
||||||
cap_version: 1,
|
|
||||||
is_system: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
diesel::insert_into(capability_sets::table)
|
|
||||||
.values(&set)
|
|
||||||
.execute(conn)
|
|
||||||
.map_err(AppError::from)?;
|
|
||||||
|
|
||||||
persist_capabilities(conn, set.id, &normalized)?;
|
|
||||||
|
|
||||||
capability_sets::table
|
|
||||||
.find(set.id)
|
|
||||||
.first::<CapabilitySet>(conn)
|
|
||||||
.map_err(AppError::from)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn normalize_capabilities(
|
|
||||||
mut capabilities: Vec<ApiCapability>,
|
|
||||||
) -> Result<Vec<ApiCapability>, AppError> {
|
|
||||||
if capabilities.is_empty() {
|
|
||||||
return Err(AppError::bad_request("at least one capability is required"));
|
|
||||||
}
|
|
||||||
|
|
||||||
capabilities.sort_by(|a, b| a.as_str().cmp(b.as_str()));
|
|
||||||
capabilities.dedup();
|
|
||||||
Ok(capabilities)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn load_capabilities_for_set<C>(
|
|
||||||
conn: &mut C,
|
|
||||||
capability_set_id: Uuid,
|
|
||||||
) -> Result<Vec<ApiCapability>, AppError>
|
|
||||||
where
|
|
||||||
C: Connection<Backend = Pg> + diesel::connection::LoadConnection,
|
|
||||||
{
|
|
||||||
let mut capabilities: Vec<ApiCapability> = csc_dsl::capability_set_capabilities
|
|
||||||
.filter(csc_dsl::capability_set_id.eq(capability_set_id))
|
|
||||||
.select(csc_dsl::capability)
|
|
||||||
.load(conn)
|
|
||||||
.map_err(AppError::from)?;
|
|
||||||
|
|
||||||
capabilities.sort_by(|a, b| a.as_str().cmp(b.as_str()));
|
|
||||||
Ok(capabilities)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn ensure_capability_set<C>(
|
|
||||||
conn: &mut C,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
capabilities: &[ApiCapability],
|
|
||||||
) -> Result<CapabilitySet, AppError>
|
|
||||||
where
|
|
||||||
C: Connection<Backend = Pg> + diesel::connection::LoadConnection,
|
|
||||||
{
|
|
||||||
if capabilities.is_empty() {
|
|
||||||
return Err(AppError::bad_request("at least one capability is required"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let slug = compute_slug(capabilities);
|
|
||||||
conn.transaction::<CapabilitySet, AppError, _>(|conn| {
|
|
||||||
if let Some(existing) = cs_dsl::capability_sets
|
|
||||||
.filter(cs_dsl::tenant_id.eq(tenant_id))
|
|
||||||
.filter(cs_dsl::slug.eq(&slug))
|
|
||||||
.first::<CapabilitySet>(conn)
|
|
||||||
.optional()
|
|
||||||
.map_err(AppError::from)?
|
|
||||||
{
|
|
||||||
ensure_capability_membership(conn, &existing, capabilities)?;
|
|
||||||
return Ok(existing);
|
|
||||||
}
|
|
||||||
|
|
||||||
let set = NewCapabilitySet {
|
|
||||||
id: Uuid::new_v4(),
|
|
||||||
tenant_id,
|
|
||||||
slug: slug.clone(),
|
|
||||||
cap_version: 1,
|
|
||||||
is_system: matches!(slug.as_str(), "owner" | "user" | "readonly" | "webdav"),
|
|
||||||
};
|
|
||||||
|
|
||||||
diesel::insert_into(capability_sets::table)
|
|
||||||
.values(&set)
|
|
||||||
.execute(conn)
|
|
||||||
.map_err(AppError::from)?;
|
|
||||||
|
|
||||||
persist_capabilities(conn, set.id, capabilities)?;
|
|
||||||
|
|
||||||
Ok(capability_sets::table
|
|
||||||
.find(set.id)
|
|
||||||
.first::<CapabilitySet>(conn)
|
|
||||||
.map_err(AppError::from)?)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn refresh_capability_set<C>(
|
|
||||||
conn: &mut C,
|
|
||||||
set: &CapabilitySet,
|
|
||||||
capabilities: &[ApiCapability],
|
|
||||||
) -> Result<CapabilitySet, AppError>
|
|
||||||
where
|
|
||||||
C: Connection<Backend = Pg> + diesel::connection::LoadConnection,
|
|
||||||
{
|
|
||||||
conn.transaction::<CapabilitySet, AppError, _>(|conn| {
|
|
||||||
diesel::delete(
|
|
||||||
csc_dsl::capability_set_capabilities.filter(csc_dsl::capability_set_id.eq(set.id)),
|
|
||||||
)
|
|
||||||
.execute(conn)
|
|
||||||
.map_err(AppError::from)?;
|
|
||||||
|
|
||||||
persist_capabilities(conn, set.id, capabilities)?;
|
|
||||||
|
|
||||||
diesel::update(capability_sets::table.find(set.id))
|
|
||||||
.set((
|
|
||||||
cs_dsl::cap_version.eq(set.cap_version + 1),
|
|
||||||
cs_dsl::updated_at.eq(Utc::now().naive_utc()),
|
|
||||||
))
|
|
||||||
.execute(conn)
|
|
||||||
.map_err(AppError::from)?;
|
|
||||||
|
|
||||||
capability_sets::table
|
|
||||||
.find(set.id)
|
|
||||||
.first::<CapabilitySet>(conn)
|
|
||||||
.map_err(AppError::from)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn load_capability_set<C>(conn: &mut C, id: Uuid) -> Result<CapabilitySet, AppError>
|
|
||||||
where
|
|
||||||
C: Connection<Backend = Pg> + diesel::connection::LoadConnection,
|
|
||||||
{
|
|
||||||
capability_sets::table
|
|
||||||
.find(id)
|
|
||||||
.first::<CapabilitySet>(conn)
|
|
||||||
.map_err(AppError::from)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn compute_slug(capabilities: &[ApiCapability]) -> String {
|
|
||||||
if capabilities == owner_capabilities() {
|
|
||||||
return "owner".to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
if capabilities == user_capabilities() {
|
|
||||||
return "user".to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
if capabilities == readonly_capabilities() {
|
|
||||||
return "readonly".to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
if capabilities == webdav_capabilities() {
|
|
||||||
return "webdav".to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
let joined = capabilities
|
|
||||||
.iter()
|
|
||||||
.map(|cap| cap.as_str())
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.join(",");
|
|
||||||
|
|
||||||
let digest = Sha256::digest(joined.as_bytes());
|
|
||||||
let hex = hex::encode(digest);
|
|
||||||
format!("caps-{}", &hex[..12])
|
|
||||||
}
|
|
||||||
|
|
||||||
fn ensure_capability_membership<C>(
|
|
||||||
conn: &mut C,
|
|
||||||
set: &CapabilitySet,
|
|
||||||
desired: &[ApiCapability],
|
|
||||||
) -> Result<(), AppError>
|
|
||||||
where
|
|
||||||
C: Connection<Backend = Pg> + diesel::connection::LoadConnection,
|
|
||||||
{
|
|
||||||
let current = load_capabilities_for_set(conn, set.id)?;
|
|
||||||
if current == desired {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
let _ = refresh_capability_set(conn, set, desired)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn persist_capabilities<C>(
|
|
||||||
conn: &mut C,
|
|
||||||
set_id: Uuid,
|
|
||||||
capabilities: &[ApiCapability],
|
|
||||||
) -> Result<(), AppError>
|
|
||||||
where
|
|
||||||
C: Connection<Backend = Pg> + diesel::connection::LoadConnection,
|
|
||||||
{
|
|
||||||
if capabilities.is_empty() {
|
|
||||||
return Err(AppError::bad_request("at least one capability is required"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let records: Vec<NewCapabilitySetCapability> = capabilities
|
|
||||||
.iter()
|
|
||||||
.map(|cap| NewCapabilitySetCapability {
|
|
||||||
capability_set_id: set_id,
|
|
||||||
capability: *cap,
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
diesel::insert_into(capability_set_capabilities::table)
|
|
||||||
.values(&records)
|
|
||||||
.execute(conn)
|
|
||||||
.map_err(AppError::from)?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
+9
-157
@@ -2,29 +2,10 @@ use anyhow::Result;
|
|||||||
use chrono::{Duration, Utc};
|
use chrono::{Duration, Utc};
|
||||||
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
|
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use utoipa::ToSchema;
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::config::AppConfig;
|
use crate::config::AppConfig;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, ToSchema)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum PrincipalKind {
|
|
||||||
UserSession,
|
|
||||||
ApiToken,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct AccessTokenContext {
|
|
||||||
pub user_id: Uuid,
|
|
||||||
pub tenant_id: Uuid,
|
|
||||||
pub username: String,
|
|
||||||
pub principal_kind: PrincipalKind,
|
|
||||||
pub principal_id: Uuid,
|
|
||||||
pub capability_set_id: Uuid,
|
|
||||||
pub cap_version: i32,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct JwtService {
|
pub struct JwtService {
|
||||||
encoding: EncodingKey,
|
encoding: EncodingKey,
|
||||||
@@ -34,42 +15,28 @@ pub struct JwtService {
|
|||||||
expiry: Duration,
|
expiry: Duration,
|
||||||
download_audience: String,
|
download_audience: String,
|
||||||
download_expiry: Duration,
|
download_expiry: Duration,
|
||||||
selector_audience: String,
|
|
||||||
selector_expiry: Duration,
|
|
||||||
signup_audience: String,
|
|
||||||
signup_expiry: Duration,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl JwtService {
|
impl JwtService {
|
||||||
pub fn from_config(config: &AppConfig) -> Result<Self> {
|
pub fn from_config(config: &AppConfig) -> Result<Self> {
|
||||||
let access_expiry = Duration::minutes(config.jwt_expiry_minutes);
|
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
encoding: EncodingKey::from_secret(config.jwt_secret.as_bytes()),
|
encoding: EncodingKey::from_secret(config.jwt_secret.as_bytes()),
|
||||||
decoding: DecodingKey::from_secret(config.jwt_secret.as_bytes()),
|
decoding: DecodingKey::from_secret(config.jwt_secret.as_bytes()),
|
||||||
issuer: config.jwt_issuer.clone(),
|
issuer: config.jwt_issuer.clone(),
|
||||||
audience: config.jwt_audience.clone(),
|
audience: config.jwt_audience.clone(),
|
||||||
expiry: access_expiry,
|
expiry: Duration::minutes(config.jwt_expiry_minutes),
|
||||||
download_audience: config.download_token_audience.clone(),
|
download_audience: config.download_token_audience.clone(),
|
||||||
download_expiry: Duration::minutes(config.download_token_expiry_minutes),
|
download_expiry: Duration::minutes(config.download_token_expiry_minutes),
|
||||||
selector_audience: format!("{}:tenant-selector", config.jwt_audience),
|
|
||||||
selector_expiry: access_expiry,
|
|
||||||
signup_audience: format!("{}:signup", config.jwt_audience),
|
|
||||||
signup_expiry: Duration::minutes(15),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn generate_token(&self, context: AccessTokenContext) -> Result<String> {
|
pub fn generate_token(&self, user_id: Uuid, username: &str, role: &str) -> Result<String> {
|
||||||
let now = Utc::now();
|
let now = Utc::now();
|
||||||
let exp = now + self.expiry;
|
let exp = now + self.expiry;
|
||||||
let claims = Claims {
|
let claims = Claims {
|
||||||
sub: context.user_id,
|
sub: user_id,
|
||||||
tenant_id: context.tenant_id,
|
username: username.to_owned(),
|
||||||
username: context.username,
|
role: role.to_owned(),
|
||||||
principal_kind: context.principal_kind,
|
|
||||||
principal_id: context.principal_id,
|
|
||||||
capability_set_id: context.capability_set_id,
|
|
||||||
cap_version: context.cap_version,
|
|
||||||
iss: self.issuer.clone(),
|
iss: self.issuer.clone(),
|
||||||
aud: self.audience.clone(),
|
aud: self.audience.clone(),
|
||||||
iat: now.timestamp() as usize,
|
iat: now.timestamp() as usize,
|
||||||
@@ -87,43 +54,12 @@ impl JwtService {
|
|||||||
Ok(data.claims)
|
Ok(data.claims)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn generate_download_token(
|
pub fn generate_download_token(&self, document_id: Uuid, user_id: Uuid) -> Result<String> {
|
||||||
&self,
|
|
||||||
document_id: Uuid,
|
|
||||||
version_id: Uuid,
|
|
||||||
user_id: Uuid,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
) -> Result<String> {
|
|
||||||
let now = Utc::now();
|
let now = Utc::now();
|
||||||
let exp = now + self.download_expiry;
|
let exp = now + self.download_expiry;
|
||||||
let claims = DownloadClaims {
|
let claims = DownloadClaims {
|
||||||
subject: DownloadSubject::Document {
|
doc_id: document_id,
|
||||||
doc_id: document_id,
|
|
||||||
version_id,
|
|
||||||
},
|
|
||||||
user_id,
|
user_id,
|
||||||
tenant_id,
|
|
||||||
iss: self.issuer.clone(),
|
|
||||||
aud: self.download_audience.clone(),
|
|
||||||
iat: now.timestamp() as usize,
|
|
||||||
exp: exp.timestamp() as usize,
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(encode(&Header::default(), &claims, &self.encoding)?)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn generate_asset_download_token(
|
|
||||||
&self,
|
|
||||||
asset_id: Uuid,
|
|
||||||
user_id: Uuid,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
) -> Result<String> {
|
|
||||||
let now = Utc::now();
|
|
||||||
let exp = now + self.download_expiry;
|
|
||||||
let claims = DownloadClaims {
|
|
||||||
subject: DownloadSubject::Asset { asset_id },
|
|
||||||
user_id,
|
|
||||||
tenant_id,
|
|
||||||
iss: self.issuer.clone(),
|
iss: self.issuer.clone(),
|
||||||
aud: self.download_audience.clone(),
|
aud: self.download_audience.clone(),
|
||||||
iat: now.timestamp() as usize,
|
iat: now.timestamp() as usize,
|
||||||
@@ -140,107 +76,23 @@ impl JwtService {
|
|||||||
let data = decode::<DownloadClaims>(token, &self.decoding, &validation)?;
|
let data = decode::<DownloadClaims>(token, &self.decoding, &validation)?;
|
||||||
Ok(data.claims)
|
Ok(data.claims)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn generate_tenant_selector_token(&self, user_id: Uuid) -> Result<String> {
|
|
||||||
let now = Utc::now();
|
|
||||||
let exp = now + self.selector_expiry;
|
|
||||||
let claims = TenantSelectionClaims {
|
|
||||||
sub: user_id,
|
|
||||||
iss: self.issuer.clone(),
|
|
||||||
aud: self.selector_audience.clone(),
|
|
||||||
iat: now.timestamp() as usize,
|
|
||||||
exp: exp.timestamp() as usize,
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(encode(&Header::default(), &claims, &self.encoding)?)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn verify_tenant_selector_token(&self, token: &str) -> Result<TenantSelectionClaims> {
|
|
||||||
let mut validation = Validation::default();
|
|
||||||
validation.set_audience(&[self.selector_audience.clone()]);
|
|
||||||
validation.set_issuer(&[self.issuer.clone()]);
|
|
||||||
let data = decode::<TenantSelectionClaims>(token, &self.decoding, &validation)?;
|
|
||||||
Ok(data.claims)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn generate_signup_token(
|
|
||||||
&self,
|
|
||||||
user_id: Uuid,
|
|
||||||
challenge_id: Uuid,
|
|
||||||
username: String,
|
|
||||||
) -> Result<String> {
|
|
||||||
let now = Utc::now();
|
|
||||||
let exp = now + self.signup_expiry;
|
|
||||||
let claims = SignupClaims {
|
|
||||||
sub: user_id,
|
|
||||||
challenge_id,
|
|
||||||
username,
|
|
||||||
iss: self.issuer.clone(),
|
|
||||||
aud: self.signup_audience.clone(),
|
|
||||||
iat: now.timestamp() as usize,
|
|
||||||
exp: exp.timestamp() as usize,
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(encode(&Header::default(), &claims, &self.encoding)?)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn verify_signup_token(&self, token: &str) -> Result<SignupClaims> {
|
|
||||||
let mut validation = Validation::default();
|
|
||||||
validation.set_audience(&[self.signup_audience.clone()]);
|
|
||||||
validation.set_issuer(&[self.issuer.clone()]);
|
|
||||||
let data = decode::<SignupClaims>(token, &self.decoding, &validation)?;
|
|
||||||
Ok(data.claims)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct Claims {
|
pub struct Claims {
|
||||||
pub sub: Uuid,
|
pub sub: Uuid,
|
||||||
pub tenant_id: Uuid,
|
|
||||||
pub username: String,
|
pub username: String,
|
||||||
pub principal_kind: PrincipalKind,
|
pub role: String,
|
||||||
pub principal_id: Uuid,
|
|
||||||
pub capability_set_id: Uuid,
|
|
||||||
pub cap_version: i32,
|
|
||||||
pub iss: String,
|
pub iss: String,
|
||||||
pub aud: String,
|
pub aud: String,
|
||||||
pub iat: usize,
|
pub iat: usize,
|
||||||
pub exp: usize,
|
pub exp: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
#[serde(tag = "scope", rename_all = "snake_case")]
|
|
||||||
pub enum DownloadSubject {
|
|
||||||
Document { doc_id: Uuid, version_id: Uuid },
|
|
||||||
Asset { asset_id: Uuid },
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct DownloadClaims {
|
pub struct DownloadClaims {
|
||||||
#[serde(flatten)]
|
pub doc_id: Uuid,
|
||||||
pub subject: DownloadSubject,
|
|
||||||
pub user_id: Uuid,
|
pub user_id: Uuid,
|
||||||
pub tenant_id: Uuid,
|
|
||||||
pub iss: String,
|
|
||||||
pub aud: String,
|
|
||||||
pub iat: usize,
|
|
||||||
pub exp: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct TenantSelectionClaims {
|
|
||||||
pub sub: Uuid,
|
|
||||||
pub iss: String,
|
|
||||||
pub aud: String,
|
|
||||||
pub iat: usize,
|
|
||||||
pub exp: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct SignupClaims {
|
|
||||||
pub sub: Uuid,
|
|
||||||
pub challenge_id: Uuid,
|
|
||||||
pub username: String,
|
|
||||||
pub iss: String,
|
pub iss: String,
|
||||||
pub aud: String,
|
pub aud: String,
|
||||||
pub iat: usize,
|
pub iat: usize,
|
||||||
|
|||||||
+20
-199
@@ -1,221 +1,42 @@
|
|||||||
pub mod api_tokens;
|
|
||||||
pub mod capability_guard;
|
|
||||||
pub mod capability_sets;
|
|
||||||
pub mod jwt;
|
pub mod jwt;
|
||||||
pub mod passkeys;
|
|
||||||
pub mod password;
|
pub mod password;
|
||||||
|
|
||||||
use std::sync::{Arc, Mutex};
|
use axum::{async_trait, extract::FromRequestParts, http::request::Parts};
|
||||||
|
|
||||||
use axum::{
|
|
||||||
extract::FromRequestParts,
|
|
||||||
http::{request::Parts, StatusCode},
|
|
||||||
};
|
|
||||||
use axum_extra::headers::{authorization::Bearer, Authorization};
|
use axum_extra::headers::{authorization::Bearer, Authorization};
|
||||||
use axum_extra::TypedHeader;
|
use axum_extra::TypedHeader;
|
||||||
use diesel::{pg::PgConnection, prelude::*};
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use utoipa::ToSchema;
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{error::AppError, state::AppState};
|
||||||
auth::capability_sets::{load_capabilities_for_set, load_capability_set},
|
|
||||||
error::{AppError, AppResult},
|
|
||||||
models::{ApiCapability, TenantStatus},
|
|
||||||
schema::tenants::dsl as tenant_dsl,
|
|
||||||
state::{AppState, PgPooledConnection},
|
|
||||||
};
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::auth::jwt::PrincipalKind;
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct TenantMembershipUser {
|
|
||||||
pub user_id: Uuid,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FromRequestParts<AppState> for TenantMembershipUser {
|
|
||||||
type Rejection = AppError;
|
|
||||||
|
|
||||||
#[allow(refining_impl_trait)]
|
|
||||||
fn from_request_parts<'a>(
|
|
||||||
parts: &'a mut Parts,
|
|
||||||
state: &AppState,
|
|
||||||
) -> impl std::future::Future<Output = Result<Self, Self::Rejection>> + Send + 'a {
|
|
||||||
let state = state.clone();
|
|
||||||
async move {
|
|
||||||
let TypedHeader(Authorization(bearer)) =
|
|
||||||
TypedHeader::<Authorization<Bearer>>::from_request_parts(parts, &state)
|
|
||||||
.await
|
|
||||||
.map_err(|_| AppError::unauthorized())?;
|
|
||||||
|
|
||||||
if let Ok(claims) = state.jwt.verify_token(bearer.token()) {
|
|
||||||
return Ok(Self {
|
|
||||||
user_id: claims.sub,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let selector = state
|
|
||||||
.jwt
|
|
||||||
.verify_tenant_selector_token(bearer.token())
|
|
||||||
.map_err(|_| AppError::unauthorized())?;
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
user_id: selector.sub,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct TenantConnectionHolder {
|
|
||||||
inner: Arc<Mutex<Option<PgPooledConnection>>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TenantConnectionHolder {
|
|
||||||
pub fn new(conn: PgPooledConnection) -> Self {
|
|
||||||
Self {
|
|
||||||
inner: Arc::new(Mutex::new(Some(conn))),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn into_conn(self) -> Option<PgPooledConnection> {
|
|
||||||
self.inner.lock().ok()?.take()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
||||||
pub struct AuthenticatedUser {
|
pub struct AuthenticatedUser {
|
||||||
pub user_id: uuid::Uuid,
|
pub user_id: uuid::Uuid,
|
||||||
pub username: String,
|
pub username: String,
|
||||||
pub tenant_id: uuid::Uuid,
|
pub role: String,
|
||||||
pub principal_kind: PrincipalKind,
|
|
||||||
pub principal_id: Uuid,
|
|
||||||
pub capability_set_id: Uuid,
|
|
||||||
pub cap_version: i32,
|
|
||||||
pub capabilities: Vec<ApiCapability>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
impl FromRequestParts<AppState> for AuthenticatedUser {
|
impl FromRequestParts<AppState> for AuthenticatedUser {
|
||||||
type Rejection = AppError;
|
type Rejection = AppError;
|
||||||
|
|
||||||
#[allow(refining_impl_trait)]
|
async fn from_request_parts(
|
||||||
fn from_request_parts<'a>(
|
parts: &mut Parts,
|
||||||
parts: &'a mut Parts,
|
|
||||||
state: &AppState,
|
state: &AppState,
|
||||||
) -> impl std::future::Future<Output = Result<Self, Self::Rejection>> + Send + 'a {
|
) -> Result<Self, Self::Rejection> {
|
||||||
let state = state.clone();
|
let TypedHeader(Authorization(bearer)) =
|
||||||
async move {
|
TypedHeader::<Authorization<Bearer>>::from_request_parts(parts, state)
|
||||||
if let Some(user) = parts.extensions.get::<AuthenticatedUser>() {
|
.await
|
||||||
return Ok(user.clone());
|
|
||||||
}
|
|
||||||
|
|
||||||
let TypedHeader(Authorization(bearer)) =
|
|
||||||
TypedHeader::<Authorization<Bearer>>::from_request_parts(parts, &state)
|
|
||||||
.await
|
|
||||||
.map_err(|_| AppError::unauthorized())?;
|
|
||||||
|
|
||||||
let claims = state
|
|
||||||
.jwt
|
|
||||||
.verify_token(bearer.token())
|
|
||||||
.map_err(|_| AppError::unauthorized())?;
|
.map_err(|_| AppError::unauthorized())?;
|
||||||
|
|
||||||
let mut tenant_conn = state.db_for_tenant(claims.tenant_id)?;
|
let claims = state
|
||||||
let capability_set = load_capability_set(&mut tenant_conn, claims.capability_set_id)
|
.jwt
|
||||||
.map_err(|_| AppError::unauthorized())?;
|
.verify_token(bearer.token())
|
||||||
|
.map_err(|_| AppError::unauthorized())?;
|
||||||
|
|
||||||
if capability_set.cap_version != claims.cap_version {
|
Ok(AuthenticatedUser {
|
||||||
return Err(AppError::unauthorized());
|
user_id: claims.sub,
|
||||||
}
|
username: claims.username,
|
||||||
|
role: claims.role,
|
||||||
let capabilities = load_capabilities_for_set(&mut tenant_conn, capability_set.id)
|
})
|
||||||
.map_err(|_| AppError::unauthorized())?;
|
|
||||||
|
|
||||||
let user = AuthenticatedUser {
|
|
||||||
user_id: claims.sub,
|
|
||||||
username: claims.username,
|
|
||||||
tenant_id: claims.tenant_id,
|
|
||||||
principal_kind: claims.principal_kind,
|
|
||||||
principal_id: claims.principal_id,
|
|
||||||
capability_set_id: claims.capability_set_id,
|
|
||||||
cap_version: claims.cap_version,
|
|
||||||
capabilities,
|
|
||||||
};
|
|
||||||
|
|
||||||
parts.extensions.insert(user.clone());
|
|
||||||
parts
|
|
||||||
.extensions
|
|
||||||
.insert(TenantConnectionHolder::new(tenant_conn));
|
|
||||||
|
|
||||||
Ok(user)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct TenantScopedConn {
|
|
||||||
pub conn: PgPooledConnection,
|
|
||||||
pub tenant_id: Uuid,
|
|
||||||
pub user_id: Uuid,
|
|
||||||
pub user: AuthenticatedUser,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TenantScopedConn {
|
|
||||||
pub fn conn(&mut self) -> &mut PgPooledConnection {
|
|
||||||
&mut self.conn
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FromRequestParts<AppState> for TenantScopedConn {
|
|
||||||
type Rejection = AppError;
|
|
||||||
|
|
||||||
#[allow(refining_impl_trait)]
|
|
||||||
fn from_request_parts<'a>(
|
|
||||||
parts: &'a mut Parts,
|
|
||||||
state: &AppState,
|
|
||||||
) -> impl std::future::Future<Output = Result<Self, Self::Rejection>> + Send + 'a {
|
|
||||||
let state = state.clone();
|
|
||||||
async move {
|
|
||||||
let user = AuthenticatedUser::from_request_parts(parts, &state).await?;
|
|
||||||
let tenant_id = user.tenant_id;
|
|
||||||
let mut conn = if let Some(holder) = parts.extensions.remove::<TenantConnectionHolder>()
|
|
||||||
{
|
|
||||||
holder
|
|
||||||
.into_conn()
|
|
||||||
.ok_or_else(|| AppError::internal("tenant connection unavailable"))?
|
|
||||||
} else {
|
|
||||||
state.db_for_tenant(tenant_id)?
|
|
||||||
};
|
|
||||||
|
|
||||||
ensure_active_tenant_with_conn(&mut conn, tenant_id)?;
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
conn,
|
|
||||||
tenant_id,
|
|
||||||
user_id: user.user_id,
|
|
||||||
user,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn ensure_active_tenant(state: &AppState, tenant_id: Uuid) -> AppResult<()> {
|
|
||||||
let mut conn = state.db_unscoped()?;
|
|
||||||
ensure_active_tenant_with_conn(&mut conn, tenant_id)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn ensure_active_tenant_with_conn(
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
) -> AppResult<()> {
|
|
||||||
use tenant_dsl::tenants;
|
|
||||||
|
|
||||||
let status: TenantStatus = tenants
|
|
||||||
.find(tenant_id)
|
|
||||||
.select(tenant_dsl::status)
|
|
||||||
.first(conn)?;
|
|
||||||
|
|
||||||
if status != TenantStatus::Active {
|
|
||||||
return Err(AppError::new(StatusCode::FORBIDDEN, "tenant is not active"));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,592 +0,0 @@
|
|||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use chrono::{Duration as ChronoDuration, NaiveDateTime, Utc};
|
|
||||||
use diesel::{dsl::count_star, prelude::*};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use utoipa::ToSchema;
|
|
||||||
use uuid::Uuid;
|
|
||||||
use webauthn_rs::prelude::{Credential, *};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
config::AppConfig,
|
|
||||||
error::{AppError, AppResult},
|
|
||||||
models::{NewUserPasskey, NewWebauthnChallenge, User, UserPasskey, WebauthnChallenge},
|
|
||||||
schema::{user_passkeys::dsl as passkey_dsl, webauthn_challenges::dsl as challenge_dsl},
|
|
||||||
};
|
|
||||||
|
|
||||||
const PURPOSE_REGISTRATION: &str = "registration";
|
|
||||||
const PURPOSE_AUTHENTICATION: &str = "authentication";
|
|
||||||
const DEFAULT_CHALLENGE_TTL_MINUTES: i64 = 10;
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct PasskeyService {
|
|
||||||
webauthn: Arc<Webauthn>,
|
|
||||||
challenge_ttl: ChronoDuration,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct PreparedPasskey {
|
|
||||||
pub id: Uuid,
|
|
||||||
pub credential_id: Vec<u8>,
|
|
||||||
pub public_key: Vec<u8>,
|
|
||||||
pub credential: serde_json::Value,
|
|
||||||
pub sign_count: i64,
|
|
||||||
pub transports: Vec<Option<String>>,
|
|
||||||
pub aaguid: Option<Uuid>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PreparedPasskey {
|
|
||||||
pub fn into_new_user_passkey(self, user_id: Uuid, nickname: Option<String>) -> NewUserPasskey {
|
|
||||||
NewUserPasskey {
|
|
||||||
id: self.id,
|
|
||||||
user_id,
|
|
||||||
credential_id: self.credential_id,
|
|
||||||
public_key: self.public_key,
|
|
||||||
credential: self.credential,
|
|
||||||
sign_count: self.sign_count,
|
|
||||||
transports: self.transports,
|
|
||||||
aaguid: self.aaguid,
|
|
||||||
nickname,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct RegistrationChallengeResponse {
|
|
||||||
pub challenge_id: Uuid,
|
|
||||||
#[serde(flatten)]
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub challenge: CreationChallengeResponse,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct AuthenticationChallengeResponse {
|
|
||||||
pub challenge_id: Uuid,
|
|
||||||
#[serde(flatten)]
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub challenge: RequestChallengeResponse,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct PasskeySummary {
|
|
||||||
pub id: Uuid,
|
|
||||||
pub nickname: Option<String>,
|
|
||||||
pub created_at: NaiveDateTime,
|
|
||||||
pub last_used_at: Option<NaiveDateTime>,
|
|
||||||
pub transports: Vec<String>,
|
|
||||||
pub revoked_at: Option<NaiveDateTime>,
|
|
||||||
pub revoked_reason: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PasskeyService {
|
|
||||||
pub fn try_new(config: &AppConfig) -> Result<Option<Self>> {
|
|
||||||
let rp_id = match config.webauthn_rp_id.as_deref().map(str::trim) {
|
|
||||||
Some(rp_id) if !rp_id.is_empty() => rp_id,
|
|
||||||
_ => return Ok(None),
|
|
||||||
};
|
|
||||||
let rp_origin = match config.webauthn_origin.as_ref().map(|s| s.trim()) {
|
|
||||||
Some(origin) if !origin.is_empty() => origin,
|
|
||||||
_ => return Ok(None),
|
|
||||||
};
|
|
||||||
|
|
||||||
let origin = Url::parse(rp_origin).context("invalid webauthn_origin")?;
|
|
||||||
|
|
||||||
let builder = WebauthnBuilder::new(rp_id, &origin)
|
|
||||||
.context("failed to initialise WebAuthn builder")?
|
|
||||||
.rp_name(&config.webauthn_rp_name)
|
|
||||||
.allow_subdomains(false)
|
|
||||||
.allow_any_port(false);
|
|
||||||
|
|
||||||
let webauthn = builder
|
|
||||||
.build()
|
|
||||||
.context("failed to build WebAuthn instance")?;
|
|
||||||
|
|
||||||
Ok(Some(Self {
|
|
||||||
webauthn: Arc::new(webauthn),
|
|
||||||
challenge_ttl: ChronoDuration::minutes(DEFAULT_CHALLENGE_TTL_MINUTES),
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn prune_expired(&self, conn: &mut PgConnection) {
|
|
||||||
let now = Utc::now().naive_utc();
|
|
||||||
let _ = diesel::delete(
|
|
||||||
challenge_dsl::webauthn_challenges.filter(challenge_dsl::expires_at.le(now)),
|
|
||||||
)
|
|
||||||
.execute(conn);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn begin_registration(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
user_id: Uuid,
|
|
||||||
username: &str,
|
|
||||||
challenge_user_id: Option<Uuid>,
|
|
||||||
exclude: Option<Vec<CredentialID>>,
|
|
||||||
) -> AppResult<RegistrationChallengeResponse> {
|
|
||||||
self.prune_expired(conn);
|
|
||||||
|
|
||||||
let (challenge, state) = self
|
|
||||||
.webauthn
|
|
||||||
.start_passkey_registration(user_id, username, username, exclude)
|
|
||||||
.map_err(|err| {
|
|
||||||
tracing::error!(error = %err, "failed to start passkey registration");
|
|
||||||
AppError::internal("failed to start passkey registration")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let challenge_id = Uuid::new_v4();
|
|
||||||
let expires_at = (Utc::now() + self.challenge_ttl).naive_utc();
|
|
||||||
let challenge_bytes: Vec<u8> = challenge.public_key.challenge.clone().into();
|
|
||||||
let state_bytes = serde_json::to_vec(&state)
|
|
||||||
.context("failed to encode passkey registration state")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
let record = NewWebauthnChallenge {
|
|
||||||
id: challenge_id,
|
|
||||||
user_id: challenge_user_id,
|
|
||||||
purpose: PURPOSE_REGISTRATION.to_string(),
|
|
||||||
challenge: challenge_bytes,
|
|
||||||
state: state_bytes,
|
|
||||||
expires_at,
|
|
||||||
};
|
|
||||||
|
|
||||||
diesel::insert_into(challenge_dsl::webauthn_challenges)
|
|
||||||
.values(&record)
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
Ok(RegistrationChallengeResponse {
|
|
||||||
challenge_id,
|
|
||||||
challenge,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn start_registration(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
user: &User,
|
|
||||||
) -> AppResult<RegistrationChallengeResponse> {
|
|
||||||
let existing: Vec<UserPasskey> = passkey_dsl::user_passkeys
|
|
||||||
.filter(passkey_dsl::user_id.eq(user.id))
|
|
||||||
.filter(passkey_dsl::revoked_at.is_null())
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
let exclude = if existing.is_empty() {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some(
|
|
||||||
existing
|
|
||||||
.iter()
|
|
||||||
.map(|pk| CredentialID::from(pk.credential_id.clone()))
|
|
||||||
.collect(),
|
|
||||||
)
|
|
||||||
};
|
|
||||||
|
|
||||||
self.begin_registration(conn, user.id, &user.username, Some(user.id), exclude)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn start_signup_registration(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
user_id: Uuid,
|
|
||||||
username: &str,
|
|
||||||
) -> AppResult<RegistrationChallengeResponse> {
|
|
||||||
self.begin_registration(conn, user_id, username, None, None)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn complete_registration(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
challenge_id: Uuid,
|
|
||||||
credential: &RegisterPublicKeyCredential,
|
|
||||||
expected_user: Option<Uuid>,
|
|
||||||
) -> AppResult<PreparedPasskey> {
|
|
||||||
let record: WebauthnChallenge = challenge_dsl::webauthn_challenges
|
|
||||||
.find(challenge_id)
|
|
||||||
.first(conn)
|
|
||||||
.map_err(|err| {
|
|
||||||
if matches!(err, diesel::result::Error::NotFound) {
|
|
||||||
AppError::bad_request("challenge not found")
|
|
||||||
} else {
|
|
||||||
AppError::from(err)
|
|
||||||
}
|
|
||||||
})?;
|
|
||||||
|
|
||||||
if record.purpose != PURPOSE_REGISTRATION {
|
|
||||||
return Err(AppError::bad_request("challenge is not for registration"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(expected) = expected_user {
|
|
||||||
if record.user_id != Some(expected) {
|
|
||||||
return Err(AppError::unauthorized());
|
|
||||||
}
|
|
||||||
} else if record.user_id.is_some() {
|
|
||||||
return Err(AppError::bad_request(
|
|
||||||
"unexpected user context for signup registration",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
if record.expires_at < Utc::now().naive_utc() {
|
|
||||||
diesel::delete(challenge_dsl::webauthn_challenges.find(challenge_id)).execute(conn)?;
|
|
||||||
return Err(AppError::bad_request("challenge expired"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let state: PasskeyRegistration = serde_json::from_slice(&record.state)
|
|
||||||
.context("failed to decode registration state")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
let passkey = self
|
|
||||||
.webauthn
|
|
||||||
.finish_passkey_registration(credential, &state)
|
|
||||||
.map_err(|err| {
|
|
||||||
tracing::warn!(error = %err, "passkey registration validation failed");
|
|
||||||
AppError::bad_request("invalid passkey attestation")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let credential_struct: Credential = passkey.clone().into();
|
|
||||||
let credential_id_vec: Vec<u8> = credential_struct.cred_id.clone().into();
|
|
||||||
|
|
||||||
let duplicate = passkey_dsl::user_passkeys
|
|
||||||
.filter(passkey_dsl::credential_id.eq(&credential_id_vec))
|
|
||||||
.first::<UserPasskey>(conn)
|
|
||||||
.optional()?;
|
|
||||||
if duplicate.is_some() {
|
|
||||||
diesel::delete(challenge_dsl::webauthn_challenges.find(challenge_id)).execute(conn)?;
|
|
||||||
return Err(AppError::conflict("credential already registered"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let public_key_bytes = serde_cbor_2::to_vec(&credential_struct.cred)
|
|
||||||
.context("failed to encode credential public key")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
let transports: Vec<Option<String>> = credential_struct
|
|
||||||
.transports
|
|
||||||
.clone()
|
|
||||||
.unwrap_or_default()
|
|
||||||
.into_iter()
|
|
||||||
.map(|transport| Some(transport.as_ref().to_string()))
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let aaguid = match credential_struct.attestation.metadata {
|
|
||||||
AttestationMetadata::Packed { aaguid } | AttestationMetadata::Tpm { aaguid, .. } => {
|
|
||||||
Some(aaguid)
|
|
||||||
}
|
|
||||||
_ => None,
|
|
||||||
};
|
|
||||||
|
|
||||||
let credential_json = serde_json::to_value(&passkey)
|
|
||||||
.context("failed to serialise passkey")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
diesel::delete(challenge_dsl::webauthn_challenges.find(challenge_id)).execute(conn)?;
|
|
||||||
|
|
||||||
Ok(PreparedPasskey {
|
|
||||||
id: Uuid::new_v4(),
|
|
||||||
credential_id: credential_id_vec,
|
|
||||||
public_key: public_key_bytes,
|
|
||||||
credential: credential_json,
|
|
||||||
sign_count: credential_struct.counter as i64,
|
|
||||||
transports,
|
|
||||||
aaguid,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn finish_registration(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
user: &User,
|
|
||||||
challenge_id: Uuid,
|
|
||||||
credential: RegisterPublicKeyCredential,
|
|
||||||
nickname: Option<String>,
|
|
||||||
) -> AppResult<UserPasskey> {
|
|
||||||
let prepared =
|
|
||||||
self.complete_registration(conn, challenge_id, &credential, Some(user.id))?;
|
|
||||||
|
|
||||||
let new_passkey = prepared.into_new_user_passkey(user.id, nickname);
|
|
||||||
|
|
||||||
diesel::insert_into(passkey_dsl::user_passkeys)
|
|
||||||
.values(&new_passkey)
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
let created: UserPasskey = passkey_dsl::user_passkeys
|
|
||||||
.find(new_passkey.id)
|
|
||||||
.select(UserPasskey::as_select())
|
|
||||||
.first(conn)?;
|
|
||||||
|
|
||||||
Ok(created)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn start_authentication(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
user: &User,
|
|
||||||
) -> AppResult<AuthenticationChallengeResponse> {
|
|
||||||
self.prune_expired(conn);
|
|
||||||
|
|
||||||
let stored: Vec<UserPasskey> = passkey_dsl::user_passkeys
|
|
||||||
.filter(passkey_dsl::user_id.eq(user.id))
|
|
||||||
.filter(passkey_dsl::revoked_at.is_null())
|
|
||||||
.select(UserPasskey::as_select())
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
if stored.is_empty() {
|
|
||||||
return Err(AppError::bad_request("no passkeys registered"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut passkeys = Vec::with_capacity(stored.len());
|
|
||||||
for pk in &stored {
|
|
||||||
let passkey: Passkey = serde_json::from_value(pk.credential.clone())
|
|
||||||
.context("failed to parse stored passkey")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
passkeys.push(passkey);
|
|
||||||
}
|
|
||||||
|
|
||||||
let (challenge, state) = self
|
|
||||||
.webauthn
|
|
||||||
.start_passkey_authentication(&passkeys)
|
|
||||||
.map_err(|err| {
|
|
||||||
tracing::error!(error = %err, "failed to start passkey authentication");
|
|
||||||
AppError::internal("failed to start passkey authentication")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let challenge_id = Uuid::new_v4();
|
|
||||||
let expires_at = (Utc::now() + self.challenge_ttl).naive_utc();
|
|
||||||
let challenge_bytes: Vec<u8> = challenge.public_key.challenge.clone().into();
|
|
||||||
let state_bytes = serde_json::to_vec(&state)
|
|
||||||
.context("failed to encode authentication state")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
let record = NewWebauthnChallenge {
|
|
||||||
id: challenge_id,
|
|
||||||
user_id: Some(user.id),
|
|
||||||
purpose: PURPOSE_AUTHENTICATION.to_string(),
|
|
||||||
challenge: challenge_bytes,
|
|
||||||
state: state_bytes,
|
|
||||||
expires_at,
|
|
||||||
};
|
|
||||||
|
|
||||||
diesel::insert_into(challenge_dsl::webauthn_challenges)
|
|
||||||
.values(&record)
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
Ok(AuthenticationChallengeResponse {
|
|
||||||
challenge_id,
|
|
||||||
challenge,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn list_for_user(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
user_id: Uuid,
|
|
||||||
) -> AppResult<Vec<PasskeySummary>> {
|
|
||||||
let passkeys: Vec<UserPasskey> = passkey_dsl::user_passkeys
|
|
||||||
.filter(passkey_dsl::user_id.eq(user_id))
|
|
||||||
.order(passkey_dsl::created_at.asc())
|
|
||||||
.select(UserPasskey::as_select())
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
Ok(passkeys.into_iter().map(PasskeySummary::from).collect())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn active_passkey_count(&self, conn: &mut PgConnection, user_id: Uuid) -> AppResult<i64> {
|
|
||||||
let count: i64 = passkey_dsl::user_passkeys
|
|
||||||
.filter(passkey_dsl::user_id.eq(user_id))
|
|
||||||
.filter(passkey_dsl::revoked_at.is_null())
|
|
||||||
.select(count_star())
|
|
||||||
.first(conn)?;
|
|
||||||
Ok(count)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn consume_signup_challenge(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
challenge_id: Uuid,
|
|
||||||
credential: &RegisterPublicKeyCredential,
|
|
||||||
) -> AppResult<PreparedPasskey> {
|
|
||||||
self.complete_registration(conn, challenge_id, credential, None)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn revoke_passkey(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
user_id: Uuid,
|
|
||||||
passkey_id: Uuid,
|
|
||||||
reason: Option<String>,
|
|
||||||
) -> AppResult<()> {
|
|
||||||
let now = Utc::now().naive_utc();
|
|
||||||
let updated = diesel::update(
|
|
||||||
passkey_dsl::user_passkeys
|
|
||||||
.filter(passkey_dsl::id.eq(passkey_id))
|
|
||||||
.filter(passkey_dsl::user_id.eq(user_id))
|
|
||||||
.filter(passkey_dsl::revoked_at.is_null()),
|
|
||||||
)
|
|
||||||
.set((
|
|
||||||
passkey_dsl::revoked_at.eq(Some(now)),
|
|
||||||
passkey_dsl::revoked_reason.eq(reason),
|
|
||||||
passkey_dsl::updated_at.eq(now),
|
|
||||||
))
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
if updated == 0 {
|
|
||||||
return Err(AppError::not_found());
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn finish_authentication(
|
|
||||||
&self,
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
challenge_id: Uuid,
|
|
||||||
credential: PublicKeyCredential,
|
|
||||||
) -> AppResult<(User, UserPasskey, AuthenticationResult)> {
|
|
||||||
let record: WebauthnChallenge = challenge_dsl::webauthn_challenges
|
|
||||||
.find(challenge_id)
|
|
||||||
.first(conn)
|
|
||||||
.map_err(|err| {
|
|
||||||
if matches!(err, diesel::result::Error::NotFound) {
|
|
||||||
AppError::bad_request("challenge not found")
|
|
||||||
} else {
|
|
||||||
AppError::from(err)
|
|
||||||
}
|
|
||||||
})?;
|
|
||||||
|
|
||||||
if record.purpose != PURPOSE_AUTHENTICATION {
|
|
||||||
return Err(AppError::bad_request("challenge is not for authentication"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let user_id = record
|
|
||||||
.user_id
|
|
||||||
.ok_or_else(|| AppError::bad_request("challenge missing user context"))?;
|
|
||||||
|
|
||||||
if record.expires_at < Utc::now().naive_utc() {
|
|
||||||
diesel::delete(challenge_dsl::webauthn_challenges.find(challenge_id)).execute(conn)?;
|
|
||||||
return Err(AppError::bad_request("challenge expired"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let state: PasskeyAuthentication = serde_json::from_slice(&record.state)
|
|
||||||
.context("failed to decode authentication state")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
let auth_result = self
|
|
||||||
.webauthn
|
|
||||||
.finish_passkey_authentication(&credential, &state)
|
|
||||||
.map_err(|err| {
|
|
||||||
tracing::warn!(error = %err, "passkey authentication failed");
|
|
||||||
AppError::unauthorized()
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let credential_id_vec: Vec<u8> = auth_result.cred_id().clone().into();
|
|
||||||
|
|
||||||
let mut passkey: UserPasskey = passkey_dsl::user_passkeys
|
|
||||||
.filter(passkey_dsl::user_id.eq(user_id))
|
|
||||||
.filter(passkey_dsl::credential_id.eq(&credential_id_vec))
|
|
||||||
.filter(passkey_dsl::revoked_at.is_null())
|
|
||||||
.select(UserPasskey::as_select())
|
|
||||||
.first(conn)
|
|
||||||
.map_err(|err| {
|
|
||||||
if matches!(err, diesel::result::Error::NotFound) {
|
|
||||||
AppError::unauthorized()
|
|
||||||
} else {
|
|
||||||
AppError::from(err)
|
|
||||||
}
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let mut passkey_model: Passkey = serde_json::from_value(passkey.credential.clone())
|
|
||||||
.context("failed to parse stored passkey")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
if auth_result.needs_update() {
|
|
||||||
let _ = passkey_model.update_credential(&auth_result);
|
|
||||||
}
|
|
||||||
|
|
||||||
let credential_struct: Credential = passkey_model.clone().into();
|
|
||||||
let public_key_bytes = serde_cbor_2::to_vec(&credential_struct.cred)
|
|
||||||
.context("failed to encode credential public key")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
let transports: Vec<Option<String>> = credential_struct
|
|
||||||
.transports
|
|
||||||
.clone()
|
|
||||||
.unwrap_or_default()
|
|
||||||
.into_iter()
|
|
||||||
.map(|transport| Some(transport.as_ref().to_string()))
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let credential_json = serde_json::to_value(&passkey_model)
|
|
||||||
.context("failed to serialise passkey")
|
|
||||||
.map_err(AppError::internal)?;
|
|
||||||
|
|
||||||
let now = Utc::now().naive_utc();
|
|
||||||
diesel::update(passkey_dsl::user_passkeys.find(passkey.id))
|
|
||||||
.set((
|
|
||||||
passkey_dsl::sign_count.eq(auth_result.counter() as i64),
|
|
||||||
passkey_dsl::transports.eq(&transports),
|
|
||||||
passkey_dsl::credential.eq(credential_json.clone()),
|
|
||||||
passkey_dsl::public_key.eq(public_key_bytes),
|
|
||||||
passkey_dsl::last_used_at.eq(Some(now)),
|
|
||||||
passkey_dsl::updated_at.eq(now),
|
|
||||||
))
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
passkey.sign_count = auth_result.counter() as i64;
|
|
||||||
passkey.transports = transports;
|
|
||||||
passkey.credential = credential_json;
|
|
||||||
passkey.last_used_at = Some(now);
|
|
||||||
passkey.updated_at = now;
|
|
||||||
|
|
||||||
diesel::delete(challenge_dsl::webauthn_challenges.find(challenge_id)).execute(conn)?;
|
|
||||||
|
|
||||||
let user = crate::schema::users::table
|
|
||||||
.find(user_id)
|
|
||||||
.first::<User>(conn)?;
|
|
||||||
|
|
||||||
Ok((user, passkey, auth_result))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<UserPasskey> for PasskeySummary {
|
|
||||||
fn from(passkey: UserPasskey) -> Self {
|
|
||||||
let transports = passkey
|
|
||||||
.transports
|
|
||||||
.into_iter()
|
|
||||||
.filter_map(|value| value)
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
Self {
|
|
||||||
id: passkey.id,
|
|
||||||
nickname: passkey.nickname,
|
|
||||||
created_at: passkey.created_at,
|
|
||||||
last_used_at: passkey.last_used_at,
|
|
||||||
transports,
|
|
||||||
revoked_at: passkey.revoked_at,
|
|
||||||
revoked_reason: passkey.revoked_reason,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct PasskeyRegistrationFinishPayload {
|
|
||||||
pub challenge_id: Uuid,
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub credential: RegisterPublicKeyCredential,
|
|
||||||
#[serde(default)]
|
|
||||||
pub nickname: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct PasskeyLoginStartPayload {
|
|
||||||
pub username: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct PasskeyLoginFinishPayload {
|
|
||||||
pub challenge_id: Uuid,
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub credential: PublicKeyCredential,
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,6 @@
|
|||||||
use anyhow::{anyhow, Result};
|
use anyhow::{anyhow, Result};
|
||||||
use argon2::{
|
use argon2::{
|
||||||
password_hash::{
|
password_hash::{PasswordHash, PasswordVerifier},
|
||||||
rand_core::OsRng as PasswordHashOsRng, PasswordHash, PasswordHasher, PasswordVerifier,
|
|
||||||
SaltString,
|
|
||||||
},
|
|
||||||
Argon2,
|
Argon2,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -13,12 +10,3 @@ pub fn verify_password(password: &str, password_hash: &str) -> Result<bool> {
|
|||||||
.verify_password(password.as_bytes(), &parsed_hash)
|
.verify_password(password.as_bytes(), &parsed_hash)
|
||||||
.is_ok())
|
.is_ok())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn hash_password(password: &str) -> Result<String> {
|
|
||||||
let mut rng = PasswordHashOsRng;
|
|
||||||
let salt = SaltString::generate(&mut rng);
|
|
||||||
let hash = Argon2::default()
|
|
||||||
.hash_password(password.as_bytes(), &salt)
|
|
||||||
.map_err(|err| anyhow!(err))?;
|
|
||||||
Ok(hash.to_string())
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,888 +0,0 @@
|
|||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use anyhow::{anyhow, bail, Context, Result};
|
|
||||||
use chrono::{Duration as ChronoDuration, Utc};
|
|
||||||
use clap::{Parser, Subcommand, ValueEnum};
|
|
||||||
use diesel::{dsl::exists, pg::PgConnection, prelude::*, select};
|
|
||||||
use diesel_migrations::MigrationHarness;
|
|
||||||
use rand::{rngs::OsRng, TryRngCore};
|
|
||||||
use reqwest::{Client, Method, StatusCode};
|
|
||||||
use sha2::{Digest, Sha256};
|
|
||||||
use tokio::task;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use papercrate::{
|
|
||||||
auth::capability_sets::{ensure_capability_set, owner_capabilities},
|
|
||||||
config::{redact_database_url, AppConfig},
|
|
||||||
db::{self, PgPool},
|
|
||||||
documents::search::ensure_quickwit_index,
|
|
||||||
jobs::{enqueue_job, JOB_ANALYZE_DOCUMENT, JOB_DELETE_TENANT},
|
|
||||||
migrations::MIGRATIONS,
|
|
||||||
models::{
|
|
||||||
DocumentAsset, MagicToken, MagicTokenKind, NewUser, NewUserMembership, Tenant,
|
|
||||||
TenantStatus, User,
|
|
||||||
},
|
|
||||||
s3,
|
|
||||||
schema::{document_assets, documents, magic_tokens, tenants, user_memberships, users},
|
|
||||||
storage::{ObjectStorage, S3Storage, TenantStorage},
|
|
||||||
tenants::{apply_tenant_guc, clear_tenant_context, TenantService},
|
|
||||||
utils::{text::normalize_identifier, tracing::init_tracing},
|
|
||||||
workers::tenants::{build_delete_proof_message, sign_delete_proof, DeleteAction},
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Parser)]
|
|
||||||
#[command(
|
|
||||||
name = "papercrate-admin",
|
|
||||||
version,
|
|
||||||
about = "Papercrate administration utility"
|
|
||||||
)]
|
|
||||||
struct Cli {
|
|
||||||
#[command(subcommand)]
|
|
||||||
command: Command,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Subcommand)]
|
|
||||||
enum Command {
|
|
||||||
CreateUser {
|
|
||||||
username: String,
|
|
||||||
},
|
|
||||||
ListUsers,
|
|
||||||
DeleteUser {
|
|
||||||
username: String,
|
|
||||||
},
|
|
||||||
CreateTenant {
|
|
||||||
name: String,
|
|
||||||
#[arg(long = "storage-root")]
|
|
||||||
storage_root: Option<String>,
|
|
||||||
#[arg(long = "quickwit-index")]
|
|
||||||
quickwit_index: Option<String>,
|
|
||||||
},
|
|
||||||
DeleteTenant {
|
|
||||||
tenant_id: Uuid,
|
|
||||||
#[arg(long = "tenant-name")]
|
|
||||||
tenant_name: String,
|
|
||||||
},
|
|
||||||
ResetTenant {
|
|
||||||
tenant_id: Uuid,
|
|
||||||
#[arg(long = "tenant-name")]
|
|
||||||
tenant_name: String,
|
|
||||||
#[arg(long = "final-status", value_enum, default_value_t = TenantFinalStatusArg::Active)]
|
|
||||||
final_status: TenantFinalStatusArg,
|
|
||||||
},
|
|
||||||
AddUserToTenant {
|
|
||||||
username: String,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
},
|
|
||||||
RemoveUserFromTenant {
|
|
||||||
username: String,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
},
|
|
||||||
ReanalyzeDocuments {
|
|
||||||
tenant_id: Uuid,
|
|
||||||
},
|
|
||||||
ListTenants,
|
|
||||||
DeleteAssets {
|
|
||||||
tenant_id: Uuid,
|
|
||||||
#[arg(long = "asset-type")]
|
|
||||||
asset_type: Option<String>,
|
|
||||||
#[arg(long = "all", help = "Confirm deleting every asset for the tenant")]
|
|
||||||
delete_all: bool,
|
|
||||||
},
|
|
||||||
QuickwitCreate {
|
|
||||||
tenant_id: Uuid,
|
|
||||||
},
|
|
||||||
QuickwitDelete {
|
|
||||||
tenant_id: Uuid,
|
|
||||||
},
|
|
||||||
EnqueueDeleteTenant {
|
|
||||||
tenant_id: Uuid,
|
|
||||||
#[arg(long = "tenant-name")]
|
|
||||||
tenant_name: String,
|
|
||||||
#[arg(long = "remove-tenant")]
|
|
||||||
remove_tenant: bool,
|
|
||||||
#[arg(long = "final-status", value_enum)]
|
|
||||||
final_status: Option<TenantFinalStatusArg>,
|
|
||||||
},
|
|
||||||
MagicToken {
|
|
||||||
username: String,
|
|
||||||
#[arg(long = "ttl-minutes", default_value_t = 10)]
|
|
||||||
ttl_minutes: i64,
|
|
||||||
#[arg(
|
|
||||||
long = "max-uses",
|
|
||||||
value_name = "MAX_USES",
|
|
||||||
help = "Maximum number of uses before the token is rejected (default: unlimited)"
|
|
||||||
)]
|
|
||||||
max_uses: Option<i32>,
|
|
||||||
#[arg(long = "kind", value_enum, default_value_t = MagicTokenKindArg::EmailLogin)]
|
|
||||||
kind: MagicTokenKindArg,
|
|
||||||
},
|
|
||||||
MigrateDatabase {
|
|
||||||
#[arg(
|
|
||||||
long = "database-url",
|
|
||||||
value_name = "URL",
|
|
||||||
help = "Override the migrations database URL (defaults to MIGRATIONS_DATABASE_URL or DATABASE_URL)"
|
|
||||||
)]
|
|
||||||
database_url: Option<String>,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, ValueEnum)]
|
|
||||||
enum MagicTokenKindArg {
|
|
||||||
#[value(name = "email_login")]
|
|
||||||
EmailLogin,
|
|
||||||
#[value(name = "demo_login")]
|
|
||||||
DemoLogin,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<MagicTokenKindArg> for MagicTokenKind {
|
|
||||||
fn from(value: MagicTokenKindArg) -> Self {
|
|
||||||
match value {
|
|
||||||
MagicTokenKindArg::EmailLogin => MagicTokenKind::EmailLogin,
|
|
||||||
MagicTokenKindArg::DemoLogin => MagicTokenKind::DemoLogin,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, ValueEnum)]
|
|
||||||
enum TenantFinalStatusArg {
|
|
||||||
Active,
|
|
||||||
Suspended,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TenantFinalStatusArg {
|
|
||||||
fn as_str(&self) -> &'static str {
|
|
||||||
match self {
|
|
||||||
TenantFinalStatusArg::Active => "active",
|
|
||||||
TenantFinalStatusArg::Suspended => "suspended",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() -> Result<()> {
|
|
||||||
init_tracing("info");
|
|
||||||
let cli = Cli::parse();
|
|
||||||
let config = AppConfig::load_and_log("admin")?;
|
|
||||||
let pool = db::init_pool_with_size(&config.database_url, config.database_max_pool_size)?;
|
|
||||||
|
|
||||||
match cli.command {
|
|
||||||
Command::CreateUser { username } => create_user(&pool, &username)?,
|
|
||||||
Command::ListUsers => list_users(&pool)?,
|
|
||||||
Command::DeleteUser { username } => delete_user(&pool, &username)?,
|
|
||||||
Command::CreateTenant {
|
|
||||||
name,
|
|
||||||
storage_root,
|
|
||||||
quickwit_index,
|
|
||||||
} => create_tenant(&pool, &name, storage_root, quickwit_index)?,
|
|
||||||
Command::DeleteTenant {
|
|
||||||
tenant_id,
|
|
||||||
tenant_name,
|
|
||||||
} => delete_tenant(&config, &pool, tenant_id, &tenant_name)?,
|
|
||||||
Command::ResetTenant {
|
|
||||||
tenant_id,
|
|
||||||
tenant_name,
|
|
||||||
final_status,
|
|
||||||
} => reset_tenant(&config, &pool, tenant_id, &tenant_name, final_status)?,
|
|
||||||
Command::AddUserToTenant {
|
|
||||||
username,
|
|
||||||
tenant_id,
|
|
||||||
} => add_user_to_tenant(&pool, &username, tenant_id)?,
|
|
||||||
Command::RemoveUserFromTenant {
|
|
||||||
username,
|
|
||||||
tenant_id,
|
|
||||||
} => remove_user_from_tenant(&pool, &username, tenant_id)?,
|
|
||||||
Command::ReanalyzeDocuments { tenant_id } => reanalyze_documents(&pool, tenant_id)?,
|
|
||||||
Command::ListTenants => list_tenants(&pool)?,
|
|
||||||
Command::DeleteAssets {
|
|
||||||
tenant_id,
|
|
||||||
asset_type,
|
|
||||||
delete_all,
|
|
||||||
} => {
|
|
||||||
let asset_type = asset_type.as_deref();
|
|
||||||
if asset_type.is_none() && !delete_all {
|
|
||||||
bail!("refusing to delete all assets without --all confirmation");
|
|
||||||
}
|
|
||||||
|
|
||||||
delete_assets_for_tenant(&config, &pool, tenant_id, asset_type).await?
|
|
||||||
}
|
|
||||||
Command::QuickwitCreate { tenant_id } => {
|
|
||||||
quickwit_index(&config, &pool, tenant_id, Method::POST).await?
|
|
||||||
}
|
|
||||||
Command::QuickwitDelete { tenant_id } => {
|
|
||||||
quickwit_index(&config, &pool, tenant_id, Method::DELETE).await?
|
|
||||||
}
|
|
||||||
Command::EnqueueDeleteTenant {
|
|
||||||
tenant_id,
|
|
||||||
tenant_name,
|
|
||||||
remove_tenant,
|
|
||||||
final_status,
|
|
||||||
} => enqueue_delete_tenant_job(
|
|
||||||
&config,
|
|
||||||
&pool,
|
|
||||||
tenant_id,
|
|
||||||
&tenant_name,
|
|
||||||
remove_tenant,
|
|
||||||
final_status,
|
|
||||||
)?,
|
|
||||||
Command::MagicToken {
|
|
||||||
username,
|
|
||||||
ttl_minutes,
|
|
||||||
max_uses,
|
|
||||||
kind,
|
|
||||||
} => {
|
|
||||||
create_magic_token(&pool, &username, ttl_minutes, max_uses, kind.into())?;
|
|
||||||
}
|
|
||||||
Command::MigrateDatabase { database_url } => {
|
|
||||||
let url = database_url.unwrap_or_else(|| config.migrations_database_url().to_string());
|
|
||||||
migrate_database(url).await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn migrate_database(database_url: String) -> Result<()> {
|
|
||||||
let redacted = redact_database_url(&database_url);
|
|
||||||
tracing::info!(database_url = %redacted, "running pending migrations");
|
|
||||||
|
|
||||||
let result = task::spawn_blocking(move || -> Result<()> {
|
|
||||||
let mut conn =
|
|
||||||
PgConnection::establish(&database_url).context("failed to connect to database")?;
|
|
||||||
conn.run_pending_migrations(MIGRATIONS)
|
|
||||||
.map_err(|err| anyhow!("failed to run migrations: {err}"))?;
|
|
||||||
Ok(())
|
|
||||||
})
|
|
||||||
.await
|
|
||||||
.context("migration task panicked")?;
|
|
||||||
|
|
||||||
result?;
|
|
||||||
tracing::info!(database_url = %redacted, "migrations completed");
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn create_user(pool: &PgPool, username: &str) -> Result<()> {
|
|
||||||
let username = normalize_identifier(
|
|
||||||
username,
|
|
||||||
100,
|
|
||||||
"username must not be empty",
|
|
||||||
"username must not exceed 100 characters",
|
|
||||||
Some("username may only contain printable characters"),
|
|
||||||
|ch| !ch.is_control(),
|
|
||||||
)
|
|
||||||
.map_err(|err| anyhow!("{:?}", err))?;
|
|
||||||
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
let exists: bool =
|
|
||||||
select(exists(users::table.filter(users::username.eq(&username)))).get_result(&mut conn)?;
|
|
||||||
if exists {
|
|
||||||
bail!("user '{}' already exists", username);
|
|
||||||
}
|
|
||||||
|
|
||||||
let new_user = NewUser {
|
|
||||||
id: Uuid::new_v4(),
|
|
||||||
username: username.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
diesel::insert_into(users::table)
|
|
||||||
.values(&new_user)
|
|
||||||
.execute(&mut conn)?;
|
|
||||||
|
|
||||||
println!("created user '{}' (id: {})", username, new_user.id);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn list_users(pool: &PgPool) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
|
|
||||||
let users_list: Vec<User> = users::table.order(users::username.asc()).load(&mut conn)?;
|
|
||||||
if users_list.is_empty() {
|
|
||||||
println!("No users found.");
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
for user in users_list {
|
|
||||||
let memberships: Vec<String> = user_memberships::table
|
|
||||||
.inner_join(tenants::table)
|
|
||||||
.filter(user_memberships::user_id.eq(user.id))
|
|
||||||
.select(tenants::name)
|
|
||||||
.order(tenants::name.asc())
|
|
||||||
.load(&mut conn)?;
|
|
||||||
|
|
||||||
if memberships.is_empty() {
|
|
||||||
println!("{} ({})", user.username, user.id);
|
|
||||||
} else {
|
|
||||||
println!(
|
|
||||||
"{} ({}) -> {}",
|
|
||||||
user.username,
|
|
||||||
user.id,
|
|
||||||
memberships.join(", ")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn delete_user(pool: &PgPool, username: &str) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
|
|
||||||
let user: User = users::table
|
|
||||||
.filter(users::username.eq(username))
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("user '{}' not found", username))?;
|
|
||||||
|
|
||||||
let has_memberships: bool = select(exists(
|
|
||||||
user_memberships::table.filter(user_memberships::user_id.eq(user.id)),
|
|
||||||
))
|
|
||||||
.get_result(&mut conn)?;
|
|
||||||
if has_memberships {
|
|
||||||
bail!(
|
|
||||||
"user '{}' is still a member of one or more tenants; remove memberships first",
|
|
||||||
username
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
diesel::delete(users::table.filter(users::id.eq(user.id))).execute(&mut conn)?;
|
|
||||||
|
|
||||||
println!("deleted user '{}'", username);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn create_tenant(
|
|
||||||
pool: &PgPool,
|
|
||||||
name: &str,
|
|
||||||
storage_root_arg: Option<String>,
|
|
||||||
quickwit_index_arg: Option<String>,
|
|
||||||
) -> Result<()> {
|
|
||||||
let service = TenantService::new(pool.clone());
|
|
||||||
let tenant = service
|
|
||||||
.create_tenant(
|
|
||||||
name,
|
|
||||||
storage_root_arg.as_deref(),
|
|
||||||
quickwit_index_arg.as_deref(),
|
|
||||||
TenantStatus::Creating,
|
|
||||||
&[],
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.map_err(|err| anyhow!(format!("{err:?}")))?;
|
|
||||||
|
|
||||||
let storage_root = tenant.storage_root.as_deref().unwrap_or("<none>");
|
|
||||||
let quickwit_index = tenant.quickwit_index.as_deref().unwrap_or("<none>");
|
|
||||||
|
|
||||||
println!(
|
|
||||||
"created tenant '{}' with id {}, storage_root '{}', quickwit_index '{}', status '{}'",
|
|
||||||
tenant.name,
|
|
||||||
tenant.id,
|
|
||||||
storage_root,
|
|
||||||
quickwit_index,
|
|
||||||
tenant.status.as_str()
|
|
||||||
);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn create_magic_token(
|
|
||||||
pool: &PgPool,
|
|
||||||
username: &str,
|
|
||||||
ttl_minutes: i64,
|
|
||||||
max_uses: Option<i32>,
|
|
||||||
kind: MagicTokenKind,
|
|
||||||
) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
|
|
||||||
let user: User = users::table
|
|
||||||
.filter(users::username.eq(username))
|
|
||||||
.first(&mut conn)
|
|
||||||
.with_context(|| format!("user '{}' not found", username))?;
|
|
||||||
|
|
||||||
let raw_token = generate_random_token();
|
|
||||||
let token_hash = hash_token(&raw_token);
|
|
||||||
let expires_at = Utc::now() + ChronoDuration::minutes(ttl_minutes);
|
|
||||||
|
|
||||||
let new_token = MagicToken {
|
|
||||||
id: Uuid::new_v4(),
|
|
||||||
user_id: user.id,
|
|
||||||
kind,
|
|
||||||
token_hash,
|
|
||||||
metadata: serde_json::json!({}),
|
|
||||||
expires_at: expires_at.naive_utc(),
|
|
||||||
max_uses,
|
|
||||||
used_count: 0,
|
|
||||||
created_at: Utc::now().naive_utc(),
|
|
||||||
created_by: None,
|
|
||||||
last_used_at: None,
|
|
||||||
};
|
|
||||||
|
|
||||||
diesel::insert_into(magic_tokens::table)
|
|
||||||
.values(&new_token)
|
|
||||||
.execute(&mut conn)?;
|
|
||||||
|
|
||||||
println!(
|
|
||||||
"Magic token created for '{}' (kind: {}, expires_at: {}, max_uses: {})",
|
|
||||||
username,
|
|
||||||
kind.as_str(),
|
|
||||||
expires_at,
|
|
||||||
max_uses.map_or("∞".to_string(), |v| v.to_string())
|
|
||||||
);
|
|
||||||
println!("Token: {}", raw_token);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn generate_random_token() -> String {
|
|
||||||
let mut bytes = [0u8; 32];
|
|
||||||
OsRng
|
|
||||||
.try_fill_bytes(&mut bytes)
|
|
||||||
.expect("failed to read random bytes");
|
|
||||||
hex::encode(bytes)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn hash_token(token: &str) -> String {
|
|
||||||
let mut hasher = Sha256::new();
|
|
||||||
hasher.update(token.as_bytes());
|
|
||||||
hex::encode(hasher.finalize())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn delete_tenant(
|
|
||||||
config: &AppConfig,
|
|
||||||
pool: &PgPool,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
tenant_name: &str,
|
|
||||||
) -> Result<()> {
|
|
||||||
enqueue_delete_tenant_job_internal(config, pool, tenant_id, tenant_name, true, None)?;
|
|
||||||
println!(
|
|
||||||
"delete job enqueued; tenant '{}' will be permanently removed",
|
|
||||||
tenant_name
|
|
||||||
);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reset_tenant(
|
|
||||||
config: &AppConfig,
|
|
||||||
pool: &PgPool,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
tenant_name: &str,
|
|
||||||
final_status: TenantFinalStatusArg,
|
|
||||||
) -> Result<()> {
|
|
||||||
enqueue_delete_tenant_job_internal(
|
|
||||||
config,
|
|
||||||
pool,
|
|
||||||
tenant_id,
|
|
||||||
tenant_name,
|
|
||||||
false,
|
|
||||||
Some(final_status),
|
|
||||||
)?;
|
|
||||||
println!(
|
|
||||||
"reset job enqueued; tenant '{}' will be wiped and set to {}",
|
|
||||||
tenant_name,
|
|
||||||
final_status.as_str()
|
|
||||||
);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn enqueue_delete_tenant_job_internal(
|
|
||||||
config: &AppConfig,
|
|
||||||
pool: &PgPool,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
expected_name: &str,
|
|
||||||
remove_tenant: bool,
|
|
||||||
final_status: Option<TenantFinalStatusArg>,
|
|
||||||
) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
|
|
||||||
let tenant: Tenant = tenants::table
|
|
||||||
.find(tenant_id)
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("tenant '{}' not found", tenant_id))?;
|
|
||||||
|
|
||||||
apply_tenant_guc(&mut conn, tenant.id)
|
|
||||||
.map_err(|err| anyhow!("failed to set tenant context for {}: {err:?}", tenant.name))?;
|
|
||||||
|
|
||||||
if tenant.name != expected_name {
|
|
||||||
bail!(
|
|
||||||
"tenant name mismatch: expected '{}', database has '{}'",
|
|
||||||
expected_name,
|
|
||||||
tenant.name
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
diesel::update(tenants::table.find(tenant.id))
|
|
||||||
.set(tenants::status.eq(TenantStatus::Deleting))
|
|
||||||
.execute(&mut conn)?;
|
|
||||||
|
|
||||||
let nonce = generate_random_token();
|
|
||||||
let issued_at = Utc::now();
|
|
||||||
let issued_at_str = issued_at.to_rfc3339();
|
|
||||||
let action = if remove_tenant {
|
|
||||||
DeleteAction::Delete
|
|
||||||
} else {
|
|
||||||
DeleteAction::Reset
|
|
||||||
};
|
|
||||||
let resolved_final_status = if remove_tenant {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some(
|
|
||||||
final_status
|
|
||||||
.unwrap_or(TenantFinalStatusArg::Suspended)
|
|
||||||
.as_str(),
|
|
||||||
)
|
|
||||||
};
|
|
||||||
|
|
||||||
let message = build_delete_proof_message(
|
|
||||||
tenant.id,
|
|
||||||
expected_name,
|
|
||||||
action,
|
|
||||||
&nonce,
|
|
||||||
&issued_at_str,
|
|
||||||
resolved_final_status,
|
|
||||||
);
|
|
||||||
let signature = sign_delete_proof(&config.jwt_secret, &message).map_err(|err| anyhow!(err))?;
|
|
||||||
|
|
||||||
let mut payload = serde_json::json!({
|
|
||||||
"remove_tenant": remove_tenant,
|
|
||||||
"tenant_name": tenant.name.clone(),
|
|
||||||
"action": action.as_str(),
|
|
||||||
"nonce": nonce,
|
|
||||||
"issued_at": issued_at_str,
|
|
||||||
"signature": signature,
|
|
||||||
});
|
|
||||||
if let Some(status) = resolved_final_status {
|
|
||||||
payload["final_status"] = serde_json::json!(status);
|
|
||||||
}
|
|
||||||
|
|
||||||
enqueue_job(&mut conn, tenant.id, JOB_DELETE_TENANT, payload, None)?;
|
|
||||||
let status_label = if remove_tenant {
|
|
||||||
"deleted"
|
|
||||||
} else {
|
|
||||||
final_status.map(|s| s.as_str()).unwrap_or("suspended")
|
|
||||||
};
|
|
||||||
println!(
|
|
||||||
"delete-tenant job enqueued for '{}' (remove_tenant={}, final_status={})",
|
|
||||||
tenant.name, remove_tenant, status_label
|
|
||||||
);
|
|
||||||
|
|
||||||
clear_tenant_context(&mut conn).map_err(|err| {
|
|
||||||
anyhow!(
|
|
||||||
"failed to clear tenant context for {}: {err:?}",
|
|
||||||
tenant.name
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn enqueue_delete_tenant_job(
|
|
||||||
config: &AppConfig,
|
|
||||||
pool: &PgPool,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
tenant_name: &str,
|
|
||||||
remove_tenant: bool,
|
|
||||||
final_status: Option<TenantFinalStatusArg>,
|
|
||||||
) -> Result<()> {
|
|
||||||
enqueue_delete_tenant_job_internal(
|
|
||||||
config,
|
|
||||||
pool,
|
|
||||||
tenant_id,
|
|
||||||
tenant_name,
|
|
||||||
remove_tenant,
|
|
||||||
final_status,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn add_user_to_tenant(pool: &PgPool, username: &str, tenant_id: Uuid) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
|
|
||||||
let user: User = users::table
|
|
||||||
.filter(users::username.eq(username))
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("user '{}' not found", username))?;
|
|
||||||
|
|
||||||
let tenant: Tenant = tenants::table
|
|
||||||
.find(tenant_id)
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("tenant '{}' not found", tenant_id))?;
|
|
||||||
|
|
||||||
let owner_capability_set_id = ensure_capability_set(&mut conn, tenant.id, owner_capabilities())
|
|
||||||
.map_err(|err| anyhow!("failed to ensure owner capability set: {:?}", err))?
|
|
||||||
.id;
|
|
||||||
|
|
||||||
let membership = NewUserMembership {
|
|
||||||
id: Uuid::new_v4(),
|
|
||||||
user_id: user.id,
|
|
||||||
tenant_id: tenant.id,
|
|
||||||
capability_set_id: Some(owner_capability_set_id),
|
|
||||||
};
|
|
||||||
|
|
||||||
diesel::insert_into(user_memberships::table)
|
|
||||||
.values(&membership)
|
|
||||||
.on_conflict((user_memberships::user_id, user_memberships::tenant_id))
|
|
||||||
.do_nothing()
|
|
||||||
.execute(&mut conn)?;
|
|
||||||
|
|
||||||
println!("added user '{}' to tenant '{}'", username, tenant.name);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn remove_user_from_tenant(pool: &PgPool, username: &str, tenant_id: Uuid) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
|
|
||||||
let user: User = users::table
|
|
||||||
.filter(users::username.eq(username))
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("user '{}' not found", username))?;
|
|
||||||
|
|
||||||
let tenant: Tenant = tenants::table
|
|
||||||
.find(tenant_id)
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("tenant '{}' not found", tenant_id))?;
|
|
||||||
|
|
||||||
let removed = diesel::delete(
|
|
||||||
user_memberships::table
|
|
||||||
.filter(user_memberships::user_id.eq(user.id))
|
|
||||||
.filter(user_memberships::tenant_id.eq(tenant.id)),
|
|
||||||
)
|
|
||||||
.execute(&mut conn)?;
|
|
||||||
|
|
||||||
if removed == 0 {
|
|
||||||
println!(
|
|
||||||
"user '{}' was not a member of tenant '{}'",
|
|
||||||
username, tenant.name
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
println!("removed user '{}' from tenant '{}'", username, tenant.name);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reanalyze_documents(pool: &PgPool, tenant_id: Uuid) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
|
|
||||||
let tenant: Tenant = tenants::table
|
|
||||||
.find(tenant_id)
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("tenant '{}' not found", tenant_id))?;
|
|
||||||
|
|
||||||
let targets: Vec<(Uuid, Uuid)> = documents::table
|
|
||||||
.filter(documents::tenant_id.eq(tenant.id))
|
|
||||||
.filter(documents::deleted_at.is_null())
|
|
||||||
.select((documents::id, documents::current_version_id))
|
|
||||||
.load(&mut conn)?;
|
|
||||||
|
|
||||||
if targets.is_empty() {
|
|
||||||
println!("tenant '{}' has no active documents", tenant.name);
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut queued = 0usize;
|
|
||||||
for (document_id, version_id) in targets {
|
|
||||||
enqueue_job(
|
|
||||||
&mut conn,
|
|
||||||
tenant.id,
|
|
||||||
JOB_ANALYZE_DOCUMENT,
|
|
||||||
serde_json::json!({
|
|
||||||
"document_id": document_id,
|
|
||||||
"document_version_id": version_id,
|
|
||||||
"force": true,
|
|
||||||
}),
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.map_err(|err| anyhow!("failed to enqueue analyze job: {}", err))?;
|
|
||||||
queued += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
println!(
|
|
||||||
"queued {} documents for re-analysis in tenant '{}'",
|
|
||||||
queued, tenant.name
|
|
||||||
);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn list_tenants(pool: &PgPool) -> Result<()> {
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
let tenants: Vec<Tenant> = tenants::table
|
|
||||||
.order(tenants::name.asc())
|
|
||||||
.load(&mut conn)
|
|
||||||
.context("failed to load tenants")?;
|
|
||||||
|
|
||||||
if tenants.is_empty() {
|
|
||||||
println!("No tenants found.");
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
for tenant in tenants {
|
|
||||||
println!("{} {}", tenant.id, tenant.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn delete_assets_for_tenant(
|
|
||||||
config: &AppConfig,
|
|
||||||
pool: &PgPool,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
asset_type: Option<&str>,
|
|
||||||
) -> Result<()> {
|
|
||||||
let bucket = s3::build_bucket(config)?;
|
|
||||||
let storage: Arc<dyn ObjectStorage> = Arc::new(S3Storage::new(bucket));
|
|
||||||
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
let tenant: Tenant = tenants::table
|
|
||||||
.find(tenant_id)
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("tenant '{}' not found", tenant_id))?;
|
|
||||||
|
|
||||||
apply_tenant_guc(&mut conn, tenant.id)
|
|
||||||
.map_err(|err| anyhow!("failed to set tenant context for {}: {err:?}", tenant.name))?;
|
|
||||||
|
|
||||||
let result = async {
|
|
||||||
let tenant_storage = TenantStorage::new(Arc::clone(&storage), &tenant)
|
|
||||||
.with_context(|| format!("missing storage root for tenant {}", tenant.name))?;
|
|
||||||
|
|
||||||
let mut asset_query = document_assets::table
|
|
||||||
.filter(document_assets::tenant_id.eq(tenant.id))
|
|
||||||
.into_boxed();
|
|
||||||
|
|
||||||
if let Some(asset_type) = asset_type {
|
|
||||||
asset_query = asset_query.filter(document_assets::asset_type.eq(asset_type));
|
|
||||||
}
|
|
||||||
|
|
||||||
let assets: Vec<DocumentAsset> = asset_query
|
|
||||||
.load(&mut conn)
|
|
||||||
.with_context(|| format!("failed to load assets for tenant {}", tenant.name))?;
|
|
||||||
|
|
||||||
if assets.is_empty() {
|
|
||||||
match asset_type {
|
|
||||||
Some(asset_type) => {
|
|
||||||
println!("Tenant {}: no assets of type '{}'", tenant.name, asset_type)
|
|
||||||
}
|
|
||||||
None => println!("Tenant {}: no assets", tenant.name),
|
|
||||||
}
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
match asset_type {
|
|
||||||
Some(asset_type) => println!(
|
|
||||||
"Tenant {} ({}): deleting {} '{}' assets…",
|
|
||||||
tenant.name,
|
|
||||||
tenant.id,
|
|
||||||
assets.len(),
|
|
||||||
asset_type
|
|
||||||
),
|
|
||||||
None => println!(
|
|
||||||
"Tenant {} ({}): deleting {} assets…",
|
|
||||||
tenant.name,
|
|
||||||
tenant.id,
|
|
||||||
assets.len()
|
|
||||||
),
|
|
||||||
}
|
|
||||||
|
|
||||||
let asset_ids: Vec<Uuid> = assets.iter().map(|asset| asset.id).collect();
|
|
||||||
|
|
||||||
for asset in &assets {
|
|
||||||
if let Err(err) = tenant_storage.delete_object(&asset.s3_key).await {
|
|
||||||
eprintln!(
|
|
||||||
"Failed to delete object {} (tenant {}): {err}",
|
|
||||||
asset.s3_key, tenant.name
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diesel::delete(
|
|
||||||
document_assets::table
|
|
||||||
.filter(document_assets::tenant_id.eq(tenant.id))
|
|
||||||
.filter(document_assets::id.eq_any(&asset_ids)),
|
|
||||||
)
|
|
||||||
.execute(&mut conn)
|
|
||||||
.with_context(|| format!("failed to remove asset records for tenant {}", tenant.name))?;
|
|
||||||
|
|
||||||
println!("Tenant {}: asset records deleted.", tenant.name);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
.await;
|
|
||||||
|
|
||||||
clear_tenant_context(&mut conn).map_err(|err| {
|
|
||||||
anyhow!(
|
|
||||||
"failed to clear tenant context for {}: {err:?}",
|
|
||||||
tenant.name
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
result
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn quickwit_index(
|
|
||||||
config: &AppConfig,
|
|
||||||
pool: &PgPool,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
method: Method,
|
|
||||||
) -> Result<()> {
|
|
||||||
let endpoint = config
|
|
||||||
.quickwit_endpoint
|
|
||||||
.as_ref()
|
|
||||||
.ok_or_else(|| anyhow!("quickwit endpoint not configured"))?;
|
|
||||||
|
|
||||||
let mut conn = pool.get().context("failed to get database connection")?;
|
|
||||||
let tenant: Tenant = tenants::table
|
|
||||||
.find(tenant_id)
|
|
||||||
.first(&mut conn)
|
|
||||||
.optional()?
|
|
||||||
.ok_or_else(|| anyhow!("tenant '{}' not found", tenant_id))?;
|
|
||||||
|
|
||||||
let client = Client::new();
|
|
||||||
let index_id = format!("documents-{}", tenant.id);
|
|
||||||
let base_endpoint = endpoint.trim_end_matches('/');
|
|
||||||
|
|
||||||
match method {
|
|
||||||
Method::POST => {
|
|
||||||
ensure_quickwit_index(&client, base_endpoint, &index_id)
|
|
||||||
.await
|
|
||||||
.context("failed to ensure quickwit index")?;
|
|
||||||
|
|
||||||
diesel::update(tenants::table.filter(tenants::id.eq(tenant.id)))
|
|
||||||
.set(tenants::quickwit_index.eq(Some(index_id.clone())))
|
|
||||||
.execute(&mut conn)
|
|
||||||
.context("failed to update tenant quickwit_index")?;
|
|
||||||
|
|
||||||
println!(
|
|
||||||
"Tenant '{}' quickwit index set to '{}'.",
|
|
||||||
tenant.name, index_id
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Method::DELETE => {
|
|
||||||
let response = client
|
|
||||||
.delete(format!("{}/api/v1/indexes/{}", base_endpoint, index_id))
|
|
||||||
.send()
|
|
||||||
.await
|
|
||||||
.context("failed to send delete index request")?;
|
|
||||||
|
|
||||||
match response.status() {
|
|
||||||
status if status.is_success() || status == StatusCode::NOT_FOUND => {
|
|
||||||
diesel::update(tenants::table.filter(tenants::id.eq(tenant.id)))
|
|
||||||
.set(tenants::quickwit_index.eq::<Option<String>>(None))
|
|
||||||
.execute(&mut conn)
|
|
||||||
.context("failed to clear tenant quickwit_index")?;
|
|
||||||
|
|
||||||
println!("Tenant '{}' quickwit index cleared.", tenant.name);
|
|
||||||
}
|
|
||||||
status => {
|
|
||||||
let body = response.text().await.unwrap_or_default();
|
|
||||||
bail!(
|
|
||||||
"quickwit delete index failed with status {}: {}",
|
|
||||||
status,
|
|
||||||
body
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => unreachable!(),
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
use std::env;
|
||||||
|
|
||||||
|
use anyhow::{Context, Result};
|
||||||
|
use diesel::prelude::*;
|
||||||
|
|
||||||
|
use backend::{
|
||||||
|
config::AppConfig,
|
||||||
|
db,
|
||||||
|
models::DocumentAsset,
|
||||||
|
s3,
|
||||||
|
schema::document_assets,
|
||||||
|
storage::{ObjectStorage, S3Storage},
|
||||||
|
};
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> Result<()> {
|
||||||
|
let mut args = env::args().skip(1);
|
||||||
|
match args.next().as_deref() {
|
||||||
|
Some("delete-assets") => delete_all_assets().await?,
|
||||||
|
Some(cmd) => {
|
||||||
|
eprintln!("Unknown command: {cmd}\nUsage: maintenance delete-assets");
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
eprintln!("Usage: maintenance delete-assets");
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn delete_all_assets() -> Result<()> {
|
||||||
|
let config = AppConfig::from_env()?;
|
||||||
|
tracing::info!(
|
||||||
|
component = "maintenance",
|
||||||
|
database_url = %config.redacted_database_url(),
|
||||||
|
pool_size = config.database_max_pool_size,
|
||||||
|
s3_bucket = %config.s3_bucket,
|
||||||
|
"loaded backend configuration"
|
||||||
|
);
|
||||||
|
let pool = db::init_pool_with_size(&config.database_url, config.database_max_pool_size)?;
|
||||||
|
|
||||||
|
let s3_client = s3::build_client(&config).await?;
|
||||||
|
let storage = S3Storage::new(s3_client, config.s3_bucket.clone());
|
||||||
|
|
||||||
|
let mut conn = pool.get().context("failed to get database connection")?;
|
||||||
|
|
||||||
|
let assets: Vec<DocumentAsset> = document_assets::table
|
||||||
|
.load(&mut conn)
|
||||||
|
.context("failed to load document assets")?;
|
||||||
|
|
||||||
|
if assets.is_empty() {
|
||||||
|
println!("No assets found.");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("Deleting {} assets…", assets.len());
|
||||||
|
|
||||||
|
for asset in &assets {
|
||||||
|
if let Err(err) = storage.delete_object(&asset.s3_key).await {
|
||||||
|
eprintln!(
|
||||||
|
"Failed to delete object {} from storage: {err}",
|
||||||
|
asset.s3_key
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::delete(document_assets::table)
|
||||||
|
.execute(&mut conn)
|
||||||
|
.context("failed to remove asset records")?;
|
||||||
|
|
||||||
|
println!("Asset records deleted.");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
use papercrate::openapi::ApiDoc;
|
|
||||||
use utoipa::OpenApi;
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
let spec = ApiDoc::openapi();
|
|
||||||
let json = serde_json::to_string_pretty(&spec).expect("serialize openapi");
|
|
||||||
println!("{}", json);
|
|
||||||
}
|
|
||||||
@@ -1,24 +1,47 @@
|
|||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
use tower::make::Shared;
|
use tower::make::Shared;
|
||||||
|
use tracing_subscriber::EnvFilter;
|
||||||
|
|
||||||
use papercrate::{routes::webdav, utils::bootstrap::init_component};
|
use backend::auth::jwt::JwtService;
|
||||||
|
use backend::config::AppConfig;
|
||||||
|
use backend::db;
|
||||||
|
use backend::routes::webdav;
|
||||||
|
use backend::s3::build_client;
|
||||||
|
use backend::state::AppState;
|
||||||
|
use backend::storage::S3Storage;
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> anyhow::Result<()> {
|
async fn main() -> anyhow::Result<()> {
|
||||||
let state = init_component("webdav", None).await?;
|
dotenv::dotenv().ok();
|
||||||
let webdav_host = state.config.webdav_host.clone();
|
init_tracing();
|
||||||
let webdav_port = state.config.webdav_port;
|
|
||||||
|
let config = AppConfig::from_env()?;
|
||||||
tracing::info!(
|
tracing::info!(
|
||||||
component = "webdav",
|
component = "webdav",
|
||||||
webdav_host = %webdav_host,
|
database_url = %config.redacted_database_url(),
|
||||||
webdav_port,
|
pool_size = config.database_max_pool_size,
|
||||||
"starting webdav server"
|
server_host = %config.server_host,
|
||||||
|
server_port = config.server_port,
|
||||||
|
webdav_host = %config.webdav_host,
|
||||||
|
webdav_port = config.webdav_port,
|
||||||
|
quickwit_enabled = config.quickwit_endpoint.is_some(),
|
||||||
|
s3_bucket = %config.s3_bucket,
|
||||||
|
"loaded backend configuration"
|
||||||
);
|
);
|
||||||
|
let pool = db::init_pool_with_size(&config.database_url, config.database_max_pool_size)?;
|
||||||
|
let s3_client = build_client(&config).await?;
|
||||||
|
let storage = Arc::new(S3Storage::new(s3_client, config.s3_bucket.clone()));
|
||||||
|
let jwt = JwtService::from_config(&config)?;
|
||||||
|
|
||||||
let listen_addr: SocketAddr = format!("{}:{}", webdav_host, webdav_port).parse()?;
|
let state = AppState::new(pool, config, storage, jwt);
|
||||||
let router = webdav::create_router().with_state(state.as_ref().clone());
|
let listen_addr: SocketAddr = {
|
||||||
|
let config = state.config.clone();
|
||||||
|
format!("{}:{}", config.webdav_host, config.webdav_port).parse()?
|
||||||
|
};
|
||||||
|
let router = webdav::create_router().with_state(state);
|
||||||
|
|
||||||
let listener = TcpListener::bind(listen_addr).await?;
|
let listener = TcpListener::bind(listen_addr).await?;
|
||||||
tracing::info!("listening for WebDAV on {}", listen_addr);
|
tracing::info!("listening for WebDAV on {}", listen_addr);
|
||||||
@@ -26,3 +49,12 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
axum::serve(listener, Shared::new(router)).await?;
|
axum::serve(listener, Shared::new(router)).await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn init_tracing() {
|
||||||
|
let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_env_filter(filter)
|
||||||
|
.with_target(false)
|
||||||
|
.compact()
|
||||||
|
.init();
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,13 +1,33 @@
|
|||||||
use std::time::Duration;
|
use std::{sync::Arc, time::Duration};
|
||||||
|
|
||||||
use tokio::signal;
|
use tokio::signal;
|
||||||
|
use tracing_subscriber::EnvFilter;
|
||||||
|
|
||||||
use papercrate::{default_handlers, utils::bootstrap::init_component, Worker};
|
use backend::{
|
||||||
|
auth::jwt::JwtService, config::AppConfig, db, default_handlers, s3::build_client,
|
||||||
|
state::AppState, storage::S3Storage, Worker,
|
||||||
|
};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> anyhow::Result<()> {
|
async fn main() -> anyhow::Result<()> {
|
||||||
let state = init_component("worker", Some(1)).await?;
|
dotenv::dotenv().ok();
|
||||||
tracing::info!(component = "worker", "starting worker process");
|
init_tracing();
|
||||||
|
|
||||||
|
let config = AppConfig::from_env()?;
|
||||||
|
tracing::info!(
|
||||||
|
component = "worker",
|
||||||
|
database_url = %config.redacted_database_url(),
|
||||||
|
pool_size = 1,
|
||||||
|
quickwit_enabled = config.quickwit_endpoint.is_some(),
|
||||||
|
s3_bucket = %config.s3_bucket,
|
||||||
|
"loaded backend configuration"
|
||||||
|
);
|
||||||
|
let pool = db::init_pool_with_size(&config.database_url, 1)?;
|
||||||
|
let s3_client = build_client(&config).await?;
|
||||||
|
let storage = Arc::new(S3Storage::new(s3_client, config.s3_bucket.clone()));
|
||||||
|
let jwt = JwtService::from_config(&config)?;
|
||||||
|
|
||||||
|
let state = Arc::new(AppState::new(pool, config, storage, jwt));
|
||||||
let worker = Worker::new(state, default_handlers(), Duration::from_secs(2));
|
let worker = Worker::new(state, default_handlers(), Duration::from_secs(2));
|
||||||
|
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
@@ -19,3 +39,12 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn init_tracing() {
|
||||||
|
let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_env_filter(filter)
|
||||||
|
.with_target(false)
|
||||||
|
.compact()
|
||||||
|
.init();
|
||||||
|
}
|
||||||
|
|||||||
+77
-228
@@ -1,273 +1,122 @@
|
|||||||
|
use std::env;
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
use serde::de::Deserializer;
|
|
||||||
use serde::Deserialize;
|
|
||||||
use serde_aux::field_attributes::deserialize_bool_from_anything;
|
|
||||||
|
|
||||||
use crate::db::DEFAULT_MAX_POOL_SIZE;
|
use crate::db::DEFAULT_MAX_POOL_SIZE;
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize)]
|
#[derive(Clone, Debug)]
|
||||||
pub struct AppConfig {
|
pub struct AppConfig {
|
||||||
pub database_url: String,
|
pub database_url: String,
|
||||||
#[serde(default)]
|
|
||||||
pub migrations_database_url: Option<String>,
|
|
||||||
#[serde(default = "default_database_max_pool_size")]
|
|
||||||
pub database_max_pool_size: u32,
|
pub database_max_pool_size: u32,
|
||||||
#[serde(default = "default_server_host")]
|
|
||||||
pub server_host: String,
|
pub server_host: String,
|
||||||
#[serde(default = "default_server_port")]
|
|
||||||
pub server_port: u16,
|
pub server_port: u16,
|
||||||
#[serde(default = "default_webdav_host")]
|
|
||||||
pub webdav_host: String,
|
pub webdav_host: String,
|
||||||
#[serde(default = "default_webdav_port")]
|
|
||||||
pub webdav_port: u16,
|
pub webdav_port: u16,
|
||||||
pub jwt_secret: String,
|
pub jwt_secret: String,
|
||||||
#[serde(default = "default_jwt_issuer")]
|
|
||||||
pub jwt_issuer: String,
|
pub jwt_issuer: String,
|
||||||
#[serde(default = "default_jwt_audience")]
|
|
||||||
pub jwt_audience: String,
|
pub jwt_audience: String,
|
||||||
#[serde(default = "default_jwt_expiry_minutes")]
|
|
||||||
pub jwt_expiry_minutes: i64,
|
pub jwt_expiry_minutes: i64,
|
||||||
#[serde(default = "default_download_token_audience")]
|
|
||||||
pub download_token_audience: String,
|
pub download_token_audience: String,
|
||||||
#[serde(default = "default_download_token_expiry_minutes")]
|
|
||||||
pub download_token_expiry_minutes: i64,
|
pub download_token_expiry_minutes: i64,
|
||||||
#[serde(default = "default_refresh_token_expiry_days")]
|
|
||||||
pub refresh_token_expiry_days: i64,
|
pub refresh_token_expiry_days: i64,
|
||||||
#[serde(
|
|
||||||
default = "default_refresh_cookie_secure",
|
|
||||||
deserialize_with = "deserialize_bool_from_anything"
|
|
||||||
)]
|
|
||||||
pub refresh_cookie_secure: bool,
|
pub refresh_cookie_secure: bool,
|
||||||
#[serde(default)]
|
|
||||||
pub refresh_cookie_domain: Option<String>,
|
pub refresh_cookie_domain: Option<String>,
|
||||||
#[serde(default)]
|
|
||||||
pub cors_allowed_origin: Option<String>,
|
pub cors_allowed_origin: Option<String>,
|
||||||
#[serde(default, deserialize_with = "deserialize_bool_from_anything")]
|
|
||||||
pub proxy_downloads: bool,
|
|
||||||
#[serde(default)]
|
|
||||||
pub aws_endpoint_url: Option<String>,
|
pub aws_endpoint_url: Option<String>,
|
||||||
#[serde(default)]
|
|
||||||
pub aws_access_key_id: Option<String>,
|
pub aws_access_key_id: Option<String>,
|
||||||
#[serde(default)]
|
|
||||||
pub aws_secret_access_key: Option<String>,
|
pub aws_secret_access_key: Option<String>,
|
||||||
#[serde(default = "default_aws_region")]
|
|
||||||
pub aws_region: String,
|
pub aws_region: String,
|
||||||
pub s3_bucket: String,
|
pub s3_bucket: String,
|
||||||
#[serde(default)]
|
|
||||||
pub quickwit_endpoint: Option<String>,
|
pub quickwit_endpoint: Option<String>,
|
||||||
#[serde(default)]
|
|
||||||
pub quickwit_index: Option<String>,
|
pub quickwit_index: Option<String>,
|
||||||
#[serde(default = "default_worker_max_document_bytes")]
|
|
||||||
pub worker_max_document_bytes: u64,
|
|
||||||
#[serde(default = "default_upload_body_limit_bytes")]
|
|
||||||
pub upload_body_limit_bytes: u64,
|
|
||||||
#[serde(default = "default_service_timezone")]
|
|
||||||
pub service_timezone: String,
|
|
||||||
#[serde(default = "default_issued_at_date_order")]
|
|
||||||
pub issued_at_date_order: String,
|
|
||||||
#[serde(default)]
|
|
||||||
pub issued_at_filename_date_order: Option<String>,
|
|
||||||
#[serde(default, deserialize_with = "deserialize_string_list")]
|
|
||||||
pub issued_at_date_parser_locales: Vec<String>,
|
|
||||||
#[serde(default, deserialize_with = "deserialize_string_list")]
|
|
||||||
pub issued_at_ignore_dates: Vec<String>,
|
|
||||||
#[serde(default)]
|
|
||||||
pub webauthn_rp_id: Option<String>,
|
|
||||||
#[serde(default)]
|
|
||||||
pub webauthn_origin: Option<String>,
|
|
||||||
#[serde(default = "default_webauthn_rp_name")]
|
|
||||||
pub webauthn_rp_name: String,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppConfig {
|
impl AppConfig {
|
||||||
pub fn load_and_log(component: &str) -> Result<Self> {
|
|
||||||
dotenv::dotenv().ok();
|
|
||||||
let config = Self::from_env()?;
|
|
||||||
tracing::info!(
|
|
||||||
component,
|
|
||||||
database_url = %config.redacted_database_url(),
|
|
||||||
migrations_database_url = %config.redacted_migrations_database_url(),
|
|
||||||
pool_size = config.database_max_pool_size,
|
|
||||||
quickwit_enabled = config.quickwit_endpoint.is_some(),
|
|
||||||
passkeys_enabled = config.webauthn_origin.is_some(),
|
|
||||||
s3_bucket = %config.s3_bucket,
|
|
||||||
worker_max_document_bytes = config.worker_max_document_bytes,
|
|
||||||
upload_body_limit_bytes = config.upload_body_limit_bytes,
|
|
||||||
proxy_downloads = config.proxy_downloads,
|
|
||||||
"loaded backend configuration"
|
|
||||||
);
|
|
||||||
Ok(config)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_env() -> Result<Self> {
|
pub fn from_env() -> Result<Self> {
|
||||||
let config: AppConfig = envy::from_env()
|
let database_url = env::var("DATABASE_URL").context("DATABASE_URL must be set")?;
|
||||||
.context("failed to parse application configuration from environment")?;
|
let database_max_pool_size = env::var("DATABASE_MAX_POOL_SIZE")
|
||||||
Ok(config.normalize())
|
.ok()
|
||||||
|
.and_then(|value| value.parse().ok())
|
||||||
|
.unwrap_or(DEFAULT_MAX_POOL_SIZE);
|
||||||
|
let server_host = env::var("SERVER_HOST").unwrap_or_else(|_| "127.0.0.1".to_string());
|
||||||
|
let server_port = env::var("SERVER_PORT")
|
||||||
|
.unwrap_or_else(|_| "3000".to_string())
|
||||||
|
.parse()
|
||||||
|
.context("SERVER_PORT must be a valid u16")?;
|
||||||
|
let webdav_host = env::var("WEBDAV_HOST").unwrap_or_else(|_| server_host.clone());
|
||||||
|
let webdav_port = env::var("WEBDAV_PORT")
|
||||||
|
.unwrap_or_else(|_| "3001".to_string())
|
||||||
|
.parse()
|
||||||
|
.context("WEBDAV_PORT must be a valid u16")?;
|
||||||
|
let jwt_secret = env::var("JWT_SECRET").context("JWT_SECRET must be set")?;
|
||||||
|
let jwt_issuer = env::var("JWT_ISSUER").unwrap_or_else(|_| "papercrate".to_string());
|
||||||
|
let jwt_audience =
|
||||||
|
env::var("JWT_AUDIENCE").unwrap_or_else(|_| "papercrate-clients".to_string());
|
||||||
|
let jwt_expiry_minutes = env::var("JWT_EXPIRY_MINUTES")
|
||||||
|
.unwrap_or_else(|_| "60".to_string())
|
||||||
|
.parse()
|
||||||
|
.context("JWT_EXPIRY_MINUTES must be an integer")?;
|
||||||
|
let download_token_audience = env::var("DOWNLOAD_TOKEN_AUDIENCE")
|
||||||
|
.unwrap_or_else(|_| "papercrate-download".to_string());
|
||||||
|
let download_token_expiry_minutes = env::var("DOWNLOAD_TOKEN_EXPIRY_MINUTES")
|
||||||
|
.unwrap_or_else(|_| "60".to_string())
|
||||||
|
.parse()
|
||||||
|
.context("DOWNLOAD_TOKEN_EXPIRY_MINUTES must be an integer")?;
|
||||||
|
let refresh_token_expiry_days = env::var("REFRESH_TOKEN_EXPIRY_DAYS")
|
||||||
|
.unwrap_or_else(|_| "30".to_string())
|
||||||
|
.parse()
|
||||||
|
.context("REFRESH_TOKEN_EXPIRY_DAYS must be an integer")?;
|
||||||
|
let refresh_cookie_secure = env::var("REFRESH_COOKIE_SECURE")
|
||||||
|
.map(|v| v == "1" || v.eq_ignore_ascii_case("true"))
|
||||||
|
.unwrap_or(false);
|
||||||
|
let refresh_cookie_domain = env::var("REFRESH_COOKIE_DOMAIN").ok();
|
||||||
|
let cors_allowed_origin = env::var("CORS_ALLOWED_ORIGIN").ok();
|
||||||
|
let aws_endpoint_url = env::var("AWS_ENDPOINT_URL").ok();
|
||||||
|
let aws_access_key_id = env::var("AWS_ACCESS_KEY_ID").ok();
|
||||||
|
let aws_secret_access_key = env::var("AWS_SECRET_ACCESS_KEY").ok();
|
||||||
|
let aws_region = env::var("AWS_REGION").unwrap_or_else(|_| "us-east-1".to_string());
|
||||||
|
let s3_bucket = env::var("S3_BUCKET").context("S3_BUCKET must be set")?;
|
||||||
|
let quickwit_endpoint = env::var("QUICKWIT_ENDPOINT").ok();
|
||||||
|
let quickwit_index = env::var("QUICKWIT_INDEX").ok();
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
database_url,
|
||||||
|
database_max_pool_size,
|
||||||
|
server_host,
|
||||||
|
server_port,
|
||||||
|
webdav_host,
|
||||||
|
webdav_port,
|
||||||
|
jwt_secret,
|
||||||
|
jwt_issuer,
|
||||||
|
jwt_audience,
|
||||||
|
jwt_expiry_minutes,
|
||||||
|
download_token_audience,
|
||||||
|
download_token_expiry_minutes,
|
||||||
|
refresh_token_expiry_days,
|
||||||
|
refresh_cookie_secure,
|
||||||
|
refresh_cookie_domain,
|
||||||
|
cors_allowed_origin,
|
||||||
|
aws_endpoint_url,
|
||||||
|
aws_access_key_id,
|
||||||
|
aws_secret_access_key,
|
||||||
|
aws_region,
|
||||||
|
s3_bucket,
|
||||||
|
quickwit_endpoint,
|
||||||
|
quickwit_index,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn redacted_database_url(&self) -> String {
|
pub fn redacted_database_url(&self) -> String {
|
||||||
redact_database_url(&self.database_url)
|
redact_database_url(&self.database_url)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn redacted_migrations_database_url(&self) -> String {
|
|
||||||
redact_database_url(self.migrations_database_url())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn migrations_database_url(&self) -> &str {
|
|
||||||
if let Some(ref url) = self.migrations_database_url {
|
|
||||||
url
|
|
||||||
} else {
|
|
||||||
&self.database_url
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppConfig {
|
fn redact_database_url(raw: &str) -> String {
|
||||||
fn normalize(mut self) -> Self {
|
|
||||||
if self.webdav_host.is_empty() {
|
|
||||||
self.webdav_host = self.server_host.clone();
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.webauthn_rp_id.is_none() {
|
|
||||||
self.webauthn_rp_id = Some(self.server_host.clone());
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.webauthn_origin.is_none() {
|
|
||||||
let scheme = if self.server_host == "127.0.0.1" || self.server_host == "localhost" {
|
|
||||||
"http"
|
|
||||||
} else {
|
|
||||||
"https"
|
|
||||||
};
|
|
||||||
self.webauthn_origin = Some(format!(
|
|
||||||
"{scheme}://{}:{}",
|
|
||||||
self.server_host, self.server_port
|
|
||||||
));
|
|
||||||
}
|
|
||||||
self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_database_max_pool_size() -> u32 {
|
|
||||||
DEFAULT_MAX_POOL_SIZE
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_server_host() -> String {
|
|
||||||
"127.0.0.1".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_server_port() -> u16 {
|
|
||||||
3000
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_webdav_host() -> String {
|
|
||||||
String::new()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_webdav_port() -> u16 {
|
|
||||||
3001
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_jwt_issuer() -> String {
|
|
||||||
"papercrate".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_jwt_audience() -> String {
|
|
||||||
"papercrate-clients".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_jwt_expiry_minutes() -> i64 {
|
|
||||||
60
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_download_token_audience() -> String {
|
|
||||||
"papercrate-download".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_download_token_expiry_minutes() -> i64 {
|
|
||||||
60
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_refresh_token_expiry_days() -> i64 {
|
|
||||||
30
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_refresh_cookie_secure() -> bool {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_aws_region() -> String {
|
|
||||||
"us-east-1".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_worker_max_document_bytes() -> u64 {
|
|
||||||
200 * 1024 * 1024
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_upload_body_limit_bytes() -> u64 {
|
|
||||||
128 * 1024 * 1024
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_service_timezone() -> String {
|
|
||||||
"UTC".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_issued_at_date_order() -> String {
|
|
||||||
"DMY".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deserialize_string_list<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
|
|
||||||
where
|
|
||||||
D: Deserializer<'de>,
|
|
||||||
{
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
#[serde(untagged)]
|
|
||||||
enum Helper {
|
|
||||||
List(Vec<String>),
|
|
||||||
Single(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
let helper = Option::<Helper>::deserialize(deserializer)?;
|
|
||||||
let mut values = Vec::new();
|
|
||||||
|
|
||||||
if let Some(helper) = helper {
|
|
||||||
match helper {
|
|
||||||
Helper::List(list) => {
|
|
||||||
for entry in list {
|
|
||||||
let trimmed = entry.trim();
|
|
||||||
if !trimmed.is_empty() {
|
|
||||||
values.push(trimmed.to_string());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Helper::Single(value) => {
|
|
||||||
for part in value.split(',') {
|
|
||||||
let trimmed = part.trim();
|
|
||||||
if !trimmed.is_empty() {
|
|
||||||
values.push(trimmed.to_string());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(values)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_webauthn_rp_name() -> String {
|
|
||||||
"Papercrate".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn redact_database_url(raw: &str) -> String {
|
|
||||||
match Url::parse(raw) {
|
match Url::parse(raw) {
|
||||||
Ok(mut parsed) => {
|
Ok(mut parsed) => {
|
||||||
if parsed.password().is_some() {
|
let _ = parsed.set_password(Some("*****"));
|
||||||
let _ = parsed.set_password(Some("*****"));
|
parsed.to_string()
|
||||||
parsed.to_string()
|
|
||||||
} else {
|
|
||||||
raw.to_string()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Err(_) => "***".to_string(),
|
Err(_) => "***".to_string(),
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-30
@@ -1,40 +1,12 @@
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use diesel::pg::PgConnection;
|
use diesel::pg::PgConnection;
|
||||||
use diesel::r2d2::{ConnectionManager, CustomizeConnection, Pool};
|
use diesel::r2d2::{ConnectionManager, Pool};
|
||||||
use diesel::RunQueryDsl;
|
|
||||||
|
|
||||||
pub type PgPool = Pool<ConnectionManager<PgConnection>>;
|
pub type PgPool = Pool<ConnectionManager<PgConnection>>;
|
||||||
|
|
||||||
pub const DEFAULT_MAX_POOL_SIZE: u32 = 2;
|
pub const DEFAULT_MAX_POOL_SIZE: u32 = 2;
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
struct SchemaCustomizer;
|
|
||||||
|
|
||||||
impl CustomizeConnection<PgConnection, diesel::r2d2::Error> for SchemaCustomizer {
|
|
||||||
fn on_acquire(&self, conn: &mut PgConnection) -> Result<(), diesel::r2d2::Error> {
|
|
||||||
diesel::sql_query(
|
|
||||||
"SELECT set_config('search_path', (
|
|
||||||
SELECT string_agg(schema_name, ', ')
|
|
||||||
FROM (
|
|
||||||
SELECT 'tenant' AS schema_name WHERE EXISTS (
|
|
||||||
SELECT 1 FROM pg_namespace WHERE nspname = 'tenant'
|
|
||||||
)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 'shared' AS schema_name WHERE EXISTS (
|
|
||||||
SELECT 1 FROM pg_namespace WHERE nspname = 'shared'
|
|
||||||
)
|
|
||||||
UNION ALL
|
|
||||||
SELECT 'public' AS schema_name
|
|
||||||
) AS schemas
|
|
||||||
), false)",
|
|
||||||
)
|
|
||||||
.execute(conn)
|
|
||||||
.map(|_| ())
|
|
||||||
.map_err(diesel::r2d2::Error::QueryError)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn init_pool(database_url: &str) -> anyhow::Result<PgPool> {
|
pub fn init_pool(database_url: &str) -> anyhow::Result<PgPool> {
|
||||||
init_pool_with_size(database_url, DEFAULT_MAX_POOL_SIZE)
|
init_pool_with_size(database_url, DEFAULT_MAX_POOL_SIZE)
|
||||||
}
|
}
|
||||||
@@ -45,7 +17,6 @@ pub fn init_pool_with_size(database_url: &str, max_size: u32) -> anyhow::Result<
|
|||||||
let pool = Pool::builder()
|
let pool = Pool::builder()
|
||||||
.max_size(pool_size)
|
.max_size(pool_size)
|
||||||
.connection_timeout(Duration::from_secs(10))
|
.connection_timeout(Duration::from_secs(10))
|
||||||
.connection_customizer(Box::new(SchemaCustomizer))
|
|
||||||
.build(manager)?;
|
.build(manager)?;
|
||||||
Ok(pool)
|
Ok(pool)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,256 +0,0 @@
|
|||||||
use std::collections::HashMap;
|
|
||||||
use std::path::Path as FsPath;
|
|
||||||
|
|
||||||
use chrono::{Duration as ChronoDuration, Utc};
|
|
||||||
use diesel::prelude::*;
|
|
||||||
use serde::Serialize;
|
|
||||||
use serde_json::Value;
|
|
||||||
use utoipa::ToSchema;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::error::{AppError, AppResult};
|
|
||||||
use crate::models::{Document, DocumentAsset, DocumentVersion};
|
|
||||||
use crate::schema::{document_assets, document_versions};
|
|
||||||
use crate::state::{AppState, PgPooledConnection};
|
|
||||||
use crate::utils::{http::inline_content_disposition, time::to_iso};
|
|
||||||
|
|
||||||
#[derive(Serialize, Clone, ToSchema)]
|
|
||||||
pub struct DownloadLink {
|
|
||||||
pub url: String,
|
|
||||||
pub expires_at: i64,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Clone, ToSchema)]
|
|
||||||
pub struct DocumentAssetResponse {
|
|
||||||
pub id: Uuid,
|
|
||||||
pub asset_type: String,
|
|
||||||
pub mime_type: String,
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub metadata: Value,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
#[schema(nullable)]
|
|
||||||
pub download: Option<DownloadLink>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, ToSchema)]
|
|
||||||
pub struct DocumentAssetDetailResponse {
|
|
||||||
pub id: Uuid,
|
|
||||||
pub asset_type: String,
|
|
||||||
pub mime_type: String,
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub metadata: Value,
|
|
||||||
pub created_at: String,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
#[schema(nullable)]
|
|
||||||
pub download: Option<DownloadLink>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Clone, ToSchema)]
|
|
||||||
pub struct DocumentVersionResponse {
|
|
||||||
pub id: Uuid,
|
|
||||||
pub version_number: i32,
|
|
||||||
pub size_bytes: i64,
|
|
||||||
pub checksum: String,
|
|
||||||
pub created_at: String,
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub metadata: Value,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Clone, ToSchema)]
|
|
||||||
pub struct DocumentVersionDetailResponse {
|
|
||||||
#[serde(flatten)]
|
|
||||||
pub version: DocumentVersionResponse,
|
|
||||||
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
||||||
pub assets: Vec<DocumentAssetResponse>,
|
|
||||||
pub download: DownloadLink,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn build_download_link(
|
|
||||||
state: &AppState,
|
|
||||||
document: &Document,
|
|
||||||
version_id: Uuid,
|
|
||||||
user_id: Uuid,
|
|
||||||
) -> AppResult<DownloadLink> {
|
|
||||||
state
|
|
||||||
.jwt
|
|
||||||
.generate_download_token(document.id, version_id, user_id, document.tenant_id)
|
|
||||||
.map_err(|err| {
|
|
||||||
tracing::error!(error = ?err, "failed to generate download token");
|
|
||||||
AppError::internal("failed to generate download token")
|
|
||||||
})
|
|
||||||
.and_then(|token| {
|
|
||||||
let expires_at = Utc::now()
|
|
||||||
.checked_add_signed(ChronoDuration::minutes(
|
|
||||||
state.config.download_token_expiry_minutes,
|
|
||||||
))
|
|
||||||
.ok_or_else(|| AppError::internal("failed to compute download expiry"))?
|
|
||||||
.timestamp_millis();
|
|
||||||
|
|
||||||
Ok(DownloadLink {
|
|
||||||
url: format!("/api/download/{token}"),
|
|
||||||
expires_at,
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn to_version_response(version: DocumentVersion) -> DocumentVersionResponse {
|
|
||||||
DocumentVersionResponse {
|
|
||||||
id: version.id,
|
|
||||||
version_number: version.version_number,
|
|
||||||
size_bytes: version.size_bytes,
|
|
||||||
checksum: version.checksum,
|
|
||||||
created_at: to_iso(version.created_at),
|
|
||||||
metadata: version.metadata,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn to_asset_summary(asset: DocumentAsset) -> DocumentAssetResponse {
|
|
||||||
DocumentAssetResponse {
|
|
||||||
id: asset.id,
|
|
||||||
asset_type: asset.asset_type,
|
|
||||||
mime_type: asset.mime_type,
|
|
||||||
metadata: asset.metadata,
|
|
||||||
download: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn to_asset_detail_response(
|
|
||||||
asset: DocumentAsset,
|
|
||||||
download: Option<DownloadLink>,
|
|
||||||
) -> DocumentAssetDetailResponse {
|
|
||||||
DocumentAssetDetailResponse {
|
|
||||||
id: asset.id,
|
|
||||||
asset_type: asset.asset_type,
|
|
||||||
mime_type: asset.mime_type,
|
|
||||||
metadata: asset.metadata,
|
|
||||||
created_at: to_iso(asset.created_at),
|
|
||||||
download,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn asset_disposition(asset: &DocumentAsset) -> Option<String> {
|
|
||||||
let filename = asset.asset_type.clone();
|
|
||||||
inline_content_disposition(&filename)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn delete_asset(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
asset_id: Uuid,
|
|
||||||
) -> AppResult<()> {
|
|
||||||
diesel::delete(
|
|
||||||
document_assets::table
|
|
||||||
.filter(document_assets::id.eq(asset_id))
|
|
||||||
.filter(document_assets::tenant_id.eq(tenant_id)),
|
|
||||||
)
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn load_asset_responses_with_conn(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
version_id: Uuid,
|
|
||||||
) -> AppResult<Vec<DocumentAssetResponse>> {
|
|
||||||
let assets: Vec<DocumentAsset> = document_assets::table
|
|
||||||
.filter(document_assets::document_version_id.eq(version_id))
|
|
||||||
.filter(document_assets::tenant_id.eq(tenant_id))
|
|
||||||
.order(document_assets::created_at.asc())
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
Ok(assets.into_iter().map(to_asset_summary).collect())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn load_primary_assets(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
documents: &[Document],
|
|
||||||
) -> AppResult<HashMap<Uuid, (DocumentVersionResponse, Vec<DocumentAssetResponse>)>> {
|
|
||||||
if documents.is_empty() {
|
|
||||||
return Ok(HashMap::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut doc_to_version: HashMap<Uuid, Uuid> = HashMap::with_capacity(documents.len());
|
|
||||||
let mut version_ids: Vec<Uuid> = Vec::with_capacity(documents.len());
|
|
||||||
for doc in documents {
|
|
||||||
doc_to_version.insert(doc.id, doc.current_version_id);
|
|
||||||
version_ids.push(doc.current_version_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
version_ids.sort();
|
|
||||||
version_ids.dedup();
|
|
||||||
|
|
||||||
let versions: Vec<DocumentVersion> = document_versions::table
|
|
||||||
.filter(document_versions::id.eq_any(&version_ids))
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
let mut version_map: HashMap<Uuid, DocumentVersion> = HashMap::new();
|
|
||||||
for version in versions {
|
|
||||||
version_map.insert(version.id, version);
|
|
||||||
}
|
|
||||||
|
|
||||||
let assets: Vec<DocumentAsset> = document_assets::table
|
|
||||||
.filter(document_assets::document_version_id.eq_any(&version_ids))
|
|
||||||
.order((
|
|
||||||
document_assets::document_version_id.asc(),
|
|
||||||
document_assets::created_at.asc(),
|
|
||||||
))
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
let mut assets_by_version: HashMap<Uuid, Vec<DocumentAssetResponse>> = HashMap::new();
|
|
||||||
for asset in assets {
|
|
||||||
let version_id = asset.document_version_id;
|
|
||||||
let response = to_asset_summary(asset);
|
|
||||||
assets_by_version
|
|
||||||
.entry(version_id)
|
|
||||||
.or_default()
|
|
||||||
.push(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut result: HashMap<Uuid, (DocumentVersionResponse, Vec<DocumentAssetResponse>)> =
|
|
||||||
HashMap::with_capacity(doc_to_version.len());
|
|
||||||
for (doc_id, version_id) in doc_to_version {
|
|
||||||
if let Some(version) = version_map.remove(&version_id) {
|
|
||||||
let assets = assets_by_version.remove(&version_id).unwrap_or_default();
|
|
||||||
result.insert(doc_id, (to_version_response(version), assets));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn derive_document_title(original: &str) -> String {
|
|
||||||
let trimmed = original.trim();
|
|
||||||
if trimmed.is_empty() {
|
|
||||||
return "Document".to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
let stem = FsPath::new(trimmed)
|
|
||||||
.file_stem()
|
|
||||||
.and_then(|s| s.to_str())
|
|
||||||
.map(|s| s.trim())
|
|
||||||
.filter(|s| !s.is_empty())
|
|
||||||
.map(|s| s.to_string());
|
|
||||||
|
|
||||||
stem.unwrap_or_else(|| trimmed.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn filename_with_retained_extension(title: &str, current_filename: &str) -> String {
|
|
||||||
let extension = FsPath::new(current_filename)
|
|
||||||
.extension()
|
|
||||||
.and_then(|ext| ext.to_str());
|
|
||||||
|
|
||||||
if let Some(ext) = extension {
|
|
||||||
if title
|
|
||||||
.rsplit_once('.')
|
|
||||||
.map(|(_, existing_ext)| existing_ext.eq_ignore_ascii_case(ext))
|
|
||||||
.unwrap_or(false)
|
|
||||||
{
|
|
||||||
title.to_string()
|
|
||||||
} else {
|
|
||||||
format!("{title}.{ext}")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
title.to_string()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,121 +0,0 @@
|
|||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use chrono::Utc;
|
|
||||||
use diesel::prelude::*;
|
|
||||||
use serde::Serialize;
|
|
||||||
use serde_json::Value;
|
|
||||||
use utoipa::ToSchema;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::error::{AppError, AppResult};
|
|
||||||
use crate::models::{Correspondent, DocumentCorrespondent, NewDocumentCorrespondent};
|
|
||||||
use crate::schema::{correspondents, document_correspondents, documents};
|
|
||||||
use crate::utils::time::to_iso;
|
|
||||||
|
|
||||||
#[derive(Serialize, Clone, ToSchema)]
|
|
||||||
pub struct DocumentCorrespondentResponse {
|
|
||||||
pub id: Uuid,
|
|
||||||
pub name: String,
|
|
||||||
#[schema(value_type = Object)]
|
|
||||||
pub metadata: Value,
|
|
||||||
pub assigned_at: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn normalize_correspondent_ids(ids: &[Uuid]) -> AppResult<Vec<Uuid>> {
|
|
||||||
let mut unique: Vec<Uuid> = ids.iter().copied().collect();
|
|
||||||
unique.sort_unstable();
|
|
||||||
unique.dedup();
|
|
||||||
|
|
||||||
if unique.is_empty() {
|
|
||||||
return Err(AppError::bad_request(
|
|
||||||
"assignments must contain at least one correspondent",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(unique)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn insert_document_correspondents(
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
document_id: Uuid,
|
|
||||||
user_id: Uuid,
|
|
||||||
correspondent_ids: &[Uuid],
|
|
||||||
) -> AppResult<usize> {
|
|
||||||
let ids = normalize_correspondent_ids(correspondent_ids)?;
|
|
||||||
|
|
||||||
let existing: Vec<Uuid> = correspondents::table
|
|
||||||
.filter(correspondents::id.eq_any(&ids))
|
|
||||||
.filter(correspondents::tenant_id.eq(tenant_id))
|
|
||||||
.select(correspondents::id)
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
if existing.len() != ids.len() {
|
|
||||||
return Err(AppError::bad_request(
|
|
||||||
"one or more correspondents do not exist",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
let new_rows: Vec<NewDocumentCorrespondent> = ids
|
|
||||||
.into_iter()
|
|
||||||
.map(|correspondent_id| NewDocumentCorrespondent {
|
|
||||||
document_id,
|
|
||||||
correspondent_id,
|
|
||||||
assigned_by: Some(user_id),
|
|
||||||
tenant_id,
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
if new_rows.is_empty() {
|
|
||||||
return Ok(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
let inserted = diesel::insert_into(document_correspondents::table)
|
|
||||||
.values(&new_rows)
|
|
||||||
.on_conflict_do_nothing()
|
|
||||||
.execute(conn)?;
|
|
||||||
|
|
||||||
if inserted > 0 {
|
|
||||||
diesel::update(
|
|
||||||
documents::table
|
|
||||||
.find(document_id)
|
|
||||||
.filter(documents::tenant_id.eq(tenant_id)),
|
|
||||||
)
|
|
||||||
.set(documents::updated_at.eq(Utc::now().naive_utc()))
|
|
||||||
.execute(conn)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(inserted)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn load_correspondents_for_documents(
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
document_ids: &[Uuid],
|
|
||||||
) -> AppResult<HashMap<Uuid, Vec<DocumentCorrespondentResponse>>> {
|
|
||||||
if document_ids.is_empty() {
|
|
||||||
return Ok(HashMap::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
let rows: Vec<(DocumentCorrespondent, Correspondent)> = document_correspondents::table
|
|
||||||
.inner_join(correspondents::table)
|
|
||||||
.filter(document_correspondents::document_id.eq_any(document_ids))
|
|
||||||
.order((
|
|
||||||
document_correspondents::document_id.asc(),
|
|
||||||
document_correspondents::assigned_at.asc(),
|
|
||||||
))
|
|
||||||
.load(conn)?;
|
|
||||||
|
|
||||||
let mut map: HashMap<Uuid, Vec<DocumentCorrespondentResponse>> = HashMap::new();
|
|
||||||
for (assignment, correspondent) in rows {
|
|
||||||
map.entry(assignment.document_id)
|
|
||||||
.or_default()
|
|
||||||
.push(DocumentCorrespondentResponse {
|
|
||||||
id: correspondent.id,
|
|
||||||
name: correspondent.name,
|
|
||||||
metadata: correspondent.metadata,
|
|
||||||
assigned_at: to_iso(assignment.assigned_at),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(map)
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
use diesel::dsl::exists;
|
|
||||||
use diesel::prelude::*;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::error::AppResult;
|
|
||||||
use crate::schema::folders;
|
|
||||||
use crate::utils::validation::ensure_exists;
|
|
||||||
|
|
||||||
pub fn ensure_folder_exists_on_conn(
|
|
||||||
conn: &mut PgConnection,
|
|
||||||
tenant_id: Uuid,
|
|
||||||
folder_id: Uuid,
|
|
||||||
) -> AppResult<()> {
|
|
||||||
let exists: bool = diesel::select(exists(
|
|
||||||
folders::table
|
|
||||||
.filter(folders::id.eq(folder_id))
|
|
||||||
.filter(folders::tenant_id.eq(tenant_id)),
|
|
||||||
))
|
|
||||||
.get_result(conn)?;
|
|
||||||
ensure_exists(exists, "folder")
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
use serde_json::{map::Entry, Map, Value};
|
|
||||||
|
|
||||||
use crate::error::{AppError, AppResult};
|
|
||||||
|
|
||||||
pub fn merge_document_metadata(existing: Value, updates: Value) -> AppResult<Value> {
|
|
||||||
let mut base = match existing {
|
|
||||||
Value::Object(map) => map,
|
|
||||||
Value::Null => Map::new(),
|
|
||||||
_ => {
|
|
||||||
return Err(AppError::bad_request(
|
|
||||||
"existing metadata is not an object; set replace=true to overwrite",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let incoming = match updates {
|
|
||||||
Value::Object(map) => map,
|
|
||||||
_ => {
|
|
||||||
return Err(AppError::bad_request(
|
|
||||||
"metadata value must be a JSON object when replace is false",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
merge_metadata_maps(&mut base, incoming);
|
|
||||||
Ok(Value::Object(base))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn merge_metadata_maps(target: &mut Map<String, Value>, updates: Map<String, Value>) {
|
|
||||||
for (key, value) in updates {
|
|
||||||
match target.entry(key) {
|
|
||||||
Entry::Occupied(mut entry) => {
|
|
||||||
let existing = entry.get_mut();
|
|
||||||
match value {
|
|
||||||
Value::Object(update_map) => {
|
|
||||||
if let Value::Object(existing_map) = existing {
|
|
||||||
merge_metadata_maps(existing_map, update_map);
|
|
||||||
} else {
|
|
||||||
*existing = Value::Object(update_map);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
other => {
|
|
||||||
*existing = other;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Entry::Vacant(entry) => {
|
|
||||||
entry.insert(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
pub mod asset;
|
|
||||||
pub mod correspondents;
|
|
||||||
pub mod folders;
|
|
||||||
pub mod metadata;
|
|
||||||
pub mod ordering;
|
|
||||||
pub mod relations;
|
|
||||||
pub mod search;
|
|
||||||
pub mod tags;
|
|
||||||
|
|
||||||
pub use ordering::{DocumentSortField, SortDirection};
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use utoipa::ToSchema;
|
|
||||||
|
|
||||||
pub const UNICODE_COLLATION_NAME: &str = "unicode_ci";
|
|
||||||
pub const UNICODE_COLLATION_LOCALE: &str = "und-u-ks-level2";
|
|
||||||
|
|
||||||
const TITLE_ASC: &str = "title COLLATE \"unicode_ci\" ASC";
|
|
||||||
const TITLE_DESC: &str = "title COLLATE \"unicode_ci\" DESC";
|
|
||||||
const ISSUED_AT_ASC: &str = "issued_at ASC NULLS LAST";
|
|
||||||
const ISSUED_AT_DESC: &str = "issued_at DESC NULLS LAST";
|
|
||||||
const CREATED_AT_ASC: &str = "created_at ASC";
|
|
||||||
const CREATED_AT_DESC: &str = "created_at DESC";
|
|
||||||
const UPDATED_AT_ASC: &str = "updated_at ASC";
|
|
||||||
const UPDATED_AT_DESC: &str = "updated_at DESC";
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum DocumentSortField {
|
|
||||||
Title,
|
|
||||||
IssuedAt,
|
|
||||||
CreatedAt,
|
|
||||||
UpdatedAt,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for DocumentSortField {
|
|
||||||
fn default() -> Self {
|
|
||||||
DocumentSortField::Title
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize, ToSchema)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub enum SortDirection {
|
|
||||||
Asc,
|
|
||||||
Desc,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for SortDirection {
|
|
||||||
fn default() -> Self {
|
|
||||||
SortDirection::Asc
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn ordering_clauses(
|
|
||||||
field: DocumentSortField,
|
|
||||||
direction: SortDirection,
|
|
||||||
) -> (&'static str, Option<&'static str>) {
|
|
||||||
match (field, direction) {
|
|
||||||
(DocumentSortField::Title, SortDirection::Asc) => (TITLE_ASC, None),
|
|
||||||
(DocumentSortField::Title, SortDirection::Desc) => (TITLE_DESC, None),
|
|
||||||
(DocumentSortField::IssuedAt, SortDirection::Asc) => (ISSUED_AT_ASC, Some(TITLE_ASC)),
|
|
||||||
(DocumentSortField::IssuedAt, SortDirection::Desc) => (ISSUED_AT_DESC, Some(TITLE_ASC)),
|
|
||||||
(DocumentSortField::CreatedAt, SortDirection::Asc) => (CREATED_AT_ASC, Some(TITLE_ASC)),
|
|
||||||
(DocumentSortField::CreatedAt, SortDirection::Desc) => (CREATED_AT_DESC, Some(TITLE_ASC)),
|
|
||||||
(DocumentSortField::UpdatedAt, SortDirection::Asc) => (UPDATED_AT_ASC, Some(TITLE_ASC)),
|
|
||||||
(DocumentSortField::UpdatedAt, SortDirection::Desc) => (UPDATED_AT_DESC, Some(TITLE_ASC)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
use crate::documents::correspondents::{
|
|
||||||
load_correspondents_for_documents, DocumentCorrespondentResponse,
|
|
||||||
};
|
|
||||||
use crate::documents::tags::load_tags_for_documents;
|
|
||||||
use crate::error::AppResult;
|
|
||||||
use crate::models::Tag;
|
|
||||||
use crate::state::PgPooledConnection;
|
|
||||||
|
|
||||||
/// Loads tags and correspondents for the provided documents in a single pass.
|
|
||||||
pub fn load_tags_and_correspondents(
|
|
||||||
conn: &mut PgPooledConnection,
|
|
||||||
document_ids: &[Uuid],
|
|
||||||
) -> AppResult<HashMap<Uuid, (Vec<Tag>, Vec<DocumentCorrespondentResponse>)>> {
|
|
||||||
if document_ids.is_empty() {
|
|
||||||
return Ok(HashMap::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
let tags_map = load_tags_for_documents(conn, document_ids)?;
|
|
||||||
let mut correspondents_map = load_correspondents_for_documents(conn, document_ids)?;
|
|
||||||
|
|
||||||
let mut result = HashMap::with_capacity(document_ids.len());
|
|
||||||
for id in document_ids {
|
|
||||||
let tags = tags_map.get(id).cloned().unwrap_or_default();
|
|
||||||
let correspondents = correspondents_map.remove(id).unwrap_or_default();
|
|
||||||
result.insert(*id, (tags, correspondents));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user