Fix: Unterminated quoted string when creating read user

waipeng · smortex · waipeng · commit 2d8d597f4b0f · 2024-02-05T23:47:49.000+11:00
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) Co-authored-by: Romain Tartière <romain@blogreen.org> Signed-off-by: Jake Yip <jake.yip@ardc.edu.au>
diff --git a/manifests/database/default_read_grant.pp b/manifests/database/default_read_grant.pp
@@ -19,7 +19,7 @@
                   acl.defaclacl
                 FROM pg_default_acl acl
                 JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
-                WHERE acl.defaclacl::text ~ '.*\\\\\"${database_read_only_username}\\\\\"=r/${database_username}\\\".*'
+                WHERE '@' || array_to_string(acl.defaclacl, '@') || '@' ~ '@(\"?)${database_read_only_username}\\1=r/(\"?)${database_username}\\2@'
                 AND nspname = '${schema}'",
   }
 
@@ -36,7 +36,7 @@
                   acl.defaclacl
                 FROM pg_default_acl acl
                 JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
-                WHERE acl.defaclacl::text ~ '.*\\\\\"${database_read_only_username}\\\\\"=U/${database_username}\\\".*'
+                WHERE '@' || array_to_string(acl.defaclacl, '@') || '@' ~ '@(\"?)${database_read_only_username}\\1=U/(\"?)${database_username}\\2@'
                 AND nspname = '${schema}'",
   }
 
@@ -53,7 +53,7 @@
                   acl.defaclacl
                 FROM pg_default_acl acl
                 JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
-                WHERE acl.defaclacl::text ~ '.*\\\\\"${database_read_only_username}\\\\\"=X/${database_username}\\\".*'
+                WHERE '@' || array_to_string(acl.defaclacl, '@') || '@' ~ '@(\"?)${database_read_only_username}\\1=X/(\"?)${database_username}\\2@'
                 AND nspname = '${schema}'",
   }
 }
diff --git a/spec/support/unit/shared/database.rb b/spec/support/unit/shared/database.rb
@@ -72,7 +72,7 @@
                   acl.defaclacl
                 FROM pg_default_acl acl
                 JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
-                WHERE acl.defaclacl::text ~ '.*\\\\\"#{with[:database_read_only_username]}\\\\\"=r/#{with[:database_username]}\\\".*'
+                WHERE '@' || array_to_string(acl.defaclacl, '@') || '@' ~ '@(\"?)${database_read_only_username}\\1=r/(\"?)${database_username}\\2@'
                 AND nspname = 'public'",
       )
   }
@@ -92,7 +92,7 @@
                   acl.defaclacl
                 FROM pg_default_acl acl
                 JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
-                WHERE acl.defaclacl::text ~ '.*\\\\\"#{with[:database_read_only_username]}\\\\\"=U/#{with[:database_username]}\\\".*'
+                WHERE '@' || array_to_string(acl.defaclacl, '@') || '@' ~ '@(\"?)${database_read_only_username}\\1=U/(\"?)${database_username}\\2@'
                 AND nspname = 'public'",
       )
   }
@@ -112,7 +112,7 @@
                   acl.defaclacl
                 FROM pg_default_acl acl
                 JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid
-                WHERE acl.defaclacl::text ~ '.*\\\\\"#{with[:database_read_only_username]}\\\\\"=X/#{with[:database_username]}\\\".*'
+                WHERE '@' || array_to_string(acl.defaclacl, '@') || '@' ~ '@(\"?)${database_read_only_username}\\1=X/(\"?)${database_username}\\2@'
                 AND nspname = 'public'",
       )
   }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`acl.defaclacl`
`20`	`20`	`FROM pg_default_acl acl`
`21`	`21`	`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}\\1=r/(\"?)${database_username}\\2@'`
`23`	`23`	`AND nspname = '${schema}'",`
`24`	`24`	`}`
`25`	`25`
`@@ -36,7 +36,7 @@`
`36`	`36`	`acl.defaclacl`
`37`	`37`	`FROM pg_default_acl acl`
`38`	`38`	`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}\\1=U/(\"?)${database_username}\\2@'`
`40`	`40`	`AND nspname = '${schema}'",`
`41`	`41`	`}`
`42`	`42`
`@@ -53,7 +53,7 @@`
`53`	`53`	`acl.defaclacl`
`54`	`54`	`FROM pg_default_acl acl`
`55`	`55`	`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}\\1=X/(\"?)${database_username}\\2@'`
`57`	`57`	`AND nspname = '${schema}'",`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`acl.defaclacl`
`73`	`73`	`FROM pg_default_acl acl`
`74`	`74`	`JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid`
`75`		`- WHERE acl.defaclacl::text ~ '.\\\\\"#{with[:database_read_only_username]}\\\\\"=r/#{with[:database_username]}\\\".'`
	`75`	`+ WHERE '@' \|\| array_to_string(acl.defaclacl, '@') \|\| '@' ~ '@(\"?)${database_read_only_username}\\1=r/(\"?)${database_username}\\2@'`
`76`	`76`	`AND nspname = 'public'",`
`77`	`77`	`)`
`78`	`78`	`}`
`@@ -92,7 +92,7 @@`
`92`	`92`	`acl.defaclacl`
`93`	`93`	`FROM pg_default_acl acl`
`94`	`94`	`JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid`
`95`		`- WHERE acl.defaclacl::text ~ '.\\\\\"#{with[:database_read_only_username]}\\\\\"=U/#{with[:database_username]}\\\".'`
	`95`	`+ WHERE '@' \|\| array_to_string(acl.defaclacl, '@') \|\| '@' ~ '@(\"?)${database_read_only_username}\\1=U/(\"?)${database_username}\\2@'`
`96`	`96`	`AND nspname = 'public'",`
`97`	`97`	`)`
`98`	`98`	`}`
`@@ -112,7 +112,7 @@`
`112`	`112`	`acl.defaclacl`
`113`	`113`	`FROM pg_default_acl acl`
`114`	`114`	`JOIN pg_namespace ns ON acl.defaclnamespace=ns.oid`
`115`		`- WHERE acl.defaclacl::text ~ '.\\\\\"#{with[:database_read_only_username]}\\\\\"=X/#{with[:database_username]}\\\".'`
	`115`	`+ WHERE '@' \|\| array_to_string(acl.defaclacl, '@') \|\| '@' ~ '@(\"?)${database_read_only_username}\\1=X/(\"?)${database_username}\\2@'`
`116`	`116`	`AND nspname = 'public'",`
`117`	`117`	`)`
`118`	`118`	`}`