From 1b8507636bf998887f8b1f3c09d141ccf4297aac Mon Sep 17 00:00:00 2001 From: alwaysjolley Date: Wed, 3 Jun 2020 12:49:55 -0400 Subject: [PATCH] fixing quotes, no escape characters in tests, fixed anchors --- lemur/dns_providers/util.py | 2 +- lemur/tests/test_dns_providers.py | 34 +++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lemur/dns_providers/util.py b/lemur/dns_providers/util.py index fc930eb3..d7140661 100644 --- a/lemur/dns_providers/util.py +++ b/lemur/dns_providers/util.py @@ -35,7 +35,7 @@ def is_valid_domain(domain): domain = domain[:-1] if len(domain) > 253: return False - fqdn_re = re.compile("(?=^.{1,63}$)(^(?:[a-z0-9](?:-*[a-z0-9])+)|[a-z0-9]$)", re.IGNORECASE) + fqdn_re = re.compile("(?=^.{1,63}$)(^(?:[a-z0-9](?:-*[a-z0-9])+)$|^[a-z0-9]$)", re.IGNORECASE) return all(fqdn_re.match(d) for d in domain.split(".")) diff --git a/lemur/tests/test_dns_providers.py b/lemur/tests/test_dns_providers.py index 4b558dab..26679776 100644 --- a/lemur/tests/test_dns_providers.py +++ b/lemur/tests/test_dns_providers.py @@ -4,20 +4,20 @@ from lemur.dns_providers import util as dnsutil class TestDNSProvider(unittest.TestCase): def test_is_valid_domain(self): - self.assertTrue(dnsutil.is_valid_domain("example.com")) - self.assertTrue(dnsutil.is_valid_domain("foo.bar.org")) - self.assertTrue(dnsutil.is_valid_domain("exam--ple.io")) - self.assertTrue(dnsutil.is_valid_domain("a.example.com")) - self.assertTrue(dnsutil.is_valid_domain("example.io")) - self.assertTrue(dnsutil.is_valid_domain("example-of-under-63-character-domain-label-length-limit-1234567.com")) - self.assertFalse(dnsutil.is_valid_domain("example-of-over-63-character-domain-label-length-limit-123456789.com")) - self.assertFalse(dnsutil.is_valid_domain("_acme-chall.example.com")) - self.assertFalse(dnsutil.is_valid_domain("e/xample.com")) - self.assertFalse(dnsutil.is_valid_domain("exam\\ple.com")) - self.assertFalse(dnsutil.is_valid_domain("*.example.com")) - self.assertFalse(dnsutil.is_valid_domain("-example.io")) - self.assertFalse(dnsutil.is_valid_domain("example-.io")) - self.assertFalse(dnsutil.is_valid_domain("example..io")) - self.assertFalse(dnsutil.is_valid_domain("exa mple.io")) - self.assertFalse(dnsutil.is_valid_domain("-")) - self.assertFalse(dnsutil.is_valid_domain("")) + self.assertTrue(dnsutil.is_valid_domain('example.com')) + self.assertTrue(dnsutil.is_valid_domain('foo.bar.org')) + self.assertTrue(dnsutil.is_valid_domain('exam--ple.io')) + self.assertTrue(dnsutil.is_valid_domain('a.example.com')) + self.assertTrue(dnsutil.is_valid_domain('example.io')) + self.assertTrue(dnsutil.is_valid_domain('example-of-under-63-character-domain-label-length-limit-1234567.com')) + self.assertFalse(dnsutil.is_valid_domain('example-of-over-63-character-domain-label-length-limit-123456789.com')) + self.assertFalse(dnsutil.is_valid_domain('_acme-chall.example.com')) + self.assertFalse(dnsutil.is_valid_domain('e/xample.com')) + self.assertFalse(dnsutil.is_valid_domain('exam\ple.com')) + self.assertFalse(dnsutil.is_valid_domain('