Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for USAGE (instead of MEMBER) privilege in all pg_has_role occurrences #1012

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Check for USAGE (instead of MEMBER) privilege in all pg_has_role occurrences #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions barman/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,11 +610,11 @@ def has_backup_privileges(self):
OR
(
(
pg_has_role(CURRENT_USER, 'pg_monitor', 'MEMBER')
pg_has_role(CURRENT_USER, 'pg_monitor', 'USAGE')
OR
(
pg_has_role(CURRENT_USER, 'pg_read_all_settings', 'MEMBER')
AND pg_has_role(CURRENT_USER, 'pg_read_all_stats', 'MEMBER')
pg_has_role(CURRENT_USER, 'pg_read_all_settings', 'USAGE')
AND pg_has_role(CURRENT_USER, 'pg_read_all_stats', 'USAGE')
)
)
AND
Expand Down Expand Up @@ -664,7 +664,7 @@ def has_checkpoint_privileges(self):
return True
else:
role_check_query = (
"select pg_has_role(CURRENT_USER ,'pg_checkpoint', 'MEMBER');"
"select pg_has_role(CURRENT_USER ,'pg_checkpoint', 'USAGE');"
)
try:
cur = self._cursor()
Expand Down Expand Up @@ -694,11 +694,11 @@ def has_monitoring_privileges(self):
monitoring_check_query = """
SELECT
(
pg_has_role(CURRENT_USER, 'pg_monitor', 'MEMBER')
pg_has_role(CURRENT_USER, 'pg_monitor', 'USAGE')
OR
(
pg_has_role(CURRENT_USER, 'pg_read_all_settings', 'MEMBER')
AND pg_has_role(CURRENT_USER, 'pg_read_all_stats', 'MEMBER')
pg_has_role(CURRENT_USER, 'pg_read_all_settings', 'USAGE')
AND pg_has_role(CURRENT_USER, 'pg_read_all_stats', 'USAGE')
)
)
"""
Expand Down
10 changes: 5 additions & 5 deletions tests/test_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ def test_has_checkpoint_privileges(
cursor_mock.fetchone.side_effect = [(False,)]
assert not server.postgres.has_checkpoint_privileges
cursor_mock.execute.assert_called_with(
"select pg_has_role(CURRENT_USER ,'pg_checkpoint', 'MEMBER');"
"select pg_has_role(CURRENT_USER ,'pg_checkpoint', 'USAGE');"
)

# no superuser, pg_checkpoint -> True
Expand All @@ -1101,7 +1101,7 @@ def test_has_checkpoint_privileges(
cursor_mock.fetchone.side_effect = [(True,)]
assert server.postgres.has_checkpoint_privileges
cursor_mock.execute.assert_called_with(
"select pg_has_role(CURRENT_USER ,'pg_checkpoint', 'MEMBER');"
"select pg_has_role(CURRENT_USER ,'pg_checkpoint', 'USAGE');"
)

# superuser, no pg_checkpoint -> True
Expand Down Expand Up @@ -1718,11 +1718,11 @@ def test_has_monitoring_privileges(
"""
SELECT
(
pg_has_role(CURRENT_USER, 'pg_monitor', 'MEMBER')
pg_has_role(CURRENT_USER, 'pg_monitor', 'USAGE')
OR
(
pg_has_role(CURRENT_USER, 'pg_read_all_settings', 'MEMBER')
AND pg_has_role(CURRENT_USER, 'pg_read_all_stats', 'MEMBER')
pg_has_role(CURRENT_USER, 'pg_read_all_settings', 'USAGE')
AND pg_has_role(CURRENT_USER, 'pg_read_all_stats', 'USAGE')
)
)
"""
Expand Down
Loading