Skip to content

Commit a689aa6

Browse files
behackettbehackett
committed
PYTHON-1418 - Update initial DNS seedlist implementation for spec changes
1 parent b669cd8 commit a689aa6

21 files changed

+162
-17
lines changed

‎pymongo/uri_parser.py‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ def _get_dns_txt_options(hostname):
295295
return None
296296
except Exception as exc:
297297
raise ConfigurationError(str(exc))
298-
return '&'.join([maybe_decode(val)
299-
for res in results for val in res.strings])
298+
return (
299+
b'&'.join([b''.join(res.strings) for res in results])).decode('utf-8')
300300

301301

302302
def parse_uri(uri, default_port=DEFAULT_PORT, validate=True, warn=False):
@@ -386,12 +386,28 @@ def parse_uri(uri, default_port=DEFAULT_PORT, validate=True, warn=False):
386386
raise InvalidURI(
387387
"%s URIs must include one, "
388388
"and only one, hostname" % (SRV_SCHEME,))
389-
hostname, port = nodes[0]
389+
fqdn, port = nodes[0]
390390
if port is not None:
391391
raise InvalidURI(
392392
"%s URIs must not include a port number" % (SRV_SCHEME,))
393-
nodes = _get_dns_srv_hosts(hostname)
394-
dns_options = _get_dns_txt_options(hostname)
393+
nodes = _get_dns_srv_hosts(fqdn)
394+
395+
try:
396+
plist = fqdn.split(".")[1:]
397+
except Exception:
398+
raise ConfigurationError("Invalid URI host")
399+
slen = len(plist)
400+
if slen < 2:
401+
raise ConfigurationError("Invalid URI host")
402+
for node in nodes:
403+
try:
404+
nlist = node[0].split(".")[1:][-slen:]
405+
except Exception:
406+
raise ConfigurationError("Invalid SRV host")
407+
if plist != nlist:
408+
raise ConfigurationError("Invalid SRV host")
409+
410+
dns_options = _get_dns_txt_options(fqdn)
395411
if dns_options:
396412
options = split_options(dns_options, validate, warn)
397413
else:

‎test/dns/longer-parent-in-return.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"uri": "mongodb+srv://test18.test.build.10gen.cc/?replicaSet=repl0",
3+
"seeds": [
4+
"localhost.sub.test.build.10gen.cc:27017"
5+
],
6+
"hosts": [
7+
"localhost:27017",
8+
"localhost:27018",
9+
"localhost:27019"
10+
],
11+
"comment": "Is correct, as returned host name shared the URI root \"test.build.10gen.cc\"."
12+
}

‎test/dns/no-results.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"uri": "mongodb+srv://test4.test.build.10gen.cc/",
33
"seeds": [],
4-
"hosts": []
4+
"hosts": [],
5+
"error": true,
6+
"comment": "Should fail because no SRV records are present for this URI."
57
}

‎test/dns/not-enough-parts.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"uri": "mongodb+srv://10gen.cc/",
3+
"seeds": [],
4+
"hosts": [],
5+
"error": true,
6+
"comment": "Should fail because host in URI does not have {hostname}, {domainname} and {tld}."
7+
}

‎test/dns/one-result-default-port.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"uri": "mongodb+srv://test3.test.build.10gen.cc/?replicaSet=repl0",
33
"seeds": [
4-
"localhost.build.10gen.cc:27017"
4+
"localhost.test.build.10gen.cc:27017"
55
],
66
"hosts": [
77
"localhost:27017",

‎test/dns/one-txt-record-multiple-strings.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"uri": "mongodb+srv://test11.test.build.10gen.cc/?replicaSet=repl0",
3+
"seeds": [
4+
"localhost.test.build.10gen.cc:27017"
5+
],
6+
"hosts": [
7+
"localhost:27017",
8+
"localhost:27018",
9+
"localhost:27019"
10+
],
11+
"options": {
12+
"connectTimeoutMS": 150000,
13+
"replicaSet": "repl0",
14+
"socketTimeoutMS": 250000
15+
}
16+
}

‎test/dns/one-txt-record.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"uri": "mongodb+srv://test5.test.build.10gen.cc/?replicaSet=repl0",
33
"seeds": [
4-
"localhost.build.10gen.cc:27017"
4+
"localhost.test.build.10gen.cc:27017"
55
],
66
"hosts": [
77
"localhost:27017",

‎test/dns/parent-part-mismatch1.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"uri": "mongodb+srv://test14.test.build.10gen.cc/",
3+
"seeds": [],
4+
"hosts": [],
5+
"error": true,
6+
"comment": "Should fail because returned host name's part \"not-test\" mismatches URI parent part \"test\"."
7+
}

‎test/dns/parent-part-mismatch2.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"uri": "mongodb+srv://test15.test.build.10gen.cc/",
3+
"seeds": [],
4+
"hosts": [],
5+
"error": true,
6+
"comment": "Should fail because returned host name's part \"not-build\" mismatches URI parent part \"build\"."
7+
}

‎test/dns/parent-part-mismatch3.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"uri": "mongodb+srv://test16.test.build.10gen.cc/",
3+
"seeds": [],
4+
"hosts": [],
5+
"error": true,
6+
"comment": "Should fail because returned host name's part \"not-10gen\" mismatches URI parent part \"10gen\"."
7+
}

0 commit comments

Comments
 (0)