Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix KeycloakAPI's missing http_agent, timeout, and validate_certs open_url() parameters #7067

Merged
merged 3 commits into from
Aug 11, 2023
Merged

Fix KeycloakAPI's missing http_agent, timeout, and validate_certs open_url() parameters #7067

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d01417b
Fix KeycloakAPI's missing http_agent, timeout, and validate_certs ope…
loricvdt Aug 7, 2023
75b899a
Add changelog fragment
loricvdt Aug 7, 2023
d87f1f1
Update changelogs/fragments/7067-keycloak-api-paramerter-fix.yml
loricvdt Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/7067-keycloak-api-paramerter-fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- keycloak module util - fix missing http_agent, timeout, and validate_certs open_url() parameters
44 changes: 31 additions & 13 deletions plugins/module_utils/identity/keycloak/keycloak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,8 @@ def get_user_by_username(self, username, realm="master"):
users_url += '?username=%s&exact=true' % username
try:
userrep = None
users = json.loads(to_native(open_url(users_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
users = json.loads(to_native(open_url(users_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs).read()))
for user in users:
if user['username'] == username:
Expand All @@ -803,7 +804,8 @@ def get_service_account_user_by_client_id(self, client_id, realm="master"):

service_account_user_url = URL_CLIENT_SERVICE_ACCOUNT_USER.format(url=self.baseurl, realm=realm, id=cid)
try:
return json.loads(to_native(open_url(service_account_user_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
return json.loads(to_native(open_url(service_account_user_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs).read()))
except ValueError as e:
self.module.fail_json(msg='API returned incorrect JSON when trying to obtain the service-account-user for realm %s and client_id %s: %s'
Expand Down Expand Up @@ -1347,7 +1349,8 @@ def create_clientsecret(self, id, realm="master"):
clientsecret_url = URL_CLIENTSECRET.format(url=self.baseurl, realm=realm, id=id)

try:
return json.loads(to_native(open_url(clientsecret_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
return json.loads(to_native(open_url(clientsecret_url, method='POST', http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs).read()))

except HTTPError as e:
Expand All @@ -1370,7 +1373,8 @@ def get_clientsecret(self, id, realm="master"):
clientsecret_url = URL_CLIENTSECRET.format(url=self.baseurl, realm=realm, id=id)

try:
return json.loads(to_native(open_url(clientsecret_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
return json.loads(to_native(open_url(clientsecret_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs).read()))

except HTTPError as e:
Expand Down Expand Up @@ -2678,7 +2682,9 @@ def get_user_by_id(self, user_id, realm='master'):
open_url(
user_url,
method='GET',
headers=self.restheaders))
http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs))
return userrep
except Exception as e:
self.module.fail_json(msg='Could not get user %s in realm %s: %s'
Expand All @@ -2700,8 +2706,10 @@ def create_user(self, userrep, realm='master'):
realm=realm)
open_url(users_url,
method='POST',
headers=self.restheaders,
data=json.dumps(userrep))
http_agent=self.http_agent, headers=self.restheaders,
data=json.dumps(userrep),
timeout=self.connection_timeout,
validate_certs=self.validate_certs)
created_user = self.get_user_by_username(
username=userrep['username'],
realm=realm)
Expand Down Expand Up @@ -2744,8 +2752,10 @@ def update_user(self, userrep, realm='master'):
open_url(
user_url,
method='PUT',
headers=self.restheaders,
data=json.dumps(userrep))
http_agent=self.http_agent, headers=self.restheaders,
data=json.dumps(userrep),
timeout=self.connection_timeout,
validate_certs=self.validate_certs)
updated_user = self.get_user_by_id(
user_id=userrep['id'],
realm=realm)
Expand All @@ -2769,7 +2779,9 @@ def delete_user(self, user_id, realm='master'):
return open_url(
user_url,
method='DELETE',
headers=self.restheaders)
http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs)
except Exception as e:
self.module.fail_json(msg='Could not delete user %s in realm %s: %s'
% (user_id, realm, str(e)))
Expand All @@ -2791,7 +2803,9 @@ def get_user_groups(self, user_id, realm='master'):
open_url(
user_groups_url,
method='GET',
headers=self.restheaders))
http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs))
for user_group in user_groups:
groups.append(user_group["name"])
return groups
Expand All @@ -2816,7 +2830,9 @@ def add_user_in_group(self, user_id, group_id, realm='master'):
return open_url(
user_group_url,
method='PUT',
headers=self.restheaders)
http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs)
except Exception as e:
self.module.fail_json(msg='Could not add user %s in group %s in realm %s: %s'
% (user_id, group_id, realm, str(e)))
Expand All @@ -2838,7 +2854,9 @@ def remove_user_from_group(self, user_id, group_id, realm='master'):
return open_url(
user_group_url,
method='DELETE',
headers=self.restheaders)
http_agent=self.http_agent, headers=self.restheaders,
timeout=self.connection_timeout,
validate_certs=self.validate_certs)
except Exception as e:
self.module.fail_json(msg='Could not remove user %s from group %s in realm %s: %s'
% (user_id, group_id, realm, str(e)))
Expand Down