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

Jump to bottom

Fix flake8 warnings #10

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Fix flake8 warnings #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b20b8
Fix flake8 formating issues
thalman Aug 17, 2024
51b20a3
Remove unused variable
thalman Aug 17, 2024
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
50 changes: 22 additions & 28 deletions keycloak_httpd_client/keycloak_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def __str__(self):

# ------------------------------------------------------------------------------


class KeycloakREST(object):

def __init__(self, server, auth_role=None, session=None):
Expand All @@ -111,7 +112,6 @@ def _log_rest_response(self, cmd_name, response):
response.headers.get('Content-Length'),
response.headers.get('Content-Type'))


def _log_rest_request(self, cmd_name, url, data=None):
fname = inspect.stack()[1][3]
logger.debug('%s() [%s] url=%s%s',
Expand Down Expand Up @@ -145,7 +145,7 @@ def get_initial_access_token(self, realm_name):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -165,7 +165,7 @@ def get_server_info(self):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -185,7 +185,7 @@ def get_realms(self):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -209,7 +209,7 @@ def create_realm(self, realm_name):
except ValueError:
response_json = None

if response.status_code != requests.codes.created: # pylint: disable=no-member
if response.status_code != requests.codes.created: # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -229,7 +229,7 @@ def delete_realm(self, realm_name):
except ValueError:
response_json = None

if response.status_code != requests.codes.no_content: # pylint: disable=no-member
if response.status_code != requests.codes.no_content: # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -244,7 +244,7 @@ def get_realm_saml_metadata(self, realm_name):
response = self.session.get(url)
self._log_rest_response(cmd_name, response)

if response.status_code != requests.codes.ok: # pylint: disable=no-member
if response.status_code != requests.codes.ok: # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response.text, False)
Expand All @@ -265,13 +265,12 @@ def get_clients(self, realm_name):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
return response_json


def get_client_by_clientid(self, realm_name, clientid):
cmd_name = 'get clientid "{clientid}" in realm "{realm}"'.format(
clientid=clientid, realm=realm_name)
Expand All @@ -290,7 +289,7 @@ def get_client_by_clientid(self, realm_name, clientid):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

if not isinstance(response_json, list):
Expand All @@ -310,7 +309,6 @@ def get_client_by_clientid(self, realm_name, clientid):
self._log_return_value(response_json[0])
return response_json[0]


def get_client_id_by_clientid(self, realm_name, clientid):
client = self.get_client_by_clientid(realm_name, clientid)
return client.get('id')
Expand All @@ -333,7 +331,7 @@ def convert_saml_metadata_to_client_representation(self, realm_name, metadata):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -357,7 +355,7 @@ def get_client_secret_by_id(self, realm_name, obj_id):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -381,7 +379,7 @@ def regenerate_client_secret_by_id(self, realm_name, obj_id):
response_json = None

if (not response_json or
response.status_code != requests.codes.ok): # pylint: disable=no-member
response.status_code != requests.codes.ok): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -405,7 +403,7 @@ def create_client_from_client_representation(self, realm_name, client_representa
except ValueError:
response_json = None

if response.status_code != requests.codes.created: # pylint: disable=no-member
if response.status_code != requests.codes.created: # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand Down Expand Up @@ -460,7 +458,7 @@ def register_client(self, initial_access_token, realm_name,
response_json = None

if (not response_json or
response.status_code != requests.codes.created): # pylint: disable=no-member
response.status_code != requests.codes.created): # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -470,7 +468,6 @@ def delete_client_by_clientid(self, realm_name, clientid):
obj_id = self.get_client_id_by_clientid(realm_name, clientid)
self.delete_client_by_id(realm_name, obj_id)


def delete_client_by_id(self, realm_name, obj_id):
cmd_name = 'delete client id "{id}"in realm "{realm}"'.format(
id=obj_id, realm=realm_name)
Expand All @@ -488,7 +485,7 @@ def delete_client_by_id(self, realm_name, obj_id):
except ValueError:
response_json = None

if response.status_code != requests.codes.no_content: # pylint: disable=no-member
if response.status_code != requests.codes.no_content: # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -511,7 +508,7 @@ def update_client(self, realm_name, client):
except ValueError:
response_json = None

if response.status_code != requests.codes.no_content: # pylint: disable=no-member
if response.status_code != requests.codes.no_content: # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -527,7 +524,6 @@ def update_client_attributes(self, realm_name, client, update_attrs):
'new attrs=%s', client_id, client['attributes'])
self.update_client(realm_name, client)


def update_client_attributes_by_clientid(self, realm_name, clientid,
update_attrs):
client = self.get_client_by_clientid(realm_name, clientid)
Expand Down Expand Up @@ -574,7 +570,7 @@ def create_client_protocol_mapper(self, realm_name, client, mapper):
except ValueError:
response_json = None

if response.status_code != requests.codes.created: # pylint: disable=no-member
if response.status_code != requests.codes.created: # pylint: disable=no-member
raise RESTError(cmd_name, response)

self._log_return_value(response_json)
Expand All @@ -585,7 +581,6 @@ def create_client_protocol_mapper_by_clientid(self, realm_name, clientid,
client = self.get_client_by_clientid(realm_name, clientid)
self.create_client_protocol_mapper(realm_name, client, mapper)


def add_client_redirect_uris_by_clientid(self, realm_name, clientid, uris):
client = self.get_client_by_clientid(realm_name, clientid)

Expand Down Expand Up @@ -634,11 +629,11 @@ def _create_session(self, tls_verify):
'client_id': self.client_id})

session.verify = tls_verify
token = session.fetch_token(token_url=token_url,
username=self.username,
password=self.password,
client_id=self.client_id,
verify=session.verify)
session.fetch_token(token_url=token_url,
username=self.username,
password=self.password,
client_id=self.client_id,
verify=session.verify)

return session

Expand All @@ -649,7 +644,6 @@ def __init__(self, server, tls_verify):
super(KeycloakAnonymousConnection, self).__init__(server, 'anonymous')
self.session = self._create_session(tls_verify)


def _create_session(self, tls_verify):
session = requests.Session()
session.verify = tls_verify
Expand Down
Loading
Loading