PYTHON-1418 - Update initial DNS seedlist implementation for spec changes

Author: behackett

pymongo/uri_parser.py

@@ -295,8 +295,8 @@ def _get_dns_txt_options(hostname):
  return None
  except Exception as exc:
  raise ConfigurationError(str(exc))
- return '&'.join([maybe_decode(val)
-  for res in results for val in res.strings])
+ return (
+ b'&'.join([b''.join(res.strings) for res in results])).decode('utf-8')
 
 
 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):
  raise InvalidURI(
  "%s URIs must include one, "
  "and only one, hostname" % (SRV_SCHEME,))
- hostname, port = nodes[0]
+ fqdn, port = nodes[0]
  if port is not None:
  raise InvalidURI(
  "%s URIs must not include a port number" % (SRV_SCHEME,))
- nodes = _get_dns_srv_hosts(hostname)
- dns_options = _get_dns_txt_options(hostname)
+ nodes = _get_dns_srv_hosts(fqdn)
+
+ try:
+ plist = fqdn.split(".")[1:]
+ except Exception:
+ raise ConfigurationError("Invalid URI host")
+ slen = len(plist)
+ if slen < 2:
+ raise ConfigurationError("Invalid URI host")
+ for node in nodes:
+ try:
+ nlist = node[0].split(".")[1:][-slen:]
+ except Exception:
+ raise ConfigurationError("Invalid SRV host")
+ if plist != nlist:
+ raise ConfigurationError("Invalid SRV host")
+
+ dns_options = _get_dns_txt_options(fqdn)
  if dns_options:
  options = split_options(dns_options, validate, warn)
  else:

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

@@ -0,0 +1,12 @@
+{
+ "uri": "mongodb+srv://test18.test.build.10gen.cc/?replicaSet=repl0",
+ "seeds": [
+ "localhost.sub.test.build.10gen.cc:27017"
+ ],
+ "hosts": [
+ "localhost:27017",
+ "localhost:27018",
+ "localhost:27019"
+ ],
+ "comment": "Is correct, as returned host name shared the URI root \"test.build.10gen.cc\"."
+}

test/dns/no-results.json

@@ -1,5 +1,7 @@
 {
  "uri": "mongodb+srv://test4.test.build.10gen.cc/",
  "seeds": [],
- "hosts": []
+ "hosts": [],
+ "error": true,
+ "comment": "Should fail because no SRV records are present for this URI."
 }

test/dns/not-enough-parts.json

@@ -0,0 +1,7 @@
+{
+ "uri": "mongodb+srv://10gen.cc/",
+ "seeds": [],
+ "hosts": [],
+ "error": true,
+ "comment": "Should fail because host in URI does not have {hostname}, {domainname} and {tld}."
+}

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

@@ -1,7 +1,7 @@
 {
  "uri": "mongodb+srv://test3.test.build.10gen.cc/?replicaSet=repl0",
  "seeds": [
- "localhost.build.10gen.cc:27017"
+ "localhost.test.build.10gen.cc:27017"
  ],
  "hosts": [
  "localhost:27017",

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

@@ -0,0 +1,16 @@
+{
+ "uri": "mongodb+srv://test11.test.build.10gen.cc/?replicaSet=repl0",
+ "seeds": [
+ "localhost.test.build.10gen.cc:27017"
+ ],
+ "hosts": [
+ "localhost:27017",
+ "localhost:27018",
+ "localhost:27019"
+ ],
+ "options": {
+ "connectTimeoutMS": 150000,
+ "replicaSet": "repl0",
+ "socketTimeoutMS": 250000
+ }
+}

test/dns/one-txt-record.json

@@ -1,7 +1,7 @@
 {
  "uri": "mongodb+srv://test5.test.build.10gen.cc/?replicaSet=repl0",
  "seeds": [
- "localhost.build.10gen.cc:27017"
+ "localhost.test.build.10gen.cc:27017"
  ],
  "hosts": [
  "localhost:27017",

test/dns/parent-part-mismatch1.json

@@ -0,0 +1,7 @@
+{
+ "uri": "mongodb+srv://test14.test.build.10gen.cc/",
+ "seeds": [],
+ "hosts": [],
+ "error": true,
+ "comment": "Should fail because returned host name's part \"not-test\" mismatches URI parent part \"test\"."
+}

test/dns/parent-part-mismatch2.json

@@ -0,0 +1,7 @@
+{
+ "uri": "mongodb+srv://test15.test.build.10gen.cc/",
+ "seeds": [],
+ "hosts": [],
+ "error": true,
+ "comment": "Should fail because returned host name's part \"not-build\" mismatches URI parent part \"build\"."
+}

test/dns/parent-part-mismatch3.json

@@ -0,0 +1,7 @@
+{
+ "uri": "mongodb+srv://test16.test.build.10gen.cc/",
+ "seeds": [],
+ "hosts": [],
+ "error": true,
+ "comment": "Should fail because returned host name's part \"not-10gen\" mismatches URI parent part \"10gen\"."
+}