Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit330b84d

Browse files
committed
pg_dump: Properly handle public schema ACLs with --clean
pg_dump has always handled the public schema in a special way when itcomes to the "--clean" option. To wit, we do not drop or recreate thepublic schema in "normal" mode, but when we are run in "--clean" modethen we do drop and recreate the public schema.When running in "--clean" mode, the public schema is dropped and thenrecreated and it is recreated with the normal schema-default privilegesof "nothing". This is unlike how the public schema starts life, whichis to have CREATE and USAGE GRANT'd to the PUBLIC role, and that is whatis recorded in pg_init_privs.Due to this, in "--clean" mode, pg_dump would mistakenly only dump outthe set of privileges required to go from the initdb-time privileges onthe public schema to whatever the current-state privileges are. If theprivileges were not changed from initdb time, then no privileges wouldbe dumped out for the public schema, but with the schema being droppedand recreated, the result was that the public schema would have no ACLson it instead of what it should have, which is the initdb-timeprivileges.Practically speaking, this meant that pg_dump with --clean mode dumpinga database where the ACLs on the public schema were not changed from thedefault would, upon restore, result in a public schema with *no*privileges GRANT'd, not matching the state of the existing database(where the initdb-time privileges would have been CREATE and USAGE tothe PUBLIC role for the public schema).To fix, adjust the query in getNamespaces() to ignore the pg_init_privsentry for the public schema when running in "--clean" mode, meaning thatthe privileges for the public schema would be dumped, correctly, as ifit was going from a newly-created schema to the current state (which is,indeed, what will happen during the restore thanks to the DROP/CREATE).Only the public schema is handled in this special way by pg_dump, noother initdb-time objects are dropped/recreated in --clean mode.Back-patch to 9.6 where the bug was introduced.Discussion:https://postgr.es/m/3534542.o3cNaKiDID%40techfox
1 parent299990b commit330b84d

File tree

2 files changed

+51
-3
lines changed

2 files changed

+51
-3
lines changed

‎src/bin/pg_dump/pg_dump.c

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4005,13 +4005,33 @@ getNamespaces(Archive *fout, int *numNamespaces)
40054005
"LEFT JOIN pg_init_privs pip "
40064006
"ON (n.oid = pip.objoid "
40074007
"AND pip.classoid = 'pg_namespace'::regclass "
4008-
"AND pip.objsubid = 0)",
4008+
"AND pip.objsubid = 0",
40094009
username_subquery,
40104010
acl_subquery->data,
40114011
racl_subquery->data,
40124012
init_acl_subquery->data,
40134013
init_racl_subquery->data);
40144014

4015+
/*
4016+
* When we are doing a 'clean' run, we will be dropping and recreating
4017+
* the 'public' schema (the only object which has that kind of
4018+
* treatment in the backend and which has an entry in pg_init_privs)
4019+
* and therefore we should not consider any initial privileges in
4020+
* pg_init_privs in that case.
4021+
*
4022+
* See pg_backup_archiver.c:_printTocEntry() for the details on why
4023+
* the public schema is special in this regard.
4024+
*
4025+
* Note that if the public schema is dropped and re-created, this is
4026+
* essentially a no-op because the new public schema won't have an
4027+
* entry in pg_init_privs anyway, as the entry will be removed when
4028+
* the public schema is dropped.
4029+
*/
4030+
if (dopt->outputClean)
4031+
appendPQExpBuffer(query," AND pip.objoid <> 'public'::regnamespace");
4032+
4033+
appendPQExpBuffer(query,") ");
4034+
40154035
destroyPQExpBuffer(acl_subquery);
40164036
destroyPQExpBuffer(racl_subquery);
40174037
destroyPQExpBuffer(init_acl_subquery);

‎src/bin/pg_dump/t/002_pg_dump.pl

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3081,6 +3081,34 @@
30813081
role => 1,
30823082
test_schema_plus_blobs => 1, }, },
30833083
3084+
'GRANT USAGE ON SCHEMA public TO public' => {
3085+
regexp => qr/^
3086+
\Q--\E\n\n
3087+
\QGRANT USAGE ON SCHEMA public TO PUBLIC;\E
3088+
/xm,
3089+
like => {
3090+
clean => 1,
3091+
clean_if_exists => 1, },
3092+
unlike => {
3093+
binary_upgrade => 1,
3094+
createdb => 1,
3095+
defaults => 1,
3096+
exclude_dump_test_schema => 1,
3097+
exclude_test_table => 1,
3098+
exclude_test_table_data => 1,
3099+
no_blobs => 1,
3100+
no_owner => 1,
3101+
pg_dumpall_dbprivs => 1,
3102+
schema_only => 1,
3103+
section_pre_data => 1,
3104+
only_dump_test_schema => 1,
3105+
only_dump_test_table => 1,
3106+
pg_dumpall_globals_clean => 1,
3107+
role => 1,
3108+
section_data => 1,
3109+
section_post_data => 1,
3110+
test_schema_plus_blobs => 1, }, },
3111+
30843112
'GRANT commands' => { # catch-all for GRANT commands
30853113
all_runs => 0, # catch-all
30863114
regexp => qr/^GRANT /m,
@@ -3258,8 +3286,6 @@
32583286
/xm,
32593287
like => {
32603288
binary_upgrade => 1,
3261-
clean => 1,
3262-
clean_if_exists => 1,
32633289
createdb => 1,
32643290
defaults => 1,
32653291
exclude_dump_test_schema => 1,
@@ -3271,6 +3297,8 @@
32713297
schema_only => 1,
32723298
section_pre_data => 1, },
32733299
unlike => {
3300+
clean => 1,
3301+
clean_if_exists => 1,
32743302
only_dump_test_schema => 1,
32753303
only_dump_test_table => 1,
32763304
pg_dumpall_globals_clean => 1,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp