Extend net and net_gevent to use the new helper

Author: gabor-boros

rethinkdb/gevent_net/net_gevent.py

@@ -26,6 +26,7 @@
 from rethinkdb import net, ql2_pb2
 from rethinkdb.errors import ReqlAuthError, ReqlCursorEmpty, ReqlDriverError, ReqlTimeoutError, RqlDriverError, \
     RqlTimeoutError
+from rethinkdb.helpers import get_hostname_for_ssl_match
 from rethinkdb.logger import default_logger
 
 __all__ = ['Connection']
@@ -103,7 +104,7 @@ def __init__(self, parent):
                     self._socket.close()
                     raise ReqlDriverError("SSL handshake failed (see server log for more information): %s" % str(exc))
                 try:
-                    ssl.match_hostname(self._socket.getpeercert(), hostname=self.host)
+                    ssl.match_hostname(self._socket.getpeercert(), hostname=get_hostname_for_ssl_match(self.host))
                 except ssl.CertificateError:
                     self._socket.close()
                     raise

rethinkdb/net.py

@@ -44,6 +44,7 @@
     ReqlTimeoutError,
     ReqlUserError)
 from rethinkdb.handshake import HandshakeV1_0
+from rethinkdb.helpers import get_hostname_for_ssl_match
 from rethinkdb.logger import default_logger
 
 __all__ = ['Connection', 'Cursor', 'DEFAULT_PORT', 'DefaultConnection', 'make_connection']
@@ -352,7 +353,8 @@ def __init__(self, parent, timeout):
                             "SSL handshake failed (see server log for more information): %s" %
                             str(err))
                 try:
-                    match_hostname(self._socket.getpeercert(), hostname=self.host)
+                    
+                    match_hostname(self._socket.getpeercert(), hostname=get_hostname_for_ssl_match(self.host))
                 except CertificateError:
                     self._socket.close()
                     raise