ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

keycloak_role: quote role name in urls (#3536)

Browse source 
* quote role name in urls

* add changelog fragment

* Update changelogs/fragments/3536-quote-role-name-in-url.yml

Co-authored-by: Ajpantuso <ajpantuso@gmail.com>

* fix linefeeds

Co-authored-by: Ajpantuso <ajpantuso@gmail.com>
This commit is contained in:
Laurent Paumier 2021-10-09 13:38:02 +02:00 committed by GitHub
parent d1f820ed06
commit 9de01e04f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/3536-quote-role-name-in-url.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- keycloak_role - quote role name when used in URL path to avoid errors when role names contain special characters (https://github.com/ansible-collections/community.general/issues/3535, https://github.com/ansible-collections/community.general/pull/3536).

12
plugins/module_utils/identity/keycloak/keycloak.py
View file

@ -1031,7 +1031,7 @@ class KeycloakAPI(object):
:param name: Name of the role to fetch. :param name: Name of the role to fetch.
:param realm: Realm in which the role resides; default 'master'. :param realm: Realm in which the role resides; default 'master'.
""" """
role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=name) role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(name))
try: try:
return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders, return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders,
validate_certs=self.validate_certs).read())) validate_certs=self.validate_certs).read()))
@ -1065,7 +1065,7 @@ class KeycloakAPI(object):
:param rolerep: A RoleRepresentation of the updated role. :param rolerep: A RoleRepresentation of the updated role.
:return HTTPResponse object on success :return HTTPResponse object on success
""" """
role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=rolerep['name']) role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(rolerep['name']))
try: try:
return open_url(role_url, method='PUT', headers=self.restheaders, return open_url(role_url, method='PUT', headers=self.restheaders,
data=json.dumps(rolerep), validate_certs=self.validate_certs) data=json.dumps(rolerep), validate_certs=self.validate_certs)
@ -1079,7 +1079,7 @@ class KeycloakAPI(object):
:param name: The name of the role. :param name: The name of the role.
:param realm: The realm in which this role resides, default "master". :param realm: The realm in which this role resides, default "master".
""" """
role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=name) role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(name))
try: try:
return open_url(role_url, method='DELETE', headers=self.restheaders, return open_url(role_url, method='DELETE', headers=self.restheaders,
validate_certs=self.validate_certs) validate_certs=self.validate_certs)
@ -1122,7 +1122,7 @@ class KeycloakAPI(object):
if cid is None: if cid is None:
self.module.fail_json(msg='Could not find client %s in realm %s' self.module.fail_json(msg='Could not find client %s in realm %s'
% (clientid, realm)) % (clientid, realm))
role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=name) role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(name))
try: try:
return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders, return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders,
validate_certs=self.validate_certs).read())) validate_certs=self.validate_certs).read()))
@ -1168,7 +1168,7 @@ class KeycloakAPI(object):
if cid is None: if cid is None:
self.module.fail_json(msg='Could not find client %s in realm %s' self.module.fail_json(msg='Could not find client %s in realm %s'
% (clientid, realm)) % (clientid, realm))
role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=rolerep['name']) role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(rolerep['name']))
try: try:
return open_url(role_url, method='PUT', headers=self.restheaders, return open_url(role_url, method='PUT', headers=self.restheaders,
data=json.dumps(rolerep), validate_certs=self.validate_certs) data=json.dumps(rolerep), validate_certs=self.validate_certs)
@ -1187,7 +1187,7 @@ class KeycloakAPI(object):
if cid is None: if cid is None:
self.module.fail_json(msg='Could not find client %s in realm %s' self.module.fail_json(msg='Could not find client %s in realm %s'
% (clientid, realm)) % (clientid, realm))
role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=name) role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(name))
try: try:
return open_url(role_url, method='DELETE', headers=self.restheaders, return open_url(role_url, method='DELETE', headers=self.restheaders,
validate_certs=self.validate_certs) validate_certs=self.validate_certs)