mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PYTHON-1761 Include fqdn or srv hosts in srv errors

Browse Source
This commit is contained in:
Bernie Hackett 2019-07-16 11:01:00 -07:00
parent 7888ff08f3
commit a23ce28942
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pymongo/srv_resolver.py
View File

@ -45,10 +45,10 @@ class _SrvResolver(object):
try:
self.__plist = self.__fqdn.split(".")[1:]
except Exception:
raise ConfigurationError("Invalid URI host")
raise ConfigurationError("Invalid URI host: %s" % (fqdn,))
self.__slen = len(self.__plist)
if self.__slen < 2:
raise ConfigurationError("Invalid URI host")
raise ConfigurationError("Invalid URI host: %s" % (fqdn,))
def get_options(self):
try:
@ -88,9 +88,9 @@ class _SrvResolver(object):
try:
nlist = node[0].split(".")[1:][-self.__slen:]
except Exception:
raise ConfigurationError("Invalid SRV host")
raise ConfigurationError("Invalid SRV host: %s" % (node[0],))
if self.__plist != nlist:
raise ConfigurationError("Invalid SRV host")
raise ConfigurationError("Invalid SRV host: %s" % (node[0],))
return results, nodes

12
test/test_dns.py
View File

@ -106,6 +106,18 @@ def create_tests():
create_tests()
class TestParsingErrors(unittest.TestCase):
def test_invalid_host(self):
self.assertRaisesRegex(
ConfigurationError,
"Invalid URI host: mongodb",
MongoClient, "mongodb+srv://mongodb")
self.assertRaisesRegex(
ConfigurationError,
"Invalid URI host: mongodb.com",
MongoClient, "mongodb+srv://mongodb.com")
if __name__ == '__main__':
unittest.main()