Skip to content

Support for Basic Authentication and HTTPS #1

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

Closed
wants to merge 1 commit into from
Closed

Support for Basic Authentication and HTTPS #1

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion elasticsearch/connection/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ class Connection(object):
"""
transport_schema = 'http'

def __init__(self, host='localhost', port=9200, url_prefix='', timeout=10, **kwargs):
def __init__(self, host='localhost', port=9200, url_prefix='', timeout=10, transport_schema='http', auth=None, **kwargs):
"""
:arg host: hostname of the node (default: localhost)
:arg port: port to use (default: 9200)
:arg url_prefix: optional url prefix for elasticsearch
:arg timeout: default timeout in seconds (default: 10)
"""
self.transport_schema = transport_schema

self.auth = auth

self.host = '%s://%s:%s' % (self.transport_schema, host, port)
if url_prefix:
url_prefix = '/' + url_prefix.strip('/')
Expand Down
17 changes: 15 additions & 2 deletions elasticsearch/connection/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class RequestsHttpConnection(Connection):
""" Connection using the `requests` library. """
def __init__(self, host='localhost', port=9200, **kwargs):
super(RequestsHttpConnection, self).__init__(host=host, port=port, **kwargs)

self.session = requests.session()
if self.auth is not None:
self.session.auth = tuple(self.auth.split(':', 1))

def perform_request(self, method, url, params=None, body=None, timeout=None):
url = self.host + self.url_prefix + url
Expand All @@ -22,7 +25,9 @@ def perform_request(self, method, url, params=None, body=None, timeout=None):
request = requests.Request(method, url, params=params or {}, data=body).prepare()
start = time.time()
try:
response = self.session.send(request, timeout=timeout or self.timeout)
response = self.session.request(method=request.method, url=request.url, headers=request.headers,
data=request.body, hooks=request.hooks, timeout=timeout or self.timeout)

duration = time.time() - start
raw_data = response.text
except (requests.ConnectionError, requests.Timeout) as e:
Expand All @@ -44,7 +49,15 @@ class Urllib3HttpConnection(Connection):
"""
def __init__(self, host='localhost', port=9200, **kwargs):
super(Urllib3HttpConnection, self).__init__(host=host, port=port, **kwargs)
self.pool = urllib3.HTTPConnectionPool(host, port=port, timeout=kwargs.get('timeout', None))

auth_headers = dict()
if self.auth is not None:
auth_headers.update(urllib3.make_headers(basic_auth=self.auth))

if self.transport_schema == 'https':
self.pool = urllib3.HTTPSConnectionPool(host, port=port, timeout=kwargs.get('timeout', None), headers=auth_headers)
else:
self.pool = urllib3.HTTPConnectionPool(host, port=port, timeout=kwargs.get('timeout', None), headers=auth_headers)

def perform_request(self, method, url, params=None, body=None, timeout=None):
url = self.url_prefix + url
Expand Down