ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-04 05:04:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix for issue #10342

Browse source
This commit is contained in:
Killian Levacher 2025-07-04 14:27:02 +01:00
commit 627093d5a7
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ URL_CLIENT_ROLES = "{url}/admin/realms/{realm}/clients/{id}/roles"
URL_CLIENT_ROLE = "{url}/admin/realms/{realm}/clients/{id}/roles/{name}" URL_CLIENT_ROLE = "{url}/admin/realms/{realm}/clients/{id}/roles/{name}"
URL_CLIENT_ROLE_COMPOSITES = "{url}/admin/realms/{realm}/clients/{id}/roles/{name}/composites" URL_CLIENT_ROLE_COMPOSITES = "{url}/admin/realms/{realm}/clients/{id}/roles/{name}/composites"
URL_CLIENT_ROLE_SCOPE_CLIENTS = "{url}/admin/realms/{realm}/clients/{id}/scope-mappings/clients/{scopeid}" URL_CLIENT_ROLE_SCOPE_CLIENTS = "{url}/admin/realms/{realm}/client-scopes/{scopeid}/scope-mappings/clients/{id}"
URL_CLIENT_ROLE_SCOPE_REALM = "{url}/admin/realms/{realm}/clients/{id}/scope-mappings/realm" URL_CLIENT_ROLE_SCOPE_REALM = "{url}/admin/realms/{realm}/clients/{id}/scope-mappings/realm"
URL_REALM_ROLES = "{url}/admin/realms/{realm}/roles" URL_REALM_ROLES = "{url}/admin/realms/{realm}/roles"

20
plugins/modules/keycloak_client_rolescope.py
View file

@ -193,27 +193,27 @@ def main():
objRealm = kc.get_realm_by_id(realm) objRealm = kc.get_realm_by_id(realm)
if not objRealm: if not objRealm:
module.fail_json(msg="Failed to retrive realm '{realm}'".format(realm=realm)) module.fail_json(msg="Failed to retrieve realm '{realm}'".format(realm=realm))
objClient = kc.get_client_by_clientid(clientid, realm) objClient = kc.get_client_by_clientid(clientid, realm)
if not objClient: if not objClient:
module.fail_json(msg="Failed to retrive client '{realm}.{clientid}'".format(realm=realm, clientid=clientid)) module.fail_json(msg="Failed to retrieve client '{realm}.{clientid}'".format(realm=realm, clientid=clientid))
if objClient["fullScopeAllowed"] and state == "present": if objClient["fullScopeAllowed"] and state == "present":
module.fail_json(msg="FullScopeAllowed is active for Client '{realm}.{clientid}'".format(realm=realm, clientid=clientid)) module.fail_json(msg="FullScopeAllowed is active for Client '{realm}.{clientid}'".format(realm=realm, clientid=clientid))
if client_scope_id: if client_scope_id:
objClientScope = kc.get_client_by_clientid(client_scope_id, realm) objClientScope = kc.get_clientscope_by_clientscopeid(client_scope_id, realm)
if not objClientScope: if not objClientScope:
module.fail_json(msg="Failed to retrive client '{realm}.{client_scope_id}'".format(realm=realm, client_scope_id=client_scope_id)) module.fail_json(msg="Failed to retrieve client '{realm}.{client_scope_id}'".format(realm=realm, client_scope_id=client_scope_id))
before_role_mapping = kc.get_client_role_scope_from_client(objClient["id"], objClientScope["id"], realm) before_role_mapping = kc.get_client_role_scope_from_client(objClient["id"], objClientScope["id"], realm)
else: else:
before_role_mapping = kc.get_client_role_scope_from_realm(objClient["id"], realm) before_role_mapping = kc.get_client_role_scope_from_realm(objClient["id"], realm)
if client_scope_id: if objClient:
# retrive all role from client_scope # retrieve all role from client
client_scope_roles_by_name = kc.get_client_roles_by_id(objClientScope["id"], realm) client_scope_roles_by_name = kc.get_client_roles_by_id(objClient["id"], realm)
else: else:
# retrive all role from realm # retrieve all role from realm
client_scope_roles_by_name = kc.get_realm_roles(realm) client_scope_roles_by_name = kc.get_realm_roles(realm)
# convert to indexed Dict by name # convert to indexed Dict by name
@ -226,10 +226,10 @@ def main():
for role_name in role_names: for role_name in role_names:
if role_name not in client_scope_roles_by_name: if role_name not in client_scope_roles_by_name:
if client_scope_id: if client_scope_id:
module.fail_json(msg="Failed to retrive role '{realm}.{client_scope_id}.{role_name}'" module.fail_json(msg="Failed to retrieve role '{realm}.{client_scope_id}.{role_name}'"
.format(realm=realm, client_scope_id=client_scope_id, role_name=role_name)) .format(realm=realm, client_scope_id=client_scope_id, role_name=role_name))
else: else:
module.fail_json(msg="Failed to retrive role '{realm}.{role_name}'".format(realm=realm, role_name=role_name)) module.fail_json(msg="Failed to retrieve role '{realm}.{role_name}'".format(realm=realm, role_name=role_name))
if role_name not in role_mapping_by_name: if role_name not in role_mapping_by_name:
role_mapping_to_manipulate.append(client_scope_roles_by_name[role_name]) role_mapping_to_manipulate.append(client_scope_roles_by_name[role_name])
role_mapping_by_name[role_name] = client_scope_roles_by_name[role_name] role_mapping_by_name[role_name] = client_scope_roles_by_name[role_name]