Repository navigation
Team spaces page in the web admin (after P1-5) - #62
Open
Skyfuller1303 wants to merge 227 commits into
Open
Skyfuller1303 wants to merge 227 commits into
Skyfuller1303 wants to merge 227 commits into
Conversation
`craft-cloud-server healthcheck [--addr 127.0.0.1:8080]` sends GET /api/info over a plain TcpStream and exits 0 only on a 200 status line, within 3 s. Otherwise it exits 1 with one line on stderr. It prints nothing on stdout and adds no dependency. A container image without a shell or curl can use it as its health check. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…ment packaging/docker holds a Dockerfile (Debian trixie build, distroless cc runtime as uid 65532, base images pinned by digest) and a Compose deployment: the server behind Caddy for TLS (acme, internal or custom certificates), with SQLite and the local disk by default and overlays for Postgres and S3. Secrets never reach a service's environment. A one-shot secrets-init service renders config.toml from a template and writes the secret files into a volume; every other service mounts only its own directory read-only. Every service has a read-only root, no capabilities and no-new-privileges. Caddy has a fixed address that the config lists in trusted_proxies. install.sh writes .env with random passwords, builds the image, starts the stack and creates the first admin from a password read on stdin. The Docker section in docs/server.md covers use, TLS, Postgres, S3, upgrading and what is not covered. The Dockerfile uses the healthcheck subcommand. Derived from the deployment in Skyfuller1303/craftcloud (deploy/compose), written by the same author, MIT OR Apache-2.0, adapted to this repository's TOML-only configuration. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Migration 0007 gives a device its client kind, platform and app version and, once revoked, the time and the reason, and gives a user the time of the last password change (plus a disabled time nothing reads yet). All of it is additive, BIGINT on Postgres, and the flag stays the check. Meta gets create_device_with and redeem_with, rename_device, revoke_device_as, revoke_other_devices, revoke_all_devices, account, change_password and reset_password. Flag, time and reason are set together and only by the first revoke. A password change or reset sets the hash, revokes the devices and deletes the account's invite and pairings in one transaction. Tests run on both databases, including the migration from 0006. Co-Authored-By: Claude <noreply@anthropic.com>
New: GET /account, POST /account/password, PATCH /devices/{id} and
POST /devices/revoke-others. Sign-in and join take an optional client
kind, platform and app version, checked before a try is counted. The
device list shows them with the time and reason of a revoke; all new
fields are optional on the wire.
Changing the password answers a wrong current password with 403
wrong_password, never 401, since the agent reads every 401 on a
signed-in route as a revoked device. It is limited to five tries per
account in 15 minutes, takes a password-check slot, and ends the revoked
devices' live connections at once. Password and name bodies are read up
to the new TINY_JSON_BYTES (4 KiB).
wrong_password and forbidden move into the shared error codes; the local
API refers to them. The agent, app and desktop only change where they
build the extended types.
Co-Authored-By: Claude <noreply@anthropic.com>
user reset-password now revokes every device of the account (reason reset) and deletes its open invite and pairings, so a stolen token does not outlive the old password. --keep-devices restores the old behaviour for the devices. device revoke-all signs out an account's devices without touching the password. Both print how many devices they ended; device revoke records the admin as the reason. Co-Authored-By: Claude <noreply@anthropic.com>
The API table and error codes in the design document, the password and sign-out commands, the live-connection delay of the command line and the rollout note (an older server refuses the newer database) in the server guide. Co-Authored-By: Claude <noreply@anthropic.com>
…evice A /changes long-poll that was waiting when its device was signed out through the API now ends at once, and one that wakes for any other reason looks the device up again before it answers, so a device signed out by the command line gets 401 instead of the next change set. The live endpoint listens for revocations and looks the device up before the upgrade, so a revoke between the sign-in check and the subscription is not missed. Co-Authored-By: Claude <noreply@anthropic.com>
change_password checks, inside its transaction, that the calling device is still signed in (it may have been revoked while the password was hashed) and answers 401 if not. A password that changed meanwhile is now 409 conflict instead of 400 invalid. Both are new MetaError variants mapped in the server. set_password_hash had no caller outside a test and is removed. A new test breaks the pairing deletes with a trigger and checks that a password change, an admin reset and a revoke-others undo everything on SQLite and Postgres. Co-Authored-By: Claude <noreply@anthropic.com>
The request used bare line feeds instead of CRLF, and an answer that is not HTTP at all was reported as a bad status. Send CRLF line endings and report "not an HTTP answer" unless the first word is an HTTP version. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The long-poll now listens for revocations and looks its device up before it waits, so a revoke between the sign-in check and the wait is not missed, and looks it up once more after the change set is fetched, as the last step before the answer, so a revoke during the fetch is not answered with changes. Co-Authored-By: Claude <noreply@anthropic.com>
…changes a password change_password locked the caller's device row and then the user's row, while revoke_other_devices from another device locked its own device and then the user's, and reset_password locked the user before the devices. On Postgres two of them at once could deadlock and fail with a database error. All of them now take the user's row first (a no-op update), then the devices, then the pairings. A new scenario runs password changes, sign-outs and an admin reset at the same moment, over and over, on both databases and expects only successes, conflicts and signed-out callers. The test trigger helper also drops its Postgres function. Co-Authored-By: Claude <noreply@anthropic.com>
An answer that stopped inside the status line ("HTTP/1.1 200" and then EOF) or
filled the 64 byte buffer without a line end counted as healthy or as a bad
status. Now only a status line that ends in CRLF is read, and the other cases
are errors. Tests cover a truncated line, a line that does not end and a bare
line feed.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
When the server is down, Caddy's error log entry for a failed request carried the full request URI and headers, so an invite code (/join/<code>), a query or a bearer token could end up in the log. The default log now drops request>uri and request>headers. Caddy also skips installing its internal CA into the container, which only produced an error line. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
db-init exported PGPASSWORD, which put the superuser password in the environment of the shell and of psql. It now writes a mode 0600 password file on a tmpfs, passes only PGPASSFILE and removes the file on exit. The db-init service gets a small noexec tmpfs for it. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…docs The server started before Caddy and was given 172.29.215.2, the address reserved for Caddy, so Caddy failed to start. The frontend network now hands out dynamic addresses from CC_FRONTEND_POOL (the upper half by default). The docs name the new setting, the error of a data directory with the wrong owner and what was tried with S3. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
render-config.sh read only the first line of a secret file, so a database password with a second line passed the check while db-init, which reads the whole file, set a different password than the one in config.toml. The whole file is read now, one trailing line feed is allowed and any other line feed is refused. The tests cover a second line, an empty second line and the allowed trailing line feed. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Compose gives a container its secrets from .env when it is created. After `docker compose run --rm secrets-init`, a later `up -d db-init` started the original secrets-init container again, which wrote the old values back. The docs and the script comment now say to recreate it (`up -d --force-recreate secrets-init`) before restarting the services that read the files. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
…-in adds a device redeem consumed the invite and then updated the user, while a password reset locks the user and then deletes the invite, so the two could deadlock on Postgres. redeem now finds the invite or pairing with a plain read, locks the account, and consumes the code again under the lock; a code that is gone by then is invalid_code. create_pairing locks the account first too. A password sign-in verified the password outside any transaction, so a reset or change that committed meanwhile could be followed by a new device. sign_in_device locks the account and compares the stored hash again before it creates the device; if it differs, login answers as for a wrong password. New scenarios run redeems, a sign-in, a pairing and a reset at the same moment on both databases and expect no database error and no live device once the reset is done. Co-Authored-By: Claude <noreply@anthropic.com>
The invite delete and the pairing update now name the account the plain read found, so a code hash removed and made again for another account between that read and the lock is refused as invalid_code instead of adding a device to the wrong account. Co-Authored-By: Claude <noreply@anthropic.com>
The admin API's server overview shows whether blobs are on disk, in S3 or in memory. A backend that does not say is reported as other, so nothing outside the store crate has to change. Co-Authored-By: Claude <noreply@anthropic.com>
New request and answer types for the routes under /api/v1/admin, with a redacting Debug for everything that holds a password or a code, and the error codes account_disabled and last_admin. The confirmation is a body with an optional password today, so an optional totp_code can join it later without breaking a client. Co-Authored-By: Claude <noreply@anthropic.com>
Migration 0008 adds the purpose of an invite (invite or reset), a quota per space and a removal mark per user. The new Meta methods for the admin API each re-check the acting admin inside their own transaction and take the locks in one order, with a transaction-wide lock before the last-admin count. Disabled accounts are refused by the token check, sign-in, redeem, pairing and device creation, decided under the account's row lock. A reset code always sets a new password, signs every device out and then signs the redeeming computer in. A space's quota replaces the server-wide cap in the preflight check and in the count that follows. Co-Authored-By: Claude <noreply@anthropic.com>
The require_admin layer and the routes under /api/v1/admin: counters, a paged and searchable user list, creating accounts, changing role and quota, disabling, enabling and removing, invites, password reset codes and a user's devices. Every change asks for the acting admin's password in its body. Sign-in and join answer account_disabled for a disabled account, and a redeemed reset code ends the live connections of the devices it signed out. Documents the API, the confirmation and the rollout in the design document and the server guide. Co-Authored-By: Claude <noreply@anthropic.com>
Limiter::count added the attempt before comparing it with the maximum, so tries refused at the limit still raised the count. A refund of an attempt that had been accepted at the same moment then left the key above its limit with fewer wrong passwords than allowed. A refused try now leaves the count alone. Co-Authored-By: Claude <noreply@anthropic.com>
Disabling and enabling an account leaves the password hash as it was, so a sign-in that verified the password before the disable could still create a usable device after the enable. Users get an auth_gen counter (migration 0008) that a disable, an enable, a removal and every password change or reset bump. The sign-in reads it with the hash and sign_in_device compares both under the account's lock. The server's refunds test covers the limiter change. Co-Authored-By: Claude <noreply@anthropic.com>
Compaction asks a replica for a snapshot of a live document at an older version. Loro's SnapshotAt export checks the document out at that version, and on a long text history that needs many GiB: the live_documents test an_app_that_misbehaves_is_refused_or_dropped_and_the_rest_go_on, whose app sends 60 updates of 200,000 characters, ran out of a 16 GiB limit (itrycodinganditsbad#15). snapshot_at now exports the operations up to the version, imports them into a fresh document and takes that document's snapshot: the same history and state, with memory linear in the history. A version whose operations need others past it is refused instead of silently widened, a shallow document is refused at once (Loro can't fork one at a version), and a scratch document that Loro panicked in is let go of without being dropped. Co-Authored-By: Claude <noreply@anthropic.com>
The typed details of a security event, an event, a page of them and the last line of the NDJSON export. Every field of the details is a closed list of words or a number, and fields a later release adds are ignored. Co-Authored-By: Claude <noreply@anthropic.com>
Migration 0009 adds audit_events, with no foreign keys so that an event outlives its account. Every change that the log names writes its event in its own transaction before the commit, so a change whose event cannot be written is not made. A change that changes nothing writes none. A failed sign-in is one row per account and minute whose counter goes up, written in a transaction of its own. The values of an event are typed and come from closed lists, never from what a client typed. Old events are pruned in batches outside those transactions. Meta methods that had no way to say who asked get one: revoke_device_by takes the origin, and admin_enable_user and admin_revoke_invite take the time. Co-Authored-By: Claude <noreply@anthropic.com>
GET /account/activity, GET /admin/audit and the streamed GET /admin/audit/export; a failed sign-in is written after the answer is decided and never changes it. [audit] retention_days (1 to 3650, default 365) and audit list and audit prune on the command line. The export reads fixed pages through a bounded channel up to a fixed end of the log and ends with a line that says complete or truncated, or breaks the connection. Co-Authored-By: Claude <noreply@anthropic.com>
…p the epoch off the layer's refusals On Postgres a guarded upload took FOR SHARE on the space's row and then updated the same row to charge the bytes, so two concurrent uploads to one team space deadlocked (40P01, answered as a 500). The guard now takes FOR NO KEY UPDATE, the strength the write needs anyway; a test starts two guarded uploads together, many times, and fails with the old lock. The space layer's own 404 and 403 no longer carry the personal space's craft-epoch, which said nothing true about the requested space. The malformed-header answer without an echo is documented.
GET /spaces lists an account's spaces with its invitations (an archived space for its owners only). Invitations are
accepted or declined; an owner invites (30 a minute per account), changes roles and removes members, members leave; the
last owner stays (409 last_owner). Members and usage are readable by members. PATCH /spaces/{id} renames (an owner) and
sets the limit (an administrator); owners archive and unarchive with their password.
For administrators: POST and GET /admin/spaces, archive and unarchive, and PUT .../owner for a space whose owners are gone.
An administrator who is not an owner carries the usual confirmation on the member routes and has no access to the files.
Every change calls Notifier::members_changed so waiting long-polls re-read their access, and so do disabling and removing
an account. GET /space gains kind, name and role. GET /account/activity also shows events that name the account.
The command line gains space create, list, members, add and archive (cli.space_archived is a new audit name), and
reset-epoch --space. The meta store gains set_owner_accepted, rename, archive and limit changes, user_spaces and the
administrator's list.
…he review findings of the space routes A member whose role is too low inside the change's transaction is read_only, not forbidden. An invitation to an archived space can be neither accepted nor declined. One PATCH checks its name and limit before it writes. The invitation limit's Retry-After rounds up, a space name shaped like a space ID is refused, the command line accepts a pending invitation when it sets a role, a confirming administrator who owns a space acts as an administrator, and the administrator's search is folded text instead of a validated name. Disabling or removing an account over the admin pages wakes its spaces' long-polls.
A viewer's engine applies the server's changes and sends nothing. A local edit is kept and listed, never overwritten (a changed server version lands under the original name and the edit stays as a conflict copy); a new local file stays local; a file or folder deleted here that the server still has is downloaded again and reported. The first read_only refusal switches the engine over within the same pass, with no retry; while read-only it asks for the role once per pass and resumes uploads when the role reaches editor. The agent's HTTP transport maps 403 read_only, can be bound to a team space with the craft-space header, and the pass summary says when a space is read-only.
…ed pushes as they happened Review fixes of the read-only mode. A tracked folder whose place holds a file or a link (or whose parent does) is the user's: nothing that was in it is put back through it, and nothing is moved aside to make room. A folder put back is reported once, as restored. A read-only pass no longer reads every edited file each time: a different size says "edited" without reading, and the answer for the same size is kept per file while its size, time and ID and the agreed content stay the same. A refusal in a later batch keeps what the committed batches did in the report; content sent for files no commit took is not reported as uploaded. The two limits that stay (a delete held after the role rises, a swapped tracked file not listed) are written down in the code.
…r each
The agent looks at GET /spaces (at the start, every two long-poll waits, and
after an invitation is answered here or a space answers 404) and syncs the team
spaces the person turns on. A team space syncs to Craft Cloud Shared/<name>/
beside the personal folder; the name goes through the node name rules and a
clash is numbered. Syncing is off for an accepted space until
POST /v1/spaces/{id}/sync.
Each synced space has its own session (state in spaces/<id>/state.json, root,
marker, guards), scheduler, folder watcher and long-poll, over a transport
bound to the space that refuses an answer without the space's echo. Passes run
one at a time across the spaces and the personal space. A viewer or archived
space runs read-only before its first write. A space the server no longer lists
stops syncing and is reported as no access, with its folder, marker and state
left alone.
Local API: GET /v1/spaces, accept and decline passed on to the server, sync on
or off, and spaces in GET /v1/status; craft-cloud-app has the calls. A server
of protocol 1 is asked about its version only and never sent craft-space.
account.json keeps its bytes until there is a team space.
Review fix of the agent's team spaces (M2). GET /spaces listed an archived space to its owners only, so an editor or viewer saw it vanish and the agent told them they had lost access, although an archived space still gives its members read access (the role is capped at viewer). It now stays in the list of every accepted member, marked archived, so the agent syncs it read-only. An invitation to an archived space is still not listed. The route test checks the member's view of an archived space.
…ess, approve its deletes, stop and pause cleanly
Review fixes of the agent's team spaces.
state.json of a team space records the space and the canonical folder it was
made for and is used for that pair only; for another folder the space starts
afresh as a first sync, which merges and deletes nothing on either side. Moving
a syncing space to another folder, or turning it off, now closes its session
and waits until the pass thread has let go of it before the state is removed or
the new folder is set up, and the thread reopens a session whose folder
changed. Signing out removes the team spaces' states as it removes the personal
one.
A space that was lost drops its state once its session is closed, so regained
access merges the folder with the space instead of resuming: a delete made here
meanwhile is not sent, a delete made on the server does not remove a local
file, and differing content becomes a conflict copy.
sync --approve-deletes[=SET] --space ID_OR_NAME and POST
/v1/spaces/{id}/approve-deletes write spaces/<id>/approval.json under the
personal space's rules; craft-cloud-app has approve_space_deletes.
A second stop no longer waits for the team passes: no queued team pass starts
and their thread is not joined. Pausing ends the team long-polls and resuming
starts them. One 404 for /spaces from a server that said protocol 2 is a
failed look, not the end of team spaces. The Debug output of SpaceRun leaves out
the words of no_access, and the log names a renamed space by its ID.
GET /spaces gives an accepted member of a team space joined_ms, the time they accepted their membership. It stays while they are a member (a role change does not move it) and is new when they are removed and invited again, so a client can tell that its access was interrupted. A personal space and an invitation have none, and the field is optional for older servers and clients.
…access, and never block the spaces task Turning a team space's sync off now forgets its saved state, so turning it on again, in the same folder or another, is a first sync: nothing is deleted on either side and differing files become conflict copies. The agent records the server's joined_ms of the space in its state and does not use a state made under another stamp (or without one while the server gives one). That covers an agent that was not running while access was lost and regained. A server without the field keeps the earlier behaviour, and a running session whose stamp changes is reopened. Closing a space's session no longer holds the spaces task for up to 50 seconds: the change is answered when the session is closed, other spaces, the local API and a second Ctrl-C go on meanwhile, a pass queued before the space was closed does not run, and a second change of the same space meanwhile is refused with 409. Someone waiting for the list after an accept or decline is kept waiting through a failed discovery, which is tried again after three seconds (fifteen at most). A second stop is told apart from a pass thread that is gone. The module doc and docs/agent.md say what a first sync does: files deleted on the server meanwhile are uploaded again, files that differ become conflict copies, and an archived space is listed with the member's stored role. The hunks of these changes share spaces.rs, cli.rs and the test file, so they are one commit. This commit also adds joined_ms to the agent's test helper that builds a list item.
…keep a space off when the agent stops during its turn-off Turning a team space on waited for the pass thread to close its session even when the space had none. The thread works through its queue in order, so the wait sat behind whatever it did for another space, a first sync of minutes or a pass parked behind the personal one, and ran out after 50 seconds with a message about a pass of a space that never ran. The wait now only happens for a space that has a session here or a pass under way: nothing else can write its state, and an older Close of the space is ahead of any new pass of it in the queue. The message for a pass that has not ended in time no longer claims more than that. A stop while a space waited to be turned off dropped the change but not the queued forgetting of its state, so the space synced again as a first sync at the next start. The spaces task now saves the turn-off before it ends.
…ession opened A session compared the space's folder with its saved state only when it opened. If the synced folder was a link or junction and was pointed at another folder of the same space while the session was open, the next pass followed the link with the first folder's state in memory, took the files the other folder lacked for deleted and sent the deletions to the server. The session now remembers the canonical path and the folder ID it opened on, and the pass thread compares them before every pass. When they differ the session is dropped, the saved state is removed (a failure to remove it fails the pass), and the space starts afresh in the folder as a first sync, which merges and deletes nothing on either side. A folder that cannot be looked at (gone, drive unmounted) is not treated as moved; the pass reports what is wrong with it.
…emoved Turning a team space off removes its saved state once the session is closed. The pass thread logged a failure to remove it, such as a Windows reader holding the file without delete sharing, and acknowledged the close anyway, so the turn-off succeeded with the old state still on disk. Turning the space on again in the same marked folder then trusted that state, and files the user had deleted meanwhile were sent to the server as deletions. Each team space's setting now has a generation, saved in account.json, and a saved state records the generation it was made under; a state under another generation is not used. A turn-off raises and saves the generation before the state is retired, so a state that survives its removal is never trusted again, and a failure to remove it is carried back to the caller: the change fails with the error instead of reporting success. Losing access raises the generation too.
…stalled Setting up a team folder that has no marker writes the marker and then removes the space's saved state. If the agent stopped between the two, for a folder that was wiped and made again at the same path, the old state survived next to a valid marker; the account still pointed at the folder with syncing on, the canonical path and membership matched, and at the next start the files the old state knew were taken for deleted and sent to the server. The set-up now raises and saves the space's generation before it writes the marker, so a state made under the earlier generation is never trusted for the folder, however the set-up ends. A test hook stops the set-up right after the marker, as a crash would.
…e path The folder identity a session compares with (canonical path and folder ID) lived only in memory. A saved state recorded the path alone, so once the session was gone, from a restart, a pass that stopped because the folder was missing, or a failed cleanup of a moved folder, a folder restored from a backup at the same path (with its marker but without the newer files) got the old state back and the files it lacked were sent to the server as deletions. state.json now records the folder ID next to the path, and a state is used only for a folder with the same ID; a state without an ID is not trusted when the folder has one. A session takes one look at the folder for both the state it chooses and what it compares with later. When the pass thread finds that the folder leads somewhere else than the session opened on, it tells the spaces task, which raises and saves the space's generation, so a state that cannot be removed is not trusted again either; that pass is not run and the next one starts afresh.
…sends deletions The folder was compared with the one the session opened on only before a pass. A link or junction pointed at another folder while the pass was already under way made it read the new folder with the old state in memory, and the files the new folder lacked were taken for local deletions and sent to the server. The engine saves the state just before it sends a batch with deletions, and the session's checkpoint now compares the folder with the one it opened on first: if it differs the pass stops there, nothing is sent or saved of what it saw, and the next pass starts afresh in the folder.
…syncs until it is Raising a space's generation (on access lost, on a replaced folder, on a turn-off) changed it in memory first and saved account.json after. When the save failed, which was only logged for a lost space, a restart before any later save found the old generation on disk and trusted a state that was meant to be dropped if the removal of that state had failed too. A raise that could not be saved is now remembered and saved again at every look at the list, and no space is started until it is saved; running syncs are not stopped, their state is valid. The module doc and docs/agent.md say so, and the docs also describe the folder check before deletions and the folder ID.
…very commit When the folder check stopped a pass, the session stayed open with an engine state that had taken in part of the other folder (a server file written into it, deletions noted after its scan), and the pass's end saved that state under the original folder's identity. If the link was pointed back before the next pass, the check passed again and the file the first folder never received was taken for deleted and removed on the server. The check now poisons the session when it trips, and the end of a pass compares the folder once more and saves nothing if it moved; the pass thread then drops the session, removes the state and raises the generation. The engine also asks the same check before every commit of a push, not only before one with deletions, so no batch of any kind is sent after a retarget (Engine::on_guard).
A folder restored from a backup at the same path got the old state back whenever the file system gave it the same ID, which ext4 does when it reuses an inode number. The folder's .craft-cloud now carries a nonce that is rewritten with a new random value at every checkpoint and at the end of every pass, and the state saved with it records the same value. A state is used only for a folder that carries the nonce it recorded; a folder without one suits a state without one only, so states from before nonces are refused by a folder that has one, as with the folder ID. A crash between writing the nonce and the state costs a first-sync merge, which deletes nothing.
…nd say so When account.json could not be written after a generation was raised, no space was started until the save worked, and the only trace was a line in the run log. Only the affected spaces are held back now; other spaces start and sync as usual. A held-back space shows as stopped in its state, with the reason in words, in the local API's list and in the status.
The test expected 36 choices, but the page offers six groups and every name of the closed list in craft_cloud_app::AUDIT_ACTIONS, now 44. It counts them from the list, so adding an action no longer breaks it.
With links not followed, inotify watches a link given as the synced folder and not the folder behind it, so a local change in it raised no event and waited for the next periodic pass. The folder the link leads to is watched instead.
The watcher and the folder's roots were made once, when the space started. When a pass found that the folder leads somewhere else (a link pointed at another folder), only the generation was raised, so changes in the new folder raised no event. The space now makes its watcher and roots again on that event, under a new watcher generation.
List with search and paging, create, and a page for each space with its members (read only), limit, archive and unarchive, and naming an owner. Every change is CSRF-protected and asks for the administrator's confirmation, acts as the web session's administrator and wakes the space's long-polls.
The administrator's list of team spaces counted accepted owner rows without looking at the account, so a space whose only owner was disabled or marked for removal still showed one owner although nobody could manage it. The count now leaves those accounts out, and one query reads the owners of a page of spaces with the state of each account.
…s the owner before the confirmation The page warns when a space has no owner who can sign in and shows the state of each owner's account; the list reads its owners with one query. A mistyped owner name is refused before the administrator's code is used up, as on the accounts page. The long-poll test now covers the limit, archive, unarchive and owner changes.
This was referenced Nov 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge after #61 (P1-5). The diff of this PR alone: team-5-agent-spaces...team-7-web-admin.
P1-3 gave administrators JSON routes for team spaces. This adds the same to the browser: a Team spaces page in the admin pages under
/web. It is server-rendered HTML like the other pages (no script, one stylesheet), and it changes nothing for the agent or the app.What
GET /web/spaces?query&cursor: the team spaces by name with owners, members, used bytes against the limit, and active or archived. The search is folded text, at most 64 bytes, and 50 spaces make a page, as on the accounts page. Below the list, a form to make a space.POST /web/spacesmakes a team space (name,owneras an account name, optionalquota_mib) and goes to its page.GET /web/spaces/{id}: the space's numbers, its members with their roles and states (read only; owners manage members in the app, as the spec says), and four forms:POST …/quota: a whole number of MiB (at least 4), or "remove the limit";POST …/archiveand…/unarchive;POST …/owner: names an account as an accepted owner (set_owner_accepted). It does not remove other owners; the page says so.Originof the pages' own, and asks for the administrator's password (and a code with two-factor sign-in) with the sameconfirm_actoras the JSON routes. A change is redirected (303) to a page that says what happened; the?notice=words are a fixed list. Errors read as on the JSON routes:400for a bad name, limit or form,403for a wrong password or code or a bad token,404for an unknown account or space (a personal space is not a team space here),409for a taken name. Names and search text are escaped like everything else.create_team_space,set_space_quota,set_space_archived,set_owner_accepted,admin_list_spaces,admin_space,list_members). The administrator acts asSpaceActor::Admin(AdminActor)withAdminVia::Web, which already existed for the other pages; the transaction checks the session again as for every admin change. Audit events name the administrator and no device, as for the other pages. After each change the page callsNotifier::members_changed(space), so a long-poll waiting on the space looks at its access again, as after the JSON routes. The list reads the owners of its whole page with one query (Meta::space_owners).space_access), so a space whose only owner was disabled had nobody to manage it, yet the list counted one owner.SpaceSummary::owners(also inGET /admin/spaces) now counts only owners whose accounts can sign in. The page shows each owner's account state ("disabled", "marked for removal"), says "no active owner" in the list, and warns on the space's page to name one.create_userdoes, so a mistyped name does not use up a one-time or recovery code. The store still checks the account under its lock.docs/server.mddescribes the page. Disabling or removing an account over the pages already woke its spaces' long-polls (P1-3's review); that test stays and still passes.Checks
On Windows, through a memory-limited runner:
cargo fmt --all -- --checkcargo clippy --workspace --all-targets --locked -- -D warningscargo test -p craft-cloud-meta -p craft-cloud-api -p craft-cloud-server --lockedagainst Postgres 17 and SeaweedFS 4.48, withCRAFT_CLOUD_REQUIRE_BACKENDS=1cargo +1.95 check --workspace --all-targets --locked(MSRV)All passed. New page tests (each on SQLite and on Postgres): the pages and every write refused without a session, for a demoted administrator, with a missing, wrong or another session's CSRF token and from another origin; every write refused without, with an empty, with a wrong and with a too long password, and nothing changed; create, limit, archive, unarchive and owner with their success and error statuses (
400,404,409), repeating a change that changes nothing; list paging, search (including folded letters and%/_as literal text) and bad queries; one audit event per change, with the web administrator as actor and no device, none on a repeat; a long-poll ended by each of the limit, archive, unarchive and owner changes; a mistyped owner leaving the recovery code unused; a space whose owners are disabled or removed (meta, the JSON admin list and the page, on both backends); a code and a recovery code for an administrator with two-factor sign-in; escaping of names and the search box.Latest check of this head
Checked on Windows with Postgres 17, SeaweedFS 4.48 (S3) and
CRAFT_CLOUD_REQUIRE_BACKENDS=1under a 16 GiB memory limit at9da068c:cargo fmt --all -- --checkandcargo clippy --workspace --all-targets --locked -- -D warningspass;cargo test --workspace --locked --no-fail-fast: 1908 passed, 0 failed, 2 ignored.Note for the web style PR
The web admin style PR (#43) adds
aria-current="page"to the active navigation link, so the link to this page then reads<a href="/web/spaces" aria-current="page">Team spaces</a>on its own page. Whichever of the two lands second adjusts the test intests/web.rsthat expects the exact link.Not in this PR