Skip to content

Generalize auth token #32

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

Merged
Rob-Johnson merged 1 commit into from
Nov 16, 2016
Merged

Generalize auth token #32

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
9 changes: 6 additions & 3 deletions chronos/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ class ChronosClient(object):
_user = None
_password = None

def __init__(self, servers, proto="http", username=None, password=None, level='WARN'):
def __init__(self, servers, proto="http", username=None, password=None, extra_headers=None, level='WARN'):
server_list = servers if isinstance(servers, list) else [servers]
self.servers = ["%s://%s" % (proto, server) for server in server_list]
self.extra_headers = extra_headers
if username and password:
self._user = username
self._password = password
Expand Down Expand Up @@ -137,6 +138,8 @@ def _call(self, url, method="GET", body=None, headers={}):
conn = httplib2.Http(disable_ssl_certificate_validation=True)
if self._user and self._password:
conn.add_credentials(self._user, self._password)
if self.extra_headers:
hdrs.update(self.extra_headers)

response = None
servers = list(self.servers)
Expand Down Expand Up @@ -202,5 +205,5 @@ class ChronosJob(object):
one_of = ["schedule", "parents"]


def connect(servers, proto="http", username=None, password=None):
return ChronosClient(servers, proto=proto, username=username, password=password)
def connect(servers, proto="http", username=None, password=None, extra_headers=None):
return ChronosClient(servers, proto=proto, username=username, password=password, extra_headers=extra_headers)