From 45f72e9b56920b12e244b9a2dd1f6f6b6d30e3cd Mon Sep 17 00:00:00 2001 From: "Jacob Nardella (Swofty)" Date: Mon, 16 Nov 2026 01:43:02 +1100 Subject: [PATCH] fix(db): lock the new database down before the admin leaves its role --- packages/db/src/provision.test.ts | 2 +- packages/db/src/provision.ts | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/db/src/provision.test.ts b/packages/db/src/provision.test.ts index 811b410..d6d1abf 100644 --- a/packages/db/src/provision.test.ts +++ b/packages/db/src/provision.test.ts @@ -11,9 +11,9 @@ describe("provisionStatements", () => { `CREATE ROLE "monmap" LOGIN NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION CONNECTION LIMIT 20 PASSWORD 'pw'`, `GRANT "monmap" TO CURRENT_USER`, `CREATE DATABASE "monmap" OWNER "monmap"`, - `REVOKE "monmap" FROM CURRENT_USER`, `REVOKE ALL ON DATABASE "monmap" FROM PUBLIC`, `GRANT CONNECT, TEMPORARY ON DATABASE "monmap" TO "monmap"`, + `REVOKE "monmap" FROM CURRENT_USER`, ]); }); diff --git a/packages/db/src/provision.ts b/packages/db/src/provision.ts index 74cebed..7cd3def 100644 --- a/packages/db/src/provision.ts +++ b/packages/db/src/provision.ts @@ -43,13 +43,15 @@ export function provisionStatements(options: ProvisionOptions): string[] { return [ `CREATE ROLE "${app}" LOGIN NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION CONNECTION LIMIT ${limit} PASSWORD ${quoteLiteral(password)}`, - // A managed server's administrator is not a superuser, and may only hand - // a database to a role it is a member of. It joins for that one statement. + // A managed server's administrator is not a superuser. It may only hand + // a database to a role it is a member of, and only change the privileges + // of a database it owns through that role, so it joins the role until the + // database is locked down and leaves last. `GRANT "${app}" TO CURRENT_USER`, `CREATE DATABASE "${app}" OWNER "${app}"`, - `REVOKE "${app}" FROM CURRENT_USER`, `REVOKE ALL ON DATABASE "${app}" FROM PUBLIC`, `GRANT CONNECT, TEMPORARY ON DATABASE "${app}" TO "${app}"`, + `REVOKE "${app}" FROM CURRENT_USER`, ]; }