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

[rabbitmq_binding] Fix the quoting of vhost and other names (#45109)

Browse source 
* [rabbitmq_binding] Fix the quoting of vhost and other names, which was broken in PR #35651
* Merge missing urllib_parse.quote from PR #42422
* Missed one line, where  also needs to be escaped, i.e., the destination

(cherry picked from commit d5f8738bf2)
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Tobias Wolf 2018-09-25 07:34:41 +02:00 committed by Toshio Kuratomi
parent 93b75558bb
commit ee523beb8e
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/45543-rabbitmq_bindings-fix-quote.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Fix the quoting of vhost and other names in rabbitmq_binding

14
lib/ansible/modules/messaging/rabbitmq_binding.py
View file

@ -125,11 +125,11 @@ class RabbitMqBinding(object):
self.base_url = 'http://{0}:{1}/api/bindings'.format(self.login_host,
self.login_port)
self.url = '{0}/{1}/e/{2}/{3}/{4}/{5}'.format(self.base_url,
urllib_parse.quote(self.vhost),
urllib_parse.quote(self.name),
urllib_parse.quote(self.vhost, safe=''),
urllib_parse.quote(self.name, safe=''),
self.destination_type,
self.destination,
self.routing_key)
urllib_parse.quote(self.destination, safe=''),
urllib_parse.quote(self.routing_key))
self.result = {
'changed': False,
'name': self.module.params['name'],
@ -247,10 +247,10 @@ class RabbitMqBinding(object):
:return:
"""
self.url = '{0}/{1}/e/{2}/{3}/{4}'.format(self.base_url,
urllib_parse.quote(self.vhost),
urllib_parse.quote(self.name),
urllib_parse.quote(self.vhost, safe=''),
urllib_parse.quote(self.name, safe=''),
self.destination_type,
urllib_parse.quote(self.destination))
urllib_parse.quote(self.destination, safe=''))
self.api_result = self.request.post(self.url,
auth=self.authentication,
headers={"content-type": "application/json"},