postgresai 0.18.0-dev.14 → 0.18.0-dev.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -6
- package/dist/bin/postgres-ai.js +607 -94
- package/dist/sql/01.role.sql +3 -3
- package/dist/sql/02.extensions.sql +1 -0
- package/dist/sql/03.permissions.sql +112 -8
- package/dist/sql/04.optional_rds.sql +1 -0
- package/dist/sql/05.optional_self_managed.sql +1 -0
- package/dist/sql/06.helpers.sql +1 -0
- package/dist/sql/uninit/01.helpers.sql +3 -1
- package/dist/sql/uninit/02.permissions.sql +14 -2
- package/dist/sql/uninit/03.role.sql +5 -4
- package/package.json +1 -1
- package/sql/01.role.sql +3 -3
- package/sql/02.extensions.sql +1 -0
- package/sql/03.permissions.sql +112 -8
- package/sql/04.optional_rds.sql +1 -0
- package/sql/05.optional_self_managed.sql +1 -0
- package/sql/06.helpers.sql +1 -0
- package/sql/uninit/01.helpers.sql +3 -1
- package/sql/uninit/02.permissions.sql +14 -2
- package/sql/uninit/03.role.sql +5 -4
package/dist/sql/01.role.sql
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
-- Role creation / password update (template-filled by cli/lib/init.ts)
|
|
2
|
+
-- Pin name resolution before the privileged DO block, including for printed SQL.
|
|
3
|
+
set search_path = pg_catalog, pg_temp;
|
|
2
4
|
--
|
|
3
5
|
-- A race-safe pattern: create if missing, then alter to set the password.
|
|
4
6
|
-- `pgai mon deploy` omits the alter, so an existing role keeps its password:
|
|
@@ -6,12 +8,10 @@
|
|
|
6
8
|
-- if not exists (select 1 from pg_catalog.pg_roles where rolname = '...') then
|
|
7
9
|
-- begin
|
|
8
10
|
-- create user "..." with password '...';
|
|
9
|
-
-- exception when duplicate_object then
|
|
11
|
+
-- exception when duplicate_object or unique_violation then
|
|
10
12
|
-- null;
|
|
11
13
|
-- end;
|
|
12
14
|
-- end if;
|
|
13
15
|
-- alter user "..." with password '...';
|
|
14
16
|
-- end $$;
|
|
15
17
|
{{ROLE_STMT}}
|
|
16
|
-
|
|
17
|
-
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
-- Required permissions for postgres_ai monitoring user (template-filled by cli/lib/init.ts)
|
|
2
|
+
-- The first DO block also runs as the admin; pin before any name resolution.
|
|
3
|
+
set search_path = pg_catalog, pg_temp;
|
|
2
4
|
|
|
3
5
|
-- Allow connect
|
|
4
6
|
grant connect on database {{DB_IDENT}} to {{ROLE_IDENT}};
|
|
@@ -15,6 +17,108 @@ grant select on pg_catalog.pg_index to {{ROLE_IDENT}};
|
|
|
15
17
|
-- Create postgres_ai schema for our objects
|
|
16
18
|
-- Using IF NOT EXISTS for idempotency - prepare-db can be run multiple times
|
|
17
19
|
create schema if not exists postgres_ai;
|
|
20
|
+
-- An existing schema keeps its owner, and CREATE OR REPLACE keeps the owner of
|
|
21
|
+
-- existing functions/views. Refuse a schema that another role can still write:
|
|
22
|
+
-- the monitoring role searches postgres_ai and calls our helper from it.
|
|
23
|
+
do {{DO_QUOTE}}
|
|
24
|
+
declare
|
|
25
|
+
schema_oid oid;
|
|
26
|
+
admin_oid oid;
|
|
27
|
+
schema_owner text;
|
|
28
|
+
create_grantee text;
|
|
29
|
+
schema_extension text;
|
|
30
|
+
foreign_object text;
|
|
31
|
+
begin
|
|
32
|
+
set local search_path = pg_catalog, pg_temp;
|
|
33
|
+
select oid into admin_oid from pg_catalog.pg_roles where rolname = current_user;
|
|
34
|
+
select oid into schema_oid from pg_catalog.pg_namespace where nspname = 'postgres_ai';
|
|
35
|
+
|
|
36
|
+
select pg_catalog.pg_get_userbyid(n.nspowner) into schema_owner
|
|
37
|
+
from pg_catalog.pg_namespace n where n.oid = schema_oid;
|
|
38
|
+
if schema_owner <> current_user then
|
|
39
|
+
raise exception 'postgres_ai schema must be owned by the prepare-db administrator'
|
|
40
|
+
using errcode = '42501',
|
|
41
|
+
detail = pg_catalog.format('Schema owner: %s; prepare-db user: %s', schema_owner, current_user),
|
|
42
|
+
hint = 'Have a DBA inspect postgres_ai, then transfer its ownership to the prepare-db user if safe.';
|
|
43
|
+
end if;
|
|
44
|
+
|
|
45
|
+
select case when a.grantee = 0 then 'PUBLIC' else pg_catalog.pg_get_userbyid(a.grantee) end
|
|
46
|
+
into create_grantee
|
|
47
|
+
from pg_catalog.pg_namespace n,
|
|
48
|
+
pg_catalog.aclexplode(coalesce(n.nspacl, pg_catalog.acldefault('n', n.nspowner))) a
|
|
49
|
+
where n.oid = schema_oid and a.privilege_type = 'CREATE' and a.grantee <> admin_oid
|
|
50
|
+
limit 1;
|
|
51
|
+
if create_grantee is not null then
|
|
52
|
+
raise exception 'postgres_ai schema grants CREATE to another role'
|
|
53
|
+
using errcode = '42501',
|
|
54
|
+
detail = pg_catalog.format('CREATE grantee: %s', create_grantee),
|
|
55
|
+
hint = 'Have a DBA inspect the grant, then revoke CREATE on postgres_ai from that role or PUBLIC if safe.';
|
|
56
|
+
end if;
|
|
57
|
+
|
|
58
|
+
-- Trusted extensions can install bootstrap-owned members without owner
|
|
59
|
+
-- records in pg_shdepend (bootstrap superuser oid 10). Keep extensions out
|
|
60
|
+
-- of the monitoring search path regardless of their extension owner.
|
|
61
|
+
select e.extname into schema_extension
|
|
62
|
+
from pg_catalog.pg_extension e
|
|
63
|
+
where e.extnamespace = schema_oid
|
|
64
|
+
limit 1;
|
|
65
|
+
if schema_extension is not null then
|
|
66
|
+
raise exception 'postgres_ai schema contains an extension'
|
|
67
|
+
using errcode = '42501',
|
|
68
|
+
detail = pg_catalog.format('Extension: %s', schema_extension),
|
|
69
|
+
hint = 'Have a DBA inspect and move or remove this extension if safe before retrying prepare-db.';
|
|
70
|
+
end if;
|
|
71
|
+
|
|
72
|
+
-- Pinned/predefined roles have no pg_shdepend owner rows. Read catalog
|
|
73
|
+
-- owners directly before the dependency scan so those objects cannot hide.
|
|
74
|
+
with owned as (
|
|
75
|
+
select 'pg_class'::pg_catalog.regclass::oid as classid, c.oid as objid, c.relowner as owner_oid
|
|
76
|
+
from pg_catalog.pg_class c where c.relnamespace = schema_oid
|
|
77
|
+
union all select 'pg_proc'::pg_catalog.regclass::oid, p.oid, p.proowner
|
|
78
|
+
from pg_catalog.pg_proc p where p.pronamespace = schema_oid
|
|
79
|
+
union all select 'pg_type'::pg_catalog.regclass::oid, t.oid, t.typowner
|
|
80
|
+
from pg_catalog.pg_type t where t.typnamespace = schema_oid
|
|
81
|
+
union all select 'pg_operator'::pg_catalog.regclass::oid, o.oid, o.oprowner
|
|
82
|
+
from pg_catalog.pg_operator o where o.oprnamespace = schema_oid
|
|
83
|
+
union all select 'pg_opclass'::pg_catalog.regclass::oid, o.oid, o.opcowner
|
|
84
|
+
from pg_catalog.pg_opclass o where o.opcnamespace = schema_oid
|
|
85
|
+
union all select 'pg_opfamily'::pg_catalog.regclass::oid, o.oid, o.opfowner
|
|
86
|
+
from pg_catalog.pg_opfamily o where o.opfnamespace = schema_oid
|
|
87
|
+
union all select 'pg_collation'::pg_catalog.regclass::oid, c.oid, c.collowner
|
|
88
|
+
from pg_catalog.pg_collation c where c.collnamespace = schema_oid
|
|
89
|
+
union all select 'pg_conversion'::pg_catalog.regclass::oid, c.oid, c.conowner
|
|
90
|
+
from pg_catalog.pg_conversion c where c.connamespace = schema_oid
|
|
91
|
+
union all select 'pg_ts_dict'::pg_catalog.regclass::oid, d.oid, d.dictowner
|
|
92
|
+
from pg_catalog.pg_ts_dict d where d.dictnamespace = schema_oid
|
|
93
|
+
union all select 'pg_ts_config'::pg_catalog.regclass::oid, c.oid, c.cfgowner
|
|
94
|
+
from pg_catalog.pg_ts_config c where c.cfgnamespace = schema_oid
|
|
95
|
+
union all select 'pg_statistic_ext'::pg_catalog.regclass::oid, s.oid, s.stxowner
|
|
96
|
+
from pg_catalog.pg_statistic_ext s where s.stxnamespace = schema_oid
|
|
97
|
+
)
|
|
98
|
+
select pg_catalog.format('%s %s (owner %s)', o.type, o.identity,
|
|
99
|
+
pg_catalog.pg_get_userbyid(owned.owner_oid)) into foreign_object
|
|
100
|
+
from owned
|
|
101
|
+
cross join lateral pg_catalog.pg_identify_object(owned.classid, owned.objid, 0) o
|
|
102
|
+
where owned.owner_oid <> admin_oid
|
|
103
|
+
limit 1;
|
|
104
|
+
|
|
105
|
+
-- Retain a dependency scan for object kinds not represented above.
|
|
106
|
+
if foreign_object is null then
|
|
107
|
+
select o.identity into foreign_object
|
|
108
|
+
from pg_catalog.pg_shdepend s
|
|
109
|
+
cross join lateral pg_catalog.pg_identify_object(s.classid, s.objid, s.objsubid) o
|
|
110
|
+
where s.dbid = (select oid from pg_catalog.pg_database where datname = pg_catalog.current_database())
|
|
111
|
+
and s.deptype = 'o' and s.refobjid <> admin_oid
|
|
112
|
+
and o.schema = 'postgres_ai'
|
|
113
|
+
limit 1;
|
|
114
|
+
end if;
|
|
115
|
+
if foreign_object is not null then
|
|
116
|
+
raise exception 'postgres_ai schema contains objects owned by another role'
|
|
117
|
+
using errcode = '42501',
|
|
118
|
+
detail = pg_catalog.format('Foreign-owned object: %s', foreign_object),
|
|
119
|
+
hint = 'Have a DBA inspect this object, then reassign or remove it if safe before retrying prepare-db.';
|
|
120
|
+
end if;
|
|
121
|
+
end {{DO_QUOTE}};
|
|
18
122
|
grant usage on schema postgres_ai to {{ROLE_IDENT}};
|
|
19
123
|
|
|
20
124
|
-- For bloat analysis: expose pg_statistic via a view
|
|
@@ -45,13 +149,13 @@ declare
|
|
|
45
149
|
ext_schema text;
|
|
46
150
|
begin
|
|
47
151
|
select n.nspname into ext_schema
|
|
48
|
-
from pg_extension e
|
|
49
|
-
join pg_namespace n on e.extnamespace = n.oid
|
|
152
|
+
from pg_catalog.pg_extension e
|
|
153
|
+
join pg_catalog.pg_namespace n on e.extnamespace = n.oid
|
|
50
154
|
where e.extname = 'pg_stat_statements';
|
|
51
155
|
|
|
52
156
|
-- Only grant if extension exists and is in a non-standard schema
|
|
53
157
|
if ext_schema is not null and ext_schema not in ('pg_catalog', 'public') then
|
|
54
|
-
execute format('grant usage on schema %I to %I', ext_schema, {{ROLE_LITERAL}});
|
|
158
|
+
execute pg_catalog.format('grant usage on schema %I to %I', ext_schema, {{ROLE_LITERAL}});
|
|
55
159
|
end if;
|
|
56
160
|
end {{DO_QUOTE}};
|
|
57
161
|
|
|
@@ -72,12 +176,12 @@ begin
|
|
|
72
176
|
set local search_path = pg_catalog, pg_temp;
|
|
73
177
|
-- Detect pg_stat_statements extension schema
|
|
74
178
|
select n.nspname into ext_schema
|
|
75
|
-
from pg_extension e
|
|
76
|
-
join pg_namespace n on e.extnamespace = n.oid
|
|
179
|
+
from pg_catalog.pg_extension e
|
|
180
|
+
join pg_catalog.pg_namespace n on e.extnamespace = n.oid
|
|
77
181
|
where e.extname = 'pg_stat_statements';
|
|
78
182
|
|
|
79
183
|
if ext_schema is not null and ext_schema not in ('pg_catalog', 'public') then
|
|
80
|
-
db_path := 'pg_catalog, postgres_ai, ' || quote_ident(ext_schema) || ', public, pg_temp';
|
|
184
|
+
db_path := 'pg_catalog, postgres_ai, ' || pg_catalog.quote_ident(ext_schema) || ', public, pg_temp';
|
|
81
185
|
end if;
|
|
82
186
|
|
|
83
187
|
-- Role-wide value: for databases that prepare-db did not run in. All databases share
|
|
@@ -88,9 +192,9 @@ begin
|
|
|
88
192
|
and setdatabase = 0
|
|
89
193
|
and ('search_path=' || role_path) = any (setconfig)
|
|
90
194
|
) then
|
|
91
|
-
execute format('alter user %I set search_path = %s', {{ROLE_LITERAL}}, role_path);
|
|
195
|
+
execute pg_catalog.format('alter user %I set search_path = %s', {{ROLE_LITERAL}}, role_path);
|
|
92
196
|
end if;
|
|
93
197
|
-- This database's value: other databases keep their own pg_stat_statements schema.
|
|
94
|
-
execute format('alter user %I in database %I set search_path = %s', {{ROLE_LITERAL}}, pg_catalog.current_database(), db_path);
|
|
198
|
+
execute pg_catalog.format('alter user %I in database %I set search_path = %s', {{ROLE_LITERAL}}, pg_catalog.current_database(), db_path);
|
|
95
199
|
end {{DO_QUOTE}};
|
|
96
200
|
-- [SEARCH_PATH_BLOCK_END]
|
package/dist/sql/06.helpers.sql
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
-- Helper functions for postgres_ai monitoring user (template-filled by cli/lib/init.ts)
|
|
2
|
+
set search_path = pg_catalog, pg_temp;
|
|
2
3
|
|
|
3
4
|
-- Remove the retired helper from databases prepared by older CLI versions.
|
|
4
5
|
-- Only its owner or a superuser can drop it: anyone else gets a warning here. Releases
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
-- Run before dropping the postgres_ai schema.
|
|
3
3
|
|
|
4
4
|
-- Objects in other schemas (for example, a planted public.format) must not run as the admin.
|
|
5
|
-
|
|
5
|
+
-- Use a session SET because --print-sql plans may be run by psql in autocommit.
|
|
6
|
+
-- SET LOCAL outside an explicit transaction is ignored there.
|
|
7
|
+
set search_path = pg_catalog, pg_temp;
|
|
6
8
|
|
|
7
9
|
drop function if exists postgres_ai.explain_generic(text, text, text);
|
|
8
10
|
drop function if exists postgres_ai.table_describe(text);
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
-- Revoke permissions and drop objects created by prepare-db (template-filled by cli/lib/init.ts)
|
|
2
2
|
|
|
3
3
|
-- Objects in other schemas (for example, a planted public.=) must not run as the admin.
|
|
4
|
-
|
|
4
|
+
-- Printed plans may run in psql autocommit, where SET LOCAL is ignored.
|
|
5
|
+
set search_path = pg_catalog, pg_temp;
|
|
5
6
|
-- The CLI reads the "unprepare-db:" WARNINGs. A higher setting would hide them.
|
|
6
|
-
set
|
|
7
|
+
set client_min_messages = warning;
|
|
7
8
|
|
|
8
9
|
-- Drop the postgres_ai.pg_statistic view
|
|
9
10
|
drop view if exists postgres_ai.pg_statistic;
|
|
@@ -57,6 +58,17 @@ begin
|
|
|
57
58
|
select from pg_catalog.aclexplode(n.nspacl) a
|
|
58
59
|
where a.grantee = role_oid and a.privilege_type = 'USAGE')
|
|
59
60
|
union
|
|
61
|
+
-- prepare-db grants USAGE when pg_stat_statements lives in a custom
|
|
62
|
+
-- extension schema. Retaining the login role must remove that grant too.
|
|
63
|
+
select pg_catalog.format('revoke usage on schema %I from %I', n.nspname, {{ROLE_LITERAL}})
|
|
64
|
+
from pg_catalog.pg_extension e
|
|
65
|
+
join pg_catalog.pg_namespace n on n.oid = e.extnamespace
|
|
66
|
+
where e.extname = 'pg_stat_statements'
|
|
67
|
+
and n.nspname not in ('pg_catalog', 'public')
|
|
68
|
+
and exists (
|
|
69
|
+
select from pg_catalog.aclexplode(n.nspacl) a
|
|
70
|
+
where a.grantee = role_oid and a.privilege_type = 'USAGE')
|
|
71
|
+
union
|
|
60
72
|
select pg_catalog.format('revoke execute on function %s from %I', p.oid::regprocedure, {{ROLE_LITERAL}})
|
|
61
73
|
from pg_catalog.pg_proc p
|
|
62
74
|
where p.oid in (
|
|
@@ -2,28 +2,29 @@
|
|
|
2
2
|
-- This must run after revoking all permissions from the role.
|
|
3
3
|
|
|
4
4
|
-- Objects in other schemas (for example, a planted public.format) must not run as the admin.
|
|
5
|
-
|
|
5
|
+
-- Printed plans may run in psql autocommit, where SET LOCAL is ignored.
|
|
6
|
+
set search_path = pg_catalog, pg_temp;
|
|
6
7
|
|
|
7
8
|
-- Use a DO block to handle the case where the role doesn't exist
|
|
8
9
|
do {{DO_QUOTE}} begin
|
|
9
10
|
-- Reassign owned objects to current user before dropping
|
|
10
11
|
-- This handles any objects that might have been created by the role
|
|
11
12
|
begin
|
|
12
|
-
execute format('reassign owned by %I to current_user', {{ROLE_LITERAL}});
|
|
13
|
+
execute pg_catalog.format('reassign owned by %I to current_user', {{ROLE_LITERAL}});
|
|
13
14
|
exception when undefined_object then
|
|
14
15
|
null; -- Role doesn't exist, nothing to reassign
|
|
15
16
|
end;
|
|
16
17
|
|
|
17
18
|
-- Drop owned objects (in case reassign didn't work for some objects)
|
|
18
19
|
begin
|
|
19
|
-
execute format('drop owned by %I', {{ROLE_LITERAL}});
|
|
20
|
+
execute pg_catalog.format('drop owned by %I', {{ROLE_LITERAL}});
|
|
20
21
|
exception when undefined_object then
|
|
21
22
|
null; -- Role doesn't exist
|
|
22
23
|
end;
|
|
23
24
|
|
|
24
25
|
-- Drop the role
|
|
25
26
|
begin
|
|
26
|
-
execute format('drop role %I', {{ROLE_LITERAL}});
|
|
27
|
+
execute pg_catalog.format('drop role %I', {{ROLE_LITERAL}});
|
|
27
28
|
exception when undefined_object then
|
|
28
29
|
null; -- Role doesn't exist, that's fine
|
|
29
30
|
end;
|
package/package.json
CHANGED
package/sql/01.role.sql
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
-- Role creation / password update (template-filled by cli/lib/init.ts)
|
|
2
|
+
-- Pin name resolution before the privileged DO block, including for printed SQL.
|
|
3
|
+
set search_path = pg_catalog, pg_temp;
|
|
2
4
|
--
|
|
3
5
|
-- A race-safe pattern: create if missing, then alter to set the password.
|
|
4
6
|
-- `pgai mon deploy` omits the alter, so an existing role keeps its password:
|
|
@@ -6,12 +8,10 @@
|
|
|
6
8
|
-- if not exists (select 1 from pg_catalog.pg_roles where rolname = '...') then
|
|
7
9
|
-- begin
|
|
8
10
|
-- create user "..." with password '...';
|
|
9
|
-
-- exception when duplicate_object then
|
|
11
|
+
-- exception when duplicate_object or unique_violation then
|
|
10
12
|
-- null;
|
|
11
13
|
-- end;
|
|
12
14
|
-- end if;
|
|
13
15
|
-- alter user "..." with password '...';
|
|
14
16
|
-- end $$;
|
|
15
17
|
{{ROLE_STMT}}
|
|
16
|
-
|
|
17
|
-
|
package/sql/02.extensions.sql
CHANGED
package/sql/03.permissions.sql
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
-- Required permissions for postgres_ai monitoring user (template-filled by cli/lib/init.ts)
|
|
2
|
+
-- The first DO block also runs as the admin; pin before any name resolution.
|
|
3
|
+
set search_path = pg_catalog, pg_temp;
|
|
2
4
|
|
|
3
5
|
-- Allow connect
|
|
4
6
|
grant connect on database {{DB_IDENT}} to {{ROLE_IDENT}};
|
|
@@ -15,6 +17,108 @@ grant select on pg_catalog.pg_index to {{ROLE_IDENT}};
|
|
|
15
17
|
-- Create postgres_ai schema for our objects
|
|
16
18
|
-- Using IF NOT EXISTS for idempotency - prepare-db can be run multiple times
|
|
17
19
|
create schema if not exists postgres_ai;
|
|
20
|
+
-- An existing schema keeps its owner, and CREATE OR REPLACE keeps the owner of
|
|
21
|
+
-- existing functions/views. Refuse a schema that another role can still write:
|
|
22
|
+
-- the monitoring role searches postgres_ai and calls our helper from it.
|
|
23
|
+
do {{DO_QUOTE}}
|
|
24
|
+
declare
|
|
25
|
+
schema_oid oid;
|
|
26
|
+
admin_oid oid;
|
|
27
|
+
schema_owner text;
|
|
28
|
+
create_grantee text;
|
|
29
|
+
schema_extension text;
|
|
30
|
+
foreign_object text;
|
|
31
|
+
begin
|
|
32
|
+
set local search_path = pg_catalog, pg_temp;
|
|
33
|
+
select oid into admin_oid from pg_catalog.pg_roles where rolname = current_user;
|
|
34
|
+
select oid into schema_oid from pg_catalog.pg_namespace where nspname = 'postgres_ai';
|
|
35
|
+
|
|
36
|
+
select pg_catalog.pg_get_userbyid(n.nspowner) into schema_owner
|
|
37
|
+
from pg_catalog.pg_namespace n where n.oid = schema_oid;
|
|
38
|
+
if schema_owner <> current_user then
|
|
39
|
+
raise exception 'postgres_ai schema must be owned by the prepare-db administrator'
|
|
40
|
+
using errcode = '42501',
|
|
41
|
+
detail = pg_catalog.format('Schema owner: %s; prepare-db user: %s', schema_owner, current_user),
|
|
42
|
+
hint = 'Have a DBA inspect postgres_ai, then transfer its ownership to the prepare-db user if safe.';
|
|
43
|
+
end if;
|
|
44
|
+
|
|
45
|
+
select case when a.grantee = 0 then 'PUBLIC' else pg_catalog.pg_get_userbyid(a.grantee) end
|
|
46
|
+
into create_grantee
|
|
47
|
+
from pg_catalog.pg_namespace n,
|
|
48
|
+
pg_catalog.aclexplode(coalesce(n.nspacl, pg_catalog.acldefault('n', n.nspowner))) a
|
|
49
|
+
where n.oid = schema_oid and a.privilege_type = 'CREATE' and a.grantee <> admin_oid
|
|
50
|
+
limit 1;
|
|
51
|
+
if create_grantee is not null then
|
|
52
|
+
raise exception 'postgres_ai schema grants CREATE to another role'
|
|
53
|
+
using errcode = '42501',
|
|
54
|
+
detail = pg_catalog.format('CREATE grantee: %s', create_grantee),
|
|
55
|
+
hint = 'Have a DBA inspect the grant, then revoke CREATE on postgres_ai from that role or PUBLIC if safe.';
|
|
56
|
+
end if;
|
|
57
|
+
|
|
58
|
+
-- Trusted extensions can install bootstrap-owned members without owner
|
|
59
|
+
-- records in pg_shdepend (bootstrap superuser oid 10). Keep extensions out
|
|
60
|
+
-- of the monitoring search path regardless of their extension owner.
|
|
61
|
+
select e.extname into schema_extension
|
|
62
|
+
from pg_catalog.pg_extension e
|
|
63
|
+
where e.extnamespace = schema_oid
|
|
64
|
+
limit 1;
|
|
65
|
+
if schema_extension is not null then
|
|
66
|
+
raise exception 'postgres_ai schema contains an extension'
|
|
67
|
+
using errcode = '42501',
|
|
68
|
+
detail = pg_catalog.format('Extension: %s', schema_extension),
|
|
69
|
+
hint = 'Have a DBA inspect and move or remove this extension if safe before retrying prepare-db.';
|
|
70
|
+
end if;
|
|
71
|
+
|
|
72
|
+
-- Pinned/predefined roles have no pg_shdepend owner rows. Read catalog
|
|
73
|
+
-- owners directly before the dependency scan so those objects cannot hide.
|
|
74
|
+
with owned as (
|
|
75
|
+
select 'pg_class'::pg_catalog.regclass::oid as classid, c.oid as objid, c.relowner as owner_oid
|
|
76
|
+
from pg_catalog.pg_class c where c.relnamespace = schema_oid
|
|
77
|
+
union all select 'pg_proc'::pg_catalog.regclass::oid, p.oid, p.proowner
|
|
78
|
+
from pg_catalog.pg_proc p where p.pronamespace = schema_oid
|
|
79
|
+
union all select 'pg_type'::pg_catalog.regclass::oid, t.oid, t.typowner
|
|
80
|
+
from pg_catalog.pg_type t where t.typnamespace = schema_oid
|
|
81
|
+
union all select 'pg_operator'::pg_catalog.regclass::oid, o.oid, o.oprowner
|
|
82
|
+
from pg_catalog.pg_operator o where o.oprnamespace = schema_oid
|
|
83
|
+
union all select 'pg_opclass'::pg_catalog.regclass::oid, o.oid, o.opcowner
|
|
84
|
+
from pg_catalog.pg_opclass o where o.opcnamespace = schema_oid
|
|
85
|
+
union all select 'pg_opfamily'::pg_catalog.regclass::oid, o.oid, o.opfowner
|
|
86
|
+
from pg_catalog.pg_opfamily o where o.opfnamespace = schema_oid
|
|
87
|
+
union all select 'pg_collation'::pg_catalog.regclass::oid, c.oid, c.collowner
|
|
88
|
+
from pg_catalog.pg_collation c where c.collnamespace = schema_oid
|
|
89
|
+
union all select 'pg_conversion'::pg_catalog.regclass::oid, c.oid, c.conowner
|
|
90
|
+
from pg_catalog.pg_conversion c where c.connamespace = schema_oid
|
|
91
|
+
union all select 'pg_ts_dict'::pg_catalog.regclass::oid, d.oid, d.dictowner
|
|
92
|
+
from pg_catalog.pg_ts_dict d where d.dictnamespace = schema_oid
|
|
93
|
+
union all select 'pg_ts_config'::pg_catalog.regclass::oid, c.oid, c.cfgowner
|
|
94
|
+
from pg_catalog.pg_ts_config c where c.cfgnamespace = schema_oid
|
|
95
|
+
union all select 'pg_statistic_ext'::pg_catalog.regclass::oid, s.oid, s.stxowner
|
|
96
|
+
from pg_catalog.pg_statistic_ext s where s.stxnamespace = schema_oid
|
|
97
|
+
)
|
|
98
|
+
select pg_catalog.format('%s %s (owner %s)', o.type, o.identity,
|
|
99
|
+
pg_catalog.pg_get_userbyid(owned.owner_oid)) into foreign_object
|
|
100
|
+
from owned
|
|
101
|
+
cross join lateral pg_catalog.pg_identify_object(owned.classid, owned.objid, 0) o
|
|
102
|
+
where owned.owner_oid <> admin_oid
|
|
103
|
+
limit 1;
|
|
104
|
+
|
|
105
|
+
-- Retain a dependency scan for object kinds not represented above.
|
|
106
|
+
if foreign_object is null then
|
|
107
|
+
select o.identity into foreign_object
|
|
108
|
+
from pg_catalog.pg_shdepend s
|
|
109
|
+
cross join lateral pg_catalog.pg_identify_object(s.classid, s.objid, s.objsubid) o
|
|
110
|
+
where s.dbid = (select oid from pg_catalog.pg_database where datname = pg_catalog.current_database())
|
|
111
|
+
and s.deptype = 'o' and s.refobjid <> admin_oid
|
|
112
|
+
and o.schema = 'postgres_ai'
|
|
113
|
+
limit 1;
|
|
114
|
+
end if;
|
|
115
|
+
if foreign_object is not null then
|
|
116
|
+
raise exception 'postgres_ai schema contains objects owned by another role'
|
|
117
|
+
using errcode = '42501',
|
|
118
|
+
detail = pg_catalog.format('Foreign-owned object: %s', foreign_object),
|
|
119
|
+
hint = 'Have a DBA inspect this object, then reassign or remove it if safe before retrying prepare-db.';
|
|
120
|
+
end if;
|
|
121
|
+
end {{DO_QUOTE}};
|
|
18
122
|
grant usage on schema postgres_ai to {{ROLE_IDENT}};
|
|
19
123
|
|
|
20
124
|
-- For bloat analysis: expose pg_statistic via a view
|
|
@@ -45,13 +149,13 @@ declare
|
|
|
45
149
|
ext_schema text;
|
|
46
150
|
begin
|
|
47
151
|
select n.nspname into ext_schema
|
|
48
|
-
from pg_extension e
|
|
49
|
-
join pg_namespace n on e.extnamespace = n.oid
|
|
152
|
+
from pg_catalog.pg_extension e
|
|
153
|
+
join pg_catalog.pg_namespace n on e.extnamespace = n.oid
|
|
50
154
|
where e.extname = 'pg_stat_statements';
|
|
51
155
|
|
|
52
156
|
-- Only grant if extension exists and is in a non-standard schema
|
|
53
157
|
if ext_schema is not null and ext_schema not in ('pg_catalog', 'public') then
|
|
54
|
-
execute format('grant usage on schema %I to %I', ext_schema, {{ROLE_LITERAL}});
|
|
158
|
+
execute pg_catalog.format('grant usage on schema %I to %I', ext_schema, {{ROLE_LITERAL}});
|
|
55
159
|
end if;
|
|
56
160
|
end {{DO_QUOTE}};
|
|
57
161
|
|
|
@@ -72,12 +176,12 @@ begin
|
|
|
72
176
|
set local search_path = pg_catalog, pg_temp;
|
|
73
177
|
-- Detect pg_stat_statements extension schema
|
|
74
178
|
select n.nspname into ext_schema
|
|
75
|
-
from pg_extension e
|
|
76
|
-
join pg_namespace n on e.extnamespace = n.oid
|
|
179
|
+
from pg_catalog.pg_extension e
|
|
180
|
+
join pg_catalog.pg_namespace n on e.extnamespace = n.oid
|
|
77
181
|
where e.extname = 'pg_stat_statements';
|
|
78
182
|
|
|
79
183
|
if ext_schema is not null and ext_schema not in ('pg_catalog', 'public') then
|
|
80
|
-
db_path := 'pg_catalog, postgres_ai, ' || quote_ident(ext_schema) || ', public, pg_temp';
|
|
184
|
+
db_path := 'pg_catalog, postgres_ai, ' || pg_catalog.quote_ident(ext_schema) || ', public, pg_temp';
|
|
81
185
|
end if;
|
|
82
186
|
|
|
83
187
|
-- Role-wide value: for databases that prepare-db did not run in. All databases share
|
|
@@ -88,9 +192,9 @@ begin
|
|
|
88
192
|
and setdatabase = 0
|
|
89
193
|
and ('search_path=' || role_path) = any (setconfig)
|
|
90
194
|
) then
|
|
91
|
-
execute format('alter user %I set search_path = %s', {{ROLE_LITERAL}}, role_path);
|
|
195
|
+
execute pg_catalog.format('alter user %I set search_path = %s', {{ROLE_LITERAL}}, role_path);
|
|
92
196
|
end if;
|
|
93
197
|
-- This database's value: other databases keep their own pg_stat_statements schema.
|
|
94
|
-
execute format('alter user %I in database %I set search_path = %s', {{ROLE_LITERAL}}, pg_catalog.current_database(), db_path);
|
|
198
|
+
execute pg_catalog.format('alter user %I in database %I set search_path = %s', {{ROLE_LITERAL}}, pg_catalog.current_database(), db_path);
|
|
95
199
|
end {{DO_QUOTE}};
|
|
96
200
|
-- [SEARCH_PATH_BLOCK_END]
|
package/sql/04.optional_rds.sql
CHANGED
package/sql/06.helpers.sql
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
-- Helper functions for postgres_ai monitoring user (template-filled by cli/lib/init.ts)
|
|
2
|
+
set search_path = pg_catalog, pg_temp;
|
|
2
3
|
|
|
3
4
|
-- Remove the retired helper from databases prepared by older CLI versions.
|
|
4
5
|
-- Only its owner or a superuser can drop it: anyone else gets a warning here. Releases
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
-- Run before dropping the postgres_ai schema.
|
|
3
3
|
|
|
4
4
|
-- Objects in other schemas (for example, a planted public.format) must not run as the admin.
|
|
5
|
-
|
|
5
|
+
-- Use a session SET because --print-sql plans may be run by psql in autocommit.
|
|
6
|
+
-- SET LOCAL outside an explicit transaction is ignored there.
|
|
7
|
+
set search_path = pg_catalog, pg_temp;
|
|
6
8
|
|
|
7
9
|
drop function if exists postgres_ai.explain_generic(text, text, text);
|
|
8
10
|
drop function if exists postgres_ai.table_describe(text);
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
-- Revoke permissions and drop objects created by prepare-db (template-filled by cli/lib/init.ts)
|
|
2
2
|
|
|
3
3
|
-- Objects in other schemas (for example, a planted public.=) must not run as the admin.
|
|
4
|
-
|
|
4
|
+
-- Printed plans may run in psql autocommit, where SET LOCAL is ignored.
|
|
5
|
+
set search_path = pg_catalog, pg_temp;
|
|
5
6
|
-- The CLI reads the "unprepare-db:" WARNINGs. A higher setting would hide them.
|
|
6
|
-
set
|
|
7
|
+
set client_min_messages = warning;
|
|
7
8
|
|
|
8
9
|
-- Drop the postgres_ai.pg_statistic view
|
|
9
10
|
drop view if exists postgres_ai.pg_statistic;
|
|
@@ -57,6 +58,17 @@ begin
|
|
|
57
58
|
select from pg_catalog.aclexplode(n.nspacl) a
|
|
58
59
|
where a.grantee = role_oid and a.privilege_type = 'USAGE')
|
|
59
60
|
union
|
|
61
|
+
-- prepare-db grants USAGE when pg_stat_statements lives in a custom
|
|
62
|
+
-- extension schema. Retaining the login role must remove that grant too.
|
|
63
|
+
select pg_catalog.format('revoke usage on schema %I from %I', n.nspname, {{ROLE_LITERAL}})
|
|
64
|
+
from pg_catalog.pg_extension e
|
|
65
|
+
join pg_catalog.pg_namespace n on n.oid = e.extnamespace
|
|
66
|
+
where e.extname = 'pg_stat_statements'
|
|
67
|
+
and n.nspname not in ('pg_catalog', 'public')
|
|
68
|
+
and exists (
|
|
69
|
+
select from pg_catalog.aclexplode(n.nspacl) a
|
|
70
|
+
where a.grantee = role_oid and a.privilege_type = 'USAGE')
|
|
71
|
+
union
|
|
60
72
|
select pg_catalog.format('revoke execute on function %s from %I', p.oid::regprocedure, {{ROLE_LITERAL}})
|
|
61
73
|
from pg_catalog.pg_proc p
|
|
62
74
|
where p.oid in (
|
package/sql/uninit/03.role.sql
CHANGED
|
@@ -2,28 +2,29 @@
|
|
|
2
2
|
-- This must run after revoking all permissions from the role.
|
|
3
3
|
|
|
4
4
|
-- Objects in other schemas (for example, a planted public.format) must not run as the admin.
|
|
5
|
-
|
|
5
|
+
-- Printed plans may run in psql autocommit, where SET LOCAL is ignored.
|
|
6
|
+
set search_path = pg_catalog, pg_temp;
|
|
6
7
|
|
|
7
8
|
-- Use a DO block to handle the case where the role doesn't exist
|
|
8
9
|
do {{DO_QUOTE}} begin
|
|
9
10
|
-- Reassign owned objects to current user before dropping
|
|
10
11
|
-- This handles any objects that might have been created by the role
|
|
11
12
|
begin
|
|
12
|
-
execute format('reassign owned by %I to current_user', {{ROLE_LITERAL}});
|
|
13
|
+
execute pg_catalog.format('reassign owned by %I to current_user', {{ROLE_LITERAL}});
|
|
13
14
|
exception when undefined_object then
|
|
14
15
|
null; -- Role doesn't exist, nothing to reassign
|
|
15
16
|
end;
|
|
16
17
|
|
|
17
18
|
-- Drop owned objects (in case reassign didn't work for some objects)
|
|
18
19
|
begin
|
|
19
|
-
execute format('drop owned by %I', {{ROLE_LITERAL}});
|
|
20
|
+
execute pg_catalog.format('drop owned by %I', {{ROLE_LITERAL}});
|
|
20
21
|
exception when undefined_object then
|
|
21
22
|
null; -- Role doesn't exist
|
|
22
23
|
end;
|
|
23
24
|
|
|
24
25
|
-- Drop the role
|
|
25
26
|
begin
|
|
26
|
-
execute format('drop role %I', {{ROLE_LITERAL}});
|
|
27
|
+
execute pg_catalog.format('drop role %I', {{ROLE_LITERAL}});
|
|
27
28
|
exception when undefined_object then
|
|
28
29
|
null; -- Role doesn't exist, that's fine
|
|
29
30
|
end;
|