kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

__mysql_privileges: fix quoting

Browse source
This commit is contained in:
ander 2020-02-13 17:29:44 +02:00
parent bcefeb240c
commit 710e99f240
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__mysql_privileges/explorer/state
View file

@ -30,7 +30,7 @@ host="$( cat "$__object/parameter/host" )"
check_privileges="$( check_privileges="$(
mysql -B -N -e "show grants for '$user'@'$host'" \ mysql -B -N -e "show grants for '$user'@'$host'" \
| grep -Ei "^grant $privileges on .$database.\..$table. to " || true )" | grep -Ei "^grant $privileges on .$database.\..?$table.? to " || true )"
if [ -n "$check_privileges" ] if [ -n "$check_privileges" ]
then then

9
cdist/conf/type/__mysql_privileges/gencode-remote
View file

@ -37,13 +37,18 @@ user="$( cat "$__object/parameter/user" )"
host="$( cat "$__object/parameter/host" )" host="$( cat "$__object/parameter/host" )"
if [ "$table" != '*' ]
then
table="$( printf '`%s`' "$table" )"
fi
case "$state_should" in case "$state_should" in
present) present)
echo "mysql -e 'grant $privileges on \`$database\`.\`$table\` to \`$user\`@\`$host\`'" echo "mysql -e 'grant $privileges on \`$database\`.$table to \`$user\`@\`$host\`'"
echo "grant $privileges on $database.$table to $user@$host" >> "$__messages_out" echo "grant $privileges on $database.$table to $user@$host" >> "$__messages_out"
;; ;;
absent) absent)
echo "mysql -e 'revoke $privileges on \`$database\`.\`$table\` from \`$user\`@\`$host\`'" echo "mysql -e 'revoke $privileges on \`$database\`.$table from \`$user\`@\`$host\`'"
echo "revoke $privileges on $database.$table from $user@$host" >> "$__messages_out" echo "revoke $privileges on $database.$table from $user@$host" >> "$__messages_out"
;; ;;
esac esac