Skip to content

Revert "Feature/wildcard certs hostname" #150

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.

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

Merged
merged 1 commit into from
Nov 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 5 deletions rethinkdb/gevent_net/net_gevent.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
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']
Expand Down Expand Up @@ -104,10 +103,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=get_hostname_for_ssl_match(self.host)
)
ssl.match_hostname(self._socket.getpeercert(), hostname=self.host)
except ssl.CertificateError:
self._socket.close()
raise
Expand Down
12 changes: 0 additions & 12 deletions rethinkdb/helpers.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
import six


def decode_utf8(string, encoding='utf-8'):
if hasattr(string, 'decode'):
return string.decode(encoding)

return string


def chain_to_bytes(*strings):
return b''.join([six.b(string) if isinstance(string, six.string_types) else string for string in strings])


def get_hostname_for_ssl_match(hostname):
parts = hostname.split('.')

if len(parts) < 3:
return hostname

parts[0] = '*'
return '.'.join(parts)
6 changes: 1 addition & 5 deletions rethinkdb/net.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
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']
Expand Down Expand Up @@ -353,10 +352,7 @@ def __init__(self, parent, timeout):
"SSL handshake failed (see server log for more information): %s" %
str(err))
try:
ssl.match_hostname(
self._socket.getpeercert(),
hostname=get_hostname_for_ssl_match(self.host)
)
match_hostname(self._socket.getpeercert(), hostname=self.host)
except CertificateError:
self._socket.close()
raise
Expand Down
33 changes: 1 addition & 32 deletions tests/test_helpers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
from mock import Mock
from rethinkdb.helpers import decode_utf8, chain_to_bytes, get_hostname_for_ssl_match
from rethinkdb.helpers import decode_utf8, chain_to_bytes

@pytest.mark.unit
class TestDecodeUTF8Helper(object):
Expand Down Expand Up @@ -42,34 +42,3 @@ def test_mixed_chaining(self):
result = chain_to_bytes('iron', ' ', b'man')

assert result == expected_string


@pytest.mark.unit
class TestSSLMatchHostHostnameHelper(object):
def test_subdomain_replaced_to_star(self):
expected_string = '*.example.com'

result = get_hostname_for_ssl_match('test.example.com')

assert result == expected_string

def test_subdomain_replaced_to_star_special_tld(self):
expected_string = '*.example.co.uk'

result = get_hostname_for_ssl_match('test.example.co.uk')

assert result == expected_string

def test_no_subdomain_to_replace(self):
expected_string = 'example.com'

result = get_hostname_for_ssl_match(expected_string)

assert result == expected_string

def test_no_tld(self):
expected_string = 'localhost'

result = get_hostname_for_ssl_match(expected_string)

assert result == expected_string