fix(client): use pyOpenSSL for improved security features

Author: mboersma

client/Makefile

@@ -1,6 +1,6 @@
 
 build: setup-venv
-	venv/bin/pip install docopt==0.6.2 python-dateutil==2.4.2 PyYAML==3.11 requests==2.5.1 git+https://github.com/pyinstaller/pyinstaller@7413317 tabulate==0.7.4 termcolor==1.1.0
+	venv/bin/pip install docopt==0.6.2 ndg-httpsclient==0.3.3 pyasn1==0.1.7 pyOpenSSL==0.15.1 python-dateutil==2.4.2 PyYAML==3.11 requests==2.5.1 git+https://github.com/pyinstaller/pyinstaller@7413317 tabulate==0.7.4 termcolor==1.1.0 urllib3==1.10.2
 	venv/bin/pyinstaller deis.spec
 	chmod +x dist/deis
 

client/deis.py

@@ -72,6 +72,7 @@
 import requests
 from tabulate import tabulate
 from termcolor import colored
+import urllib3.contrib.pyopenssl
 
 __version__ = '1.6.0-dev'
 
@@ -80,6 +81,7 @@
 
 
 locale.setlocale(locale.LC_ALL, '')
+urllib3.contrib.pyopenssl.inject_into_urllib3()
 
 
 class Session(requests.Session):

client/setup.py

@@ -57,9 +57,11 @@
       ],
       long_description=LONG_DESCRIPTION,
       install_requires=[
-          'docopt==0.6.2', 'python-dateutil==2.4.2',
-          'PyYAML==3.11', 'requests==2.5.1',
-          'tabulate==0.7.4', 'termcolor==1.1.0'
+          'docopt==0.6.2', 'ndg-httpsclient==0.3.3',
+          'pyasn1==0.1.7', 'pyOpenSSL==0.15.1',
+          'python-dateutil==2.4.2', 'PyYAML==3.11',
+          'requests==2.5.1', 'tabulate==0.7.4',
+          'termcolor==1.1.0', 'urllib3==1.10.2',
       ],
       zip_safe=True,
       **KWARGS)

controller/dev_requirements.txt

@@ -1,8 +1,14 @@
 # Deis client requirements
 docopt==0.6.2
+ndg-httpsclient==0.3.3
+pyasn1==0.1.7
+pyOpenSSL==0.15.1
 python-dateutil==2.4.2
+PyYAML==3.11
 requests==2.5.1
+tabulate==0.7.4
 termcolor==1.1.0
+urllib3==1.10.2
 
 # PyInstaller builds client binaries
 git+https://github.com/pyinstaller/pyinstaller@7413317

docs/docs_requirements.txt

@@ -25,10 +25,15 @@ python-ldap==2.4.19
 
 # Deis client requirements
 docopt==0.6.2
+ndg-httpsclient==0.3.3
+pyasn1==0.1.7
+pyOpenSSL==0.15.1
 python-dateutil==2.4.2
+#PyYAML==3.11
 requests==2.5.1
 tabulate==0.7.4
 termcolor==1.1.0
+urllib3==1.10.2
 
 # Deis documentation requirements
 Sphinx==1.3.1