openstack/deb-python-websocket-client
Code Issues Proposed changes

Merge branch 'master' of https://github.com/dimaqq/websocket-client into dimaqq-master

Browse Source 
refs #56
This commit is contained in:
liris
2014-03-18 09:20:34 +09:00
parent 4900b04f43 1a4dac3671
commit 3be0e5a742
2 changed files with 4971 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4966
cacert.pem Normal file
View File

File diff suppressed because it is too large Load Diff

9
websocket.py
View File

@@ -25,6 +25,7 @@ import socket
try: try:
import ssl import ssl
from ssl import SSLError from ssl import SSLError
from backports.ssl_match_hostname import match_hostname
HAVE_SSL = True HAVE_SSL = True
except ImportError: except ImportError:
# dummy class of SSLError for ssl none-support environment. # dummy class of SSLError for ssl none-support environment.
@@ -446,11 +447,11 @@ class WebSocket(object):
self.sock.connect((hostname, port)) self.sock.connect((hostname, port))
if is_secure: if is_secure:
if HAVE_SSL: if HAVE_SSL:
if self.sslopt is None: sslopt = dict(cert_reqs=ssl.CERT_REQUIRED,
sslopt = {} ca_certs=os.path.join(os.path.dirname(__file__), "cacert.pem"))
else: sslopt.update(self.sslopt)
sslopt = self.sslopt
self.sock = ssl.wrap_socket(self.sock, **sslopt) self.sock = ssl.wrap_socket(self.sock, **sslopt)
match_hostname(self.sock.getpeercert(), hostname)
else: else:
raise WebSocketException("SSL not available.") raise WebSocketException("SSL not available.")