aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Kapila <akapila@postgresql.org>2023-06-15 08:37:48 +0530
committerAmit Kapila <akapila@postgresql.org>2023-06-15 08:37:48 +0530
commitb5c517379a40fa1af84c0852aa3730a5875a6482 (patch)
treeb7544ecef709329c536c552a27dc5735f3c9f0cc
parentf9f31aa91f82df863a35354893978e1937863d7c (diff)
downloadpostgresql-b5c517379a40fa1af84c0852aa3730a5875a6482.tar.gz
postgresql-b5c517379a40fa1af84c0852aa3730a5875a6482.zip
Fix possible crash in tablesync worker.
Commit c3afe8cf5a added a new password_required option but forgot that you need database access to check whether an arbitrary role ID is a superuser. Commit e7e7da2f8d fixed a similar bug in apply worker, and this patch fixes a similar bug in tablesync worker. Author: Hou Zhijie Reviewed-by: Amit Kapila Discussion: https://postgr.es/m/OS0PR01MB571607F5A9D723755268D36294759@OS0PR01MB5716.jpnprd01.prod.outlook.com
-rw-r--r--src/backend/replication/logical/tablesync.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index abae8d44dfc..db10a446b3d 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -1262,6 +1262,12 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
relstate = GetSubscriptionRelState(MyLogicalRepWorker->subid,
MyLogicalRepWorker->relid,
&relstate_lsn);
+
+ /* Is the use of a password mandatory? */
+ must_use_password = MySubscription->passwordrequired &&
+ !superuser_arg(MySubscription->owner);
+
+ /* Note that the superuser_arg call can access the DB */
CommitTransactionCommand();
SpinLockAcquire(&MyLogicalRepWorker->relmutex);
@@ -1288,10 +1294,6 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
slotname,
NAMEDATALEN);
- /* Is the use of a password mandatory? */
- must_use_password = MySubscription->passwordrequired &&
- !superuser_arg(MySubscription->owner);
-
/*
* Here we use the slot name instead of the subscription name as the
* application_name, so that it is different from the leader apply worker,