Skip to content

Commit 01717c4

Browse files
committed
Fix: Unterminated quoted string when creating read user
puppetdb in default config will create a read-only user, however there is a bug[1] with the syntax to set the default read grant. Fix it with help from comments[2]. [1] puppetlabs#330 (comment) [2] puppetlabs#339 (comment) Change-Id: Ifeb89602c40c21dab747536fe74dca4457215b26
1 parent ea9dba0 commit 01717c4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

manifests/database/default_read_grant.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
acl.defaclacl
2020
FROM pg_default_acl acl
2121
JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
22-
WHERE acl.defaclacl::text ~ '.*\\\\\"${database_read_only_username}\\\\\"=r/${database_username}\\\".*'
22+
WHERE array_to_string(acl.defaclacl, ' + ') ~ '.*(\")?${database_read_only_username}(\")?=r/(\")?${database_username}(\")?.*'
2323
AND nspname = '${schema}'",
2424
}
2525

@@ -36,7 +36,7 @@
3636
acl.defaclacl
3737
FROM pg_default_acl acl
3838
JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
39-
WHERE acl.defaclacl::text ~ '.*\\\\\"${database_read_only_username}\\\\\"=U/${database_username}\\\".*'
39+
WHERE array_to_string(acl.defaclacl, ' + ') ~ '.*(\")?${database_read_only_username}(\")?=U/(\")?${database_username}(\")?.*'
4040
AND nspname = '${schema}'",
4141
}
4242

@@ -53,7 +53,7 @@
5353
acl.defaclacl
5454
FROM pg_default_acl acl
5555
JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
56-
WHERE acl.defaclacl::text ~ '.*\\\\\"${database_read_only_username}\\\\\"=X/${database_username}\\\".*'
56+
WHERE array_to_string(acl.defaclacl, ' + ') ~ '.*(\")?${database_read_only_username}(\")?=X/(\")?${database_username}(\")?.*'
5757
AND nspname = '${schema}'",
5858
}
5959
}

0 commit comments

Comments
 (0)