diff options
author | Jonas Gunz <himself@jonasgunz.de> | 2023-01-04 15:49:04 +0100 |
---|---|---|
committer | Jonas Gunz <himself@jonasgunz.de> | 2023-01-04 15:49:04 +0100 |
commit | dd0c15c8b264341c1fb8e4e862467c1bbcfacb55 (patch) | |
tree | d96b9c6f903e26fb0dfeef7e30a96675046545db /phpipam_api/backend.py | |
parent | 7c9a41df72a0a2610bb2ba76728c665af51e0ab8 (diff) | |
parent | f80921ec8e917216ad891860fb32801b741838ec (diff) | |
download | python-phpipam-dd0c15c8b264341c1fb8e4e862467c1bbcfacb55.tar.gz |
Merge branch 'danielbolsson-master'
Diffstat (limited to 'phpipam_api/backend.py')
-rwxr-xr-x | phpipam_api/backend.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/phpipam_api/backend.py b/phpipam_api/backend.py index 85079df..b334ed2 100755 --- a/phpipam_api/backend.py +++ b/phpipam_api/backend.py @@ -18,10 +18,11 @@ class ApiObjectNotFoundException(Exception): pass class PhpipamBackend: - def __init__(self, api_url, app_id, api_user, api_password): + def __init__(self, api_url, app_id, api_user, api_password, verify): self.api_url = api_url.strip('/') + '/api/' + app_id self.api_user = api_user self.api_password = api_password + self.verify = verify # Check for static auth if len(self.api_user) == 0: @@ -31,7 +32,7 @@ class PhpipamBackend: self._getApiToken() def _getApiToken(self): - data = requests.post(self.api_url + "/user", auth=(self.api_user,self.api_password)).json() + data = requests.post(self.api_url + "/user", auth=(self.api_user,self.api_password), verify=self.verify).json() if not data['success']: raise ApiConnectionException('Failed to authenticate: ' + str(data['code']) + ' ' + data['message']) @@ -52,10 +53,11 @@ class PhpipamBackend: if self._isTokenExpired(): self._getApiToken() - data = requests.request(method, self.api_url + url, data=data, headers={'token':self.api_token}).json() + data = requests.request(method, self.api_url + url, data=data, headers={'token':self.api_token}, verify=self.verify).json() if not 'success' in data or not data['success']: raise ApiQueryException("Query failed with code " + str(data['code']) + ": " + str(data['message'])) - - return data['data'] + if 'data' in data: + return data['data'] + return data |