Skip to content
This repository was archived by the owner on Jan 19, 2018. It is now read-only.

Added cert param in make_rest_request to pass client side certs #694

Closed
wants to merge 1 commit into from
Closed

Added cert param in make_rest_request to pass client side certs #694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions atomicapp/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ def getUserHome():
return home

@staticmethod
def make_rest_request(method, url, verify=True, data=None):
def make_rest_request(method, url, verify=True, data=None, cert=None):
"""
Make HTTP request to url

Expand All @@ -444,6 +444,10 @@ def make_rest_request(method, url, verify=True, data=None):
of trusted CAs
data (dict/list): object to be serialised to json and send as http
data (when method=post/put/delete)
cert (tuple/string): Path to local cert as client side certificate,
as a single file (containing the certificate
and the private key) or as a tuple of both
file's path

Returns:
tuple (status_code, return_data): status_code - http status code
Expand All @@ -459,16 +463,17 @@ def make_rest_request(method, url, verify=True, data=None):

try:
if method.lower() == "get":
res = requests.get(url, verify=verify)
res = requests.get(url, verify=verify, cert=cert)
elif method.lower() == "post":
res = requests.post(url, json=data, verify=verify)
res = requests.post(url, json=data, verify=verify, cert=cert)
elif method.lower() == "put":
res = requests.put(url, json=data, verify=verify)
res = requests.put(url, json=data, verify=verify, cert=cert)
elif method.lower() == "delete":
res = requests.delete(url, json=data, verify=verify)
res = requests.delete(url, json=data, verify=verify, cert=cert)
elif method.lower() == "patch":
headers = {"Content-Type": "application/json-patch+json"}
res = requests.patch(url, json=data, verify=verify, headers=headers)
res = requests.patch(url, json=data, verify=verify,
headers=headers, cert=cert)

status_code = res.status_code
return_data = res.json()
Expand Down