Skip to content

Commit 2223c0e

Browse files
myiimyii
authored
Merge pull request #260 from M2mobi/salt-user
fix(salt-user): redirect error output from user access checks
2 parents 1af83d1 + 4cb4c05 commit 2223c0e

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

‎mysql/salt-user.sls

+13-13
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ mysql_salt_user_with_salt_user:
2525
- connection_user: '{{ mysql_salt_user }}'
2626
- connection_pass: '{{ mysql_salt_pass }}'
2727
- connection_charset: utf8
28-
# - onlyif:
29-
# - mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;"
30-
# - VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi
28+
- onlyif:
29+
- mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1; 2>&1"
30+
- VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';" 2>&1); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi
3131
{%- if os_family in ['RedHat', 'Suse'] %}
3232
- require_in:
3333
- mysql_user: mysql_root_password
@@ -47,8 +47,8 @@ mysql_salt_user_with_salt_user_grants:
4747
- connection_pass: '{{ mysql_salt_pass }}'
4848
- connection_charset: utf8
4949
- onlyif:
50-
- mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;"
51-
- VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi
50+
- mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;" 2>&1
51+
- VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';" 2>&1); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi
5252
- require:
5353
- mysql_user: mysql_salt_user_with_salt_user
5454
{%- if os_family in ['RedHat', 'Suse'] %}
@@ -67,8 +67,8 @@ mysql_salt_user_with_root_user:
6767
- connection_pass: '{{ mysql_root_pass }}'
6868
- connection_charset: utf8
6969
- onlyif:
70-
- mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;"
71-
- VALUE=$(mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
70+
- mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;" 2>&1
71+
- VALUE=$(mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';" 2>&1); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
7272
{%- if os_family in ['RedHat', 'Suse'] %}
7373
- require_in:
7474
- mysql_user: mysql_root_password
@@ -88,8 +88,8 @@ mysql_salt_user_with_root_user_grants:
8888
- connection_pass: '{{ mysql_root_pass }}'
8989
- connection_charset: utf8
9090
- onlyif:
91-
- mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;"
92-
- VALUE=$(mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
91+
- mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1; 2>&1"
92+
- VALUE=$(mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';" 2>&1); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
9393
- require:
9494
- mysql_user: mysql_salt_user_with_root_user
9595
{%- if os_family in ['RedHat', 'Suse'] %}
@@ -107,8 +107,8 @@ mysql_salt_user_with_passwordless_root_user:
107107
- connection_user: '{{ mysql_root_user }}'
108108
- connection_charset: utf8
109109
- onlyif:
110-
- mysql --user {{ mysql_root_user }} -h {{ mysql_host }} --execute="SELECT 1;"
111-
- VALUE=$(mysql --user {{ mysql_root_user }} -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
110+
- mysql --user {{ mysql_root_user }} -h {{ mysql_host }} --execute="SELECT 1; 2>&1"
111+
- VALUE=$(mysql --user {{ mysql_root_user }} -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';" 2>&1); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
112112
{%- if os_family in ['RedHat', 'Suse'] %}
113113
- require_in:
114114
- mysql_user: mysql_root_password
@@ -127,8 +127,8 @@ mysql_salt_user_with_passwordless_root_user_grants:
127127
- connection_user: '{{ mysql_root_user }}'
128128
- connection_charset: utf8
129129
- onlyif:
130-
- mysql --user {{ mysql_root_user }} -h {{ mysql_host }} --execute="SELECT 1;"
131-
- VALUE=$(mysql --user {{ mysql_root_user }} -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
130+
- mysql --user {{ mysql_root_user }} -h {{ mysql_host }} --execute="SELECT 1; 2>&1"
131+
- VALUE=$(mysql --user {{ mysql_root_user }} -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';" 2>&1); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi
132132
- require:
133133
- mysql_user: mysql_salt_user_with_passwordless_root_user
134134
{%- if os_family in ['RedHat', 'Suse'] %}

0 commit comments

Comments
 (0)