Skip to content
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

Fixes #148 #149

Merged
merged 6 commits into from
Mar 21, 2023
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
17 changes: 14 additions & 3 deletions src/pytds/tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,18 @@ def shutdown(self):
def verify_cb(conn, cert, err_num, err_depth, ret_code):
return ret_code == 1

def is_san_matching(san: str, host_name: str) -> bool:
for item in san.split(','):
dnsentry = item.lstrip('DNS:').strip()
# SANs are usually have form like: DNS:hostname
if dnsentry == host_name:
return True
if dnsentry[0:2] == "*.": # support for wildcards, but only at the first position
afterstar_parts = dnsentry[2:]
afterstar_parts_sname = '.'.join(host_name.split('.')[1:]) # remove first part of dns name
if afterstar_parts == afterstar_parts_sname:
return True
return False

def validate_host(cert, name):
"""
Expand All @@ -105,11 +117,10 @@ def validate_host(cert, name):
ext = cert.get_extension(i)
if ext.get_short_name() == b'subjectAltName':
s = str(ext)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please refactor this code: extract logic inside this if branch into its own method is_san_matching(san: str, host_name: str): bool.

Also add unit tests for that method for following conditions:

  • exact SAN match
  • wildcard SAN match
  • SAN mismatch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a number of tests in tls_san_test.py, I hope thats correct this way?

# SANs are usually have form like: DNS:hostname
if s.startswith('DNS:') and s[4:] == s_name:
if is_san_matching(s, s_name):
return True

# TODO handle wildcards
# TODO check if wildcard is needed in CN as well
return False


Expand Down
10 changes: 10 additions & 0 deletions tests/tls_san_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from pytds.tls import is_san_matching

def test_san():
assert not is_san_matching("", "host.com")
assert is_san_matching("database.com", "database.com")
assert not is_san_matching("notdatabase.com", "database.com")
assert not is_san_matching("*.database.com", "database.com")
assert is_san_matching("*.database.com", "test.database.com")
assert not is_san_matching("database.com", "*.database.com")
assert not is_san_matching("test.*.database.com", "test.subdomain.database.com") # That star should be at first position