diff --git a/apps/desktop/src/lib/databaseUserAdmin.ts b/apps/desktop/src/lib/databaseUserAdmin.ts index 3bf119d1d..ebed111bc 100644 --- a/apps/desktop/src/lib/databaseUserAdmin.ts +++ b/apps/desktop/src/lib/databaseUserAdmin.ts @@ -171,6 +171,7 @@ export function usersFromMySqlGranteeResult(result: QueryResult): DatabaseUserId } export function postgresListRolesSql(): string { + const bypassRls = postgresRoleBypassRlsSql("r"); return ` SELECT r.rolname AS user, @@ -180,7 +181,7 @@ SELECT CASE WHEN r.rolcreatedb THEN 'CREATEDB' END, CASE WHEN r.rolcreaterole THEN 'CREATEROLE' END, CASE WHEN r.rolreplication THEN 'REPLICATION' END, - CASE WHEN r.rolbypassrls THEN 'BYPASSRLS' END + CASE WHEN ${bypassRls} THEN 'BYPASSRLS' END ) AS plugin FROM pg_catalog.pg_roles r ORDER BY r.rolname;`.trim(); @@ -192,11 +193,12 @@ export function usersFromPostgresRolesResult(result: QueryResult): DatabaseUserI export function postgresShowGrantsSql(user: DatabaseUserIdentity): string { const role = quoteSqlString(user.user); + const bypassRls = postgresRoleBypassRlsSql("r"); return ` WITH target AS ( - SELECT oid, rolname, rolsuper, rolcreatedb, rolcreaterole, rolcanlogin, rolreplication, rolbypassrls - FROM pg_catalog.pg_roles - WHERE rolname = ${role} + SELECT oid, rolname, rolsuper, rolcreatedb, rolcreaterole, rolcanlogin, rolreplication, ${bypassRls} AS rolbypassrls + FROM pg_catalog.pg_roles r + WHERE r.rolname = ${role} ) SELECT line FROM ( @@ -330,6 +332,10 @@ function postgresPrivilegesForScope(scope: PrivilegeScope): readonly string[] { return []; } +function postgresRoleBypassRlsSql(alias: string): string { + return `row_to_json(${alias})::text LIKE '%"rolbypassrls":true%'`; +} + export const mysqlUserAdminProvider: DatabaseUserAdminProvider = { dialect: "mysql", defaultScope: "mysql", diff --git a/packages/app-tests/databaseUserAdmin.test.ts b/packages/app-tests/databaseUserAdmin.test.ts index 4053871aa..eb1f1cc12 100644 --- a/packages/app-tests/databaseUserAdmin.test.ts +++ b/packages/app-tests/databaseUserAdmin.test.ts @@ -17,13 +17,14 @@ import { postgresCreateRoleSql, postgresDropRoleSql, postgresGrantPrivilegesSql, + postgresListRolesSql, postgresPrivilegeTargetSql, postgresRevokePrivilegesSql, postgresRoleLabel, + postgresShowGrantsSql, quoteMySqlIdentifier, quoteMySqlString, quotePostgresIdentifier, - usersFromMySqlGranteeResult, usersFromMySqlUserResult, usersFromPostgresRolesResult, @@ -161,3 +162,14 @@ test("parses PostgreSQL role rows", () => { ], ); }); + +test("builds PostgreSQL role metadata SQL without directly requiring rolbypassrls", () => { + const listSql = postgresListRolesSql(); + const grantsSql = postgresShowGrantsSql({ user: "reporter", host: "LOGIN" }); + + assert.match(listSql, /row_to_json\(r\)::text LIKE '%"rolbypassrls":true%'/); + assert.match(grantsSql, /row_to_json\(r\)::text LIKE '%"rolbypassrls":true%'/); + assert.doesNotMatch(listSql, /r\.rolbypassrls/); + assert.doesNotMatch(grantsSql, /r\.rolbypassrls/); + assert.match(grantsSql, /AS rolbypassrls/); +});