From ef2f4b9a004369cc390f1271721bc22d6a44f402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Fri, 17 Jan 2020 11:21:28 +0100
Subject: [PATCH] __postgres_*: fix forgotten edge cases in delimited
identifier escape
---
cdist/conf/type/__postgres_database/gencode-remote | 8 ++++++--
cdist/conf/type/__postgres_role/gencode-remote | 10 ++++++----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/cdist/conf/type/__postgres_database/gencode-remote b/cdist/conf/type/__postgres_database/gencode-remote
index 9f12d215..47e6b97c 100755
--- a/cdist/conf/type/__postgres_database/gencode-remote
+++ b/cdist/conf/type/__postgres_database/gencode-remote
@@ -43,10 +43,14 @@ if [ "$state_should" != "$state_is" ]; then
if [ -f "$__object/parameter/owner" ]; then
owner="-O \"$(cat "$__object/parameter/owner")\""
fi
- echo "su - '$postgres_user' -c \"createdb $owner \"$name\"\""
+ cat << EOF
+su - '$postgres_user' -c "createdb $owner \"$name\""
+EOF
;;
absent)
- echo "su - '$postgres_user' -c \"dropdb \"$name\"\""
+ cat << EOF
+su - '$postgres_user' -c "dropdb \"$name\""
+EOF
;;
esac
fi
diff --git a/cdist/conf/type/__postgres_role/gencode-remote b/cdist/conf/type/__postgres_role/gencode-remote
index 0b8852f4..977832c9 100755
--- a/cdist/conf/type/__postgres_role/gencode-remote
+++ b/cdist/conf/type/__postgres_role/gencode-remote
@@ -53,11 +53,13 @@ case "$state_should" in
done
[ -n "$password" ] && password="PASSWORD '$password'"
-
- cmd="CREATE ROLE \"$name\" WITH $password $booleans"
- echo "su - '$postgres_user' -c \"psql postgres -wc \\\"$cmd\\\"\""
+ cat << EOF
+su - '$postgres_user' -c "psql postgres -wc 'CREATE ROLE \"$name\" WITH $password $booleans;'"
+EOF
;;
absent)
- echo "su - '$postgres_user' -c \"dropuser \\\"$name\\\"\""
+ cat << EOF
+su - '$postgres_user' -c "dropuser \"$name\""
+EOF
;;
esac