Skip to content

fix: DefaultPrivileges are not applied due to incorrect observer query #460

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

Open
hsahmed wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −20
Open

fix: DefaultPrivileges are not applied due to incorrect observer query #460

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
21 changes: 11 additions & 10 deletions pkg/controller/cluster/postgresql/default_privileges/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,20 +153,21 @@ var (
)

func selectDefaultPrivilegesQuery(gp v1alpha1.DefaultPrivilegesParameters, q *xsql.Query) {
sqlString := `
select distinct(default_acl.privilege_type)
from pg_roles r
join (SELECT defaclnamespace, (aclexplode(defaclacl)).* FROM pg_default_acl
WHERE defaclobjtype = $1) default_acl
on r.oid = default_acl.grantee
where r.rolname = $2;
`
q.String = sqlString
q.String = "SELECT DISTINCT(acl.privilege_type) " +
"FROM pg_default_acl d " +
"CROSS JOIN LATERAL aclexplode(d.defaclacl) AS acl " +
"INNER JOIN pg_roles grantor ON grantor.oid = d.defaclrole " +
"INNER JOIN pg_roles grantee ON grantee.oid = acl.grantee " +
"WHERE d.defaclobjtype = $1 " +
"AND grantor.rolname = $2 " +
"AND grantee.rolname = $3 " +
"AND d.defaclnamespace = COALESCE((SELECT oid FROM pg_namespace WHERE nspname = $4), 0)"
q.Parameters = []interface{}{
objectTypes[*gp.ObjectType],
*gp.TargetRole,
*gp.Role,
gp.Schema,
}

}

func withOption(option *v1alpha1.GrantOption) string {
Expand Down
21 changes: 11 additions & 10 deletions pkg/controller/namespaced/postgresql/default_privileges/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,21 @@ var (
)

func selectDefaultPrivilegesQuery(gp v1alpha1.DefaultPrivilegesParameters, q *xsql.Query) {
sqlString := `
select distinct(default_acl.privilege_type)
from pg_roles r
join (SELECT defaclnamespace, (aclexplode(defaclacl)).* FROM pg_default_acl
WHERE defaclobjtype = $1) default_acl
on r.oid = default_acl.grantee
where r.rolname = $2;
`
q.String = sqlString
q.String = "SELECT DISTINCT(acl.privilege_type) " +
"FROM pg_default_acl d " +
"CROSS JOIN LATERAL aclexplode(d.defaclacl) AS acl " +
"INNER JOIN pg_roles grantor ON grantor.oid = d.defaclrole " +
"INNER JOIN pg_roles grantee ON grantee.oid = acl.grantee " +
"WHERE d.defaclobjtype = $1 " +
"AND grantor.rolname = $2 " +
"AND grantee.rolname = $3 " +
"AND d.defaclnamespace = COALESCE((SELECT oid FROM pg_namespace WHERE nspname = $4), 0)"
q.Parameters = []interface{}{
objectTypes[*gp.ObjectType],
*gp.TargetRole,
*gp.Role,
gp.Schema,
}

}

func withOption(option *v1alpha1.GrantOption) string {
Expand Down