Skip to content

added timeout option #66

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
62 changes: 40 additions & 22 deletions OTXv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,22 @@ def __str__(self):
return repr(self.value)


class TimeoutError(Exception):
def __init__(self, value=None):
self.value = value or "TimeoutError"

def __str__(self):
return repr(self.value)


class OTXv2(object):
"""
Main class to interact with the AlienVault OTX API.
"""

def __init__(
self, api_key, proxy=None, proxy_https=None, server="https://otx.alienvault.com", project="SDK",
user_agent=None, verify=True, cert=None
user_agent=None, verify=True, cert=None, timeout=None
):
self.key = api_key
self.server = server
Expand All @@ -114,6 +122,7 @@ def __init__(
'User-Agent': user_agent or 'OTX Python {}/1.5.12'.format(project),
'Content-Type': 'application/json'
}
self.timeout = timeout

def session(self):
if self.request_session is None:
Expand Down Expand Up @@ -181,10 +190,13 @@ def get(self, url, **kwargs):
proxies=self.proxies,
verify=self.verify,
cert=self.cert,
timeout=self.timeout
)
return self.handle_response_errors(response).json()
except requests.exceptions.RetryError:
raise RetryError()
except requests.exceptions.Timeout:
raise TimeoutError()

def patch(self, url, body, **kwargs):
"""
Expand All @@ -193,16 +205,19 @@ def patch(self, url, body, **kwargs):
:param body: HTTP Body to send in request
:return: response as dict
"""

response = self.session().patch(
self.create_url(url, **kwargs),
data=json.dumps(body),
headers=self.headers,
proxies=self.proxies,
verify=self.verify,
cert=self.cert,
)
return self.handle_response_errors(response).json()
try:
response = self.session().patch(
self.create_url(url, **kwargs),
data=json.dumps(body),
headers=self.headers,
proxies=self.proxies,
verify=self.verify,
cert=self.cert,
timeout=self.timeout
)
return self.handle_response_errors(response).json()
except requests.exceptions.Timeout:
raise TimeoutError()

def post(self, url, body=None, headers=None, files=None, **kwargs):
"""
Expand All @@ -213,17 +228,20 @@ def post(self, url, body=None, headers=None, files=None, **kwargs):
:param files: (optional) list of file tuples, if posting multipart form data
:return: response as dict
"""

response = self.session().post(
self.create_url(url, **kwargs),
data=json.dumps(body) if body else None,
files=files,
headers=headers or self.headers,
proxies=self.proxies,
verify=self.verify,
cert=self.cert,
)
return self.handle_response_errors(response).json()
try:
response = self.session().post(
self.create_url(url, **kwargs),
data=json.dumps(body) if body else None,
files=files,
headers=headers or self.headers,
proxies=self.proxies,
verify=self.verify,
cert=self.cert,
timeout=self.timeout
)
return self.handle_response_errors(response).json()
except requests.exceptions.Timeout:
raise TimeoutError()

def create_pulse(self, **kwargs):
"""
Expand Down