Skip to content
Open
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ simplejson>=3.17.0
six>=1.14.0
websocket-client>=0.57.0
nose>=1.3.7
pyotp
23 changes: 16 additions & 7 deletions src/cloudsigma/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
from builtins import object
from builtins import str
from future import standard_library
import pyotp

standard_library.install_aliases()


Expand Down Expand Up @@ -80,13 +82,15 @@ def __init__(
api_endpoint=None,
username=None,
password=None,
secret=None,
login_method=LOGIN_METHOD_BASIC,
request_log_level=None
):
self.api_endpoint = api_endpoint if api_endpoint \
else config['api_endpoint']
self.username = username if username else config['username']
self.password = password if password else config['password']
self.secret = secret if secret else config['secret']
self.login_method = config.get('login_method', login_method)
assert self.login_method in self.LOGIN_METHODS, \
'Invalid value %r for login_method' % (login_method,)
Expand All @@ -99,20 +103,22 @@ def __init__(
if self.request_log_level:
self.request_log_level = self.request_log_level.upper()

if login_method == self.LOGIN_METHOD_SESSION:
if self.login_method == self.LOGIN_METHOD_SESSION:
self._login_session()

def _login_session(self):
self.login_method = self.LOGIN_METHOD_SESSION
self._session = requests.Session()
full_url = self._get_full_url('/accounts/action/')
kwargs = self._get_req_args(query_params={'do': 'login'})
data = simplejson.dumps(
{
"username": self.username,
"password": self.password
}
)
login_object = {
"username": self.username,
"password": self.password
}
if self.secret:
otp = pyotp.TOTP(self.secret).now()
login_object["otp"] = otp
data = simplejson.dumps(login_object)
res = self.http.post(full_url, data=data, **kwargs)
self._process_response(res)
csrf_token = res.cookies['csrftoken']
Expand Down Expand Up @@ -207,6 +213,9 @@ def http(self):

def get(self, url, query_params=None, return_list=False):
kwargs = self._get_req_args(query_params=query_params)
if self.login_method == self.LOGIN_METHOD_SESSION and self.secret:
kwargs['headers'].update({'X-CSRFToken':self._session.headers['x-csrftoken']})
kwargs['headers'].update({'OTP':pyotp.TOTP(self.secret).now()})
self.resp = self.http.get(self._get_full_url(url), **kwargs)
return self._process_response(self.resp, return_list)

Expand Down