From eb13a3fe248b70c89eb577c2ad5d49853369d535 Mon Sep 17 00:00:00 2001 From: SK Date: Thu, 12 Jan 2017 16:57:09 +0300 Subject: [PATCH 1/5] TLS settings moved to Client class (ability to create tls-client by same class) --- bernhard/__init__.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bernhard/__init__.py b/bernhard/__init__.py index f3d238b..ae6b83c 100644 --- a/bernhard/__init__.py +++ b/bernhard/__init__.py @@ -204,14 +204,23 @@ def raw(self): class Client(object): - def __init__(self, host='127.0.0.1', port=5555, transport=TCPTransport): + def __init__(self, host='127.0.0.1', port=5555, transport=TCPTransport, tls=False, keyfile=None, certfile=None, ca_certs=None): self.host = host self.port = port self.transport = transport self.connection = None + self.tls = tls + if tls: + self.keyfile = keyfile + self.certfile = certfile + self.ca_certs = ca_certs def connect(self): - self.connection = self.transport(self.host, self.port) + if self.tls: + self.connection = self.transport(self.host, self.port, self.keyfile, + self.certfile, self.ca_certs) + else: + self.connection = self.transport(self.host, self.port) def disconnect(self): try: From 0b81bae1500921288c4b3411c9e780f331f7187e Mon Sep 17 00:00:00 2001 From: SK Date: Fri, 13 Jan 2017 19:41:40 +0300 Subject: [PATCH 2/5] commented out cert_require for self-sign certs --- bernhard/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bernhard/__init__.py b/bernhard/__init__.py index ae6b83c..4ac8bd6 100644 --- a/bernhard/__init__.py +++ b/bernhard/__init__.py @@ -89,7 +89,7 @@ def __init__(self, host, port, keyfile=None, certfile=None, ca_certs=None): self.sock = ssl.wrap_socket(self.sock, keyfile=keyfile, certfile=certfile, - cert_reqs=ssl.CERT_REQUIRED, + #cert_reqs=ssl.CERT_REQUIRED, ssl_version=ssl.PROTOCOL_TLSv1, ca_certs=ca_certs) From f189f82a75a7a9beda89b390fa90250a14c9a528 Mon Sep 17 00:00:00 2001 From: skob Date: Fri, 13 Jan 2017 20:06:07 +0300 Subject: [PATCH 3/5] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ddddb8e..9614243 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name = 'bernhard', - version = '0.2.4', + version = '0.2.5', description = 'Python client for Riemann', long_description = long_description, author = 'Benjamin Anderspn', From 11f91bf6916d423dfeaed20e466c877504c0e7ac Mon Sep 17 00:00:00 2001 From: SK Date: Wed, 1 Mar 2017 21:23:02 +0300 Subject: [PATCH 4/5] protobuf==2.6.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ddddb8e..0a4886c 100644 --- a/setup.py +++ b/setup.py @@ -38,5 +38,5 @@ zip_safe = False, packages = ['bernhard'], include_package_data = True, - install_requires=['protobuf >= 2.4'] + install_requires=['protobuf == 2.6.1'] ) From bdf7d4244a1ca64d6631489caf0c7612c9e2307c Mon Sep 17 00:00:00 2001 From: SK Date: Wed, 1 Mar 2017 21:24:17 +0300 Subject: [PATCH 5/5] protobuf==2.6.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8c757bd..a199aa4 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name = 'bernhard', - version = '0.2.5', + version = '0.2.6', description = 'Python client for Riemann', long_description = long_description, author = 'Benjamin Anderspn',