diff options
| author | Noah Misch <noah@leadboat.com> | 2017-08-07 07:09:28 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2017-08-07 07:09:28 -0700 |
| commit | e568e1eee4650227170cf8c64eedb74bafd7d1f0 (patch) | |
| tree | 11fd80de89bf7237e1d2519c58d4c5c13a8872e5 /src/backend | |
| parent | bf6b9e94445610a3d84cf9521032fab993f96fd6 (diff) | |
| download | postgresql-e568e1eee4650227170cf8c64eedb74bafd7d1f0.tar.gz postgresql-e568e1eee4650227170cf8c64eedb74bafd7d1f0.zip | |
Again match pg_user_mappings to information_schema.user_mapping_options.
Commit 3eefc51053f250837c3115c12f8119d16881a2d7 claimed to make
pg_user_mappings enforce the qualifications user_mapping_options had
been enforcing, but its removal of a longstanding restriction left them
distinct when the current user is the subject of a mapping yet has no
server privileges. user_mapping_options emits no rows for such a
mapping, but pg_user_mappings includes full umoptions. Change
pg_user_mappings to show null for umoptions. Back-patch to 9.2, like
the above commit.
Reviewed by Tom Lane. Reported by Jeff Janes.
Security: CVE-2017-7547
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/catalog/system_views.sql | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 0fdad0c1197..dc40cde4240 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -910,7 +910,9 @@ CREATE VIEW pg_user_mappings AS ELSE A.rolname END AS usename, - CASE WHEN (U.umuser <> 0 AND A.rolname = current_user) + CASE WHEN (U.umuser <> 0 AND A.rolname = current_user + AND (pg_has_role(S.srvowner, 'USAGE') + OR has_server_privilege(S.oid, 'USAGE'))) OR (U.umuser = 0 AND pg_has_role(S.srvowner, 'USAGE')) OR (SELECT rolsuper FROM pg_authid WHERE rolname = current_user) THEN U.umoptions |