Skip to content

PYTHON-4575 Allow valid SRV hostnames with less than 3 parts #2234

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.

Sign up for GitHub

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 23 commits into from
Apr 4, 2025
Merged

PYTHON-4575 Allow valid SRV hostnames with less than 3 parts #2234

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4cad3d7
PYTHON-4575 Remove hostname length check
aclark4life Mar 26, 2025
118810e
PYTHON-4575 Remove hostname length check
aclark4life Mar 26, 2025
426d061
PYTHON-4575 Remove hostname length check
aclark4life Mar 31, 2025
0cbc00f
PYTHON-4575 Remove hostname length check
aclark4life Mar 31, 2025
19d31c7
Move IO out of __init__
aclark4life Apr 1, 2025
9aa3781
Remove duplicate test
aclark4life Apr 1, 2025
e756efc
Add remaining tests, expected to fail until fixed
aclark4life Apr 1, 2025
abd9eb7
Moved to _get_srv_response_and_hosts
aclark4life Apr 1, 2025
c7f4fef
Separate and rename tests to match prose
aclark4life Apr 2, 2025
577cd7f
No more slicing fqdn to get parts
aclark4life Apr 2, 2025
361b0fa
Handle all srv domains not just < 3 parts
aclark4life Apr 2, 2025
4b34415
Update changelog
aclark4life Apr 2, 2025
c9267c3
Merge branch 'master' into PYTHON-4575
aclark4life Apr 2, 2025
5c823fc
Refactor
aclark4life Apr 2, 2025
b6920f1
Refactor
aclark4life Apr 2, 2025
f72cf87
Refactor
aclark4life Apr 2, 2025
ae5065d
Move to test_dns
aclark4life Apr 3, 2025
0e48ce5
Move to test_dns
aclark4life Apr 3, 2025
a16b3f6
Fix async
aclark4life Apr 3, 2025
b1ab085
Fix async
aclark4life Apr 3, 2025
4e3d524
Revert "Fix async"
aclark4life Apr 3, 2025
531e9c9
Add dns.resolver.resolve to synchro
aclark4life Apr 3, 2025
dacdbf7
Validate each return host in nodes
aclark4life Apr 3, 2025
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
2 changes: 0 additions & 2 deletions pymongo/asynchronous/srv_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ def __init__(
except Exception:
raise ConfigurationError(_INVALID_HOST_MSG % (fqdn,)) from None
self.__slen = len(self.__plist)
if self.__slen < 2:
raise ConfigurationError(_INVALID_HOST_MSG % (fqdn,))

async def get_options(self) -> Optional[str]:
from dns import resolver
Expand Down
2 changes: 0 additions & 2 deletions pymongo/synchronous/srv_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ def __init__(
except Exception:
raise ConfigurationError(_INVALID_HOST_MSG % (fqdn,)) from None
self.__slen = len(self.__plist)
if self.__slen < 2:
raise ConfigurationError(_INVALID_HOST_MSG % (fqdn,))

def get_options(self) -> Optional[str]:
from dns import resolver
Expand Down
6 changes: 0 additions & 6 deletions test/asynchronous/test_dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,6 @@ def create_tests(cls):

class TestParsingErrors(AsyncPyMongoTestCase):
async def test_invalid_host(self):
with self.assertRaisesRegex(ConfigurationError, "Invalid URI host: mongodb is not"):
client = self.simple_client("mongodb+srv://mongodb")
await client.aconnect()
with self.assertRaisesRegex(ConfigurationError, "Invalid URI host: mongodb.com is not"):
client = self.simple_client("mongodb+srv://mongodb.com")
await client.aconnect()
with self.assertRaisesRegex(ConfigurationError, "Invalid URI host: an IP address is not"):
client = self.simple_client("mongodb+srv://127.0.0.1")
await client.aconnect()
Expand Down
6 changes: 0 additions & 6 deletions test/test_dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,6 @@ def create_tests(cls):

class TestParsingErrors(PyMongoTestCase):
def test_invalid_host(self):
with self.assertRaisesRegex(ConfigurationError, "Invalid URI host: mongodb is not"):
client = self.simple_client("mongodb+srv://mongodb")
client._connect()
with self.assertRaisesRegex(ConfigurationError, "Invalid URI host: mongodb.com is not"):
client = self.simple_client("mongodb+srv://mongodb.com")
client._connect()
with self.assertRaisesRegex(ConfigurationError, "Invalid URI host: an IP address is not"):
client = self.simple_client("mongodb+srv://127.0.0.1")
client._connect()
Expand Down
6 changes: 6 additions & 0 deletions test/test_uri_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
sys.path[0:0] = [""]

from test import unittest
from unittest.mock import patch

from bson.binary import JAVA_LEGACY
from pymongo import ReadPreference
Expand Down Expand Up @@ -553,6 +554,11 @@ def test_port_with_whitespace(self):
with self.assertRaisesRegex(ValueError, r"Port contains whitespace character: '\\n'"):
parse_uri("mongodb://localhost:27\n017")

def test_allow_srv_hosts_with_fewer_than_three_dot_separated_parts(self):
with patch("dns.resolver.resolve"):
parse_uri("mongodb+srv://localhost/")
parse_uri("mongodb+srv://mongo.local/")


if __name__ == "__main__":
unittest.main()
Loading