cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mysql_user: Match quotes, double quotes and backticks when checking current privileges

Browse source
This commit is contained in:
plumbeo 2018-05-14 18:25:21 +02:00
parent afc196acf1
commit 1ae0e21383
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/database/mysql/mysql_user.py
View file

@ -434,14 +434,14 @@ def privileges_get(cursor, user, host):
return x return x
for grant in grants: for grant in grants:
res = re.match("GRANT (.+) ON (.+) TO '.*'@'.*'( IDENTIFIED BY PASSWORD '.+')? ?(.*)", grant[0]) res = re.match("""GRANT (.+) ON (.+) TO (['`"]).*\\3@(['`"]).*\\4( IDENTIFIED BY PASSWORD (['`"]).+\5)? ?(.*)""", grant[0])
if res is None: if res is None:
raise InvalidPrivsError('unable to parse the MySQL grant string: %s' % grant[0]) raise InvalidPrivsError('unable to parse the MySQL grant string: %s' % grant[0])
privileges = res.group(1).split(", ") privileges = res.group(1).split(", ")
privileges = [pick(x) for x in privileges] privileges = [pick(x) for x in privileges]
if "WITH GRANT OPTION" in res.group(4): if "WITH GRANT OPTION" in res.group(7):
privileges.append('GRANT') privileges.append('GRANT')
if "REQUIRE SSL" in res.group(4): if "REQUIRE SSL" in res.group(7):
privileges.append('REQUIRESSL') privileges.append('REQUIRESSL')
db = res.group(2) db = res.group(2)
output[db] = privileges output[db] = privileges