email-validator 2.1.1__tar.gz → 2.1.2__tar.gz

{email_validator-2.1.1/email_validator.egg-info → email_validator-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: email_validator
-Version: 2.1.1
+Version: 2.1.2
 Summary: A robust email address syntax and deliverability validation library.
 Home-page: https://github.com/JoshData/python-email-validator
 Author: Joshua Tauberer

{email_validator-2.1.1 → email_validator-2.1.2}/email_validator/deliverability.py

@@ -1,5 +1,7 @@
 from typing import Optional, Any, Dict
 
+import ipaddress
+
 from .exceptions_types import EmailUndeliverableError
 
 import dns.resolver
@@ -57,10 +59,30 @@ def validate_email_deliverability(domain: str, domain_i18n: str, timeout: Option
             deliverability_info["mx_fallback_type"] = None
 
         except dns.resolver.NoAnswer:
-            # If there was no MX record, fall back to an A record. (RFC 5321 Section 5)
+            # If there was no MX record, fall back to an A or AAA record
+            # (RFC 5321 Section 5). Check A first since it's more common.
+
+            # If the A/AAAA response has no Globally Reachable IP address,
+            # treat the response as if it were NoAnswer, i.e., the following
+            # address types are not allowed fallbacks: Private-Use, Loopback,
+            # Link-Local, and some other obscure ranges. See
+            # https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
+            # https://www.iana.org/assignments/iana-ipv6-special-registry/iana-ipv6-special-registry.xhtml
+            # (Issue #134.)
+            def is_global_addr(ipaddr):
+                try:
+                    ipaddr = ipaddress.ip_address(ipaddr)
+                except ValueError:
+                    return False
+                return ipaddr.is_global
+
             try:
                 response = dns_resolver.resolve(domain, "A")
-                deliverability_info["mx"] = [(0, str(r)) for r in response]
+
+                if not any(is_global_addr(r.address) for r in response):
+                    raise dns.resolver.NoAnswer  # fall back to AAAA
+
+                deliverability_info["mx"] = [(0, domain)]
                 deliverability_info["mx_fallback_type"] = "A"
 
             except dns.resolver.NoAnswer:
@@ -69,7 +91,11 @@ def validate_email_deliverability(domain: str, domain_i18n: str, timeout: Option
                 # (It's unclear if SMTP servers actually do this.)
                 try:
                     response = dns_resolver.resolve(domain, "AAAA")
-                    deliverability_info["mx"] = [(0, str(r)) for r in response]
+
+                    if not any(is_global_addr(r.address) for r in response):
+                        raise dns.resolver.NoAnswer
+
+                    deliverability_info["mx"] = [(0, domain)]
                     deliverability_info["mx_fallback_type"] = "AAAA"
 
                 except dns.resolver.NoAnswer as e:

{email_validator-2.1.1 → email_validator-2.1.2}/email_validator/rfc_constants.py

@@ -42,7 +42,7 @@ QTEXT_INTL = re.compile(r"[\u0020-\u007E\u0080-\U0010FFFF]")
 EMAIL_MAX_LENGTH = 254
 LOCAL_PART_MAX_LENGTH = 64
 DNS_LABEL_LENGTH_LIMIT = 63  # in "octets", RFC 1035 2.3.1
-DOMAIN_MAX_LENGTH = 255  # in "octets", RFC 1035 2.3.4 and RFC 5321 4.5.3.1.2
+DOMAIN_MAX_LENGTH = 253  # in "octets" as transmitted, RFC 1035 2.3.4 and RFC 5321 4.5.3.1.2, and see https://stackoverflow.com/questions/32290167/what-is-the-maximum-length-of-a-dns-name
 
 # RFC 2142
 CASE_INSENSITIVE_MAILBOX_NAMES = [

email_validator-2.1.2/email_validator/version.py

@@ -0,0 +1 @@
+__version__ = "2.1.2"

{email_validator-2.1.1 → email_validator-2.1.2/email_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: email_validator
-Version: 2.1.1
+Version: 2.1.2
 Summary: A robust email address syntax and deliverability validation library.
 Home-page: https://github.com/JoshData/python-email-validator
 Author: Joshua Tauberer

{email_validator-2.1.1 → email_validator-2.1.2}/pyproject.toml

@@ -1,4 +1,4 @@
 [tool.pytest.ini_options]
 markers = [
     "network: marks tests as requiring Internet access",
-]
+]

{email_validator-2.1.1 → email_validator-2.1.2}/tests/mocked-dns-answers.json

@@ -13,6 +13,35 @@
    "5 gmail-smtp-in.l.google.com."
   ]
  },
+ {
+  "query": {
+   "name": "pages.github.com",
+   "type": "MX",
+   "class": "IN"
+  },
+  "answer": []
+ },
+ {
+  "query": {
+   "name": "pages.github.com",
+   "type": "A",
+   "class": "IN"
+  },
+  "answer": [
+   "185.199.108.153",
+   "185.199.109.153",
+   "185.199.110.153",
+   "185.199.111.153"
+  ]
+ },
+ {
+  "query": {
+   "name": "pages.github.com",
+   "type": "TXT",
+   "class": "IN"
+  },
+  "answer": []
+ },
  {
   "query": {
    "name": "xkxufoekjvjfjeodlfmdfjcu.com",
@@ -31,6 +60,32 @@
    "0 ."
   ]
  },
+ {
+  "query": {
+   "name": "g.mail.com",
+   "type": "MX",
+   "class": "IN"
+  },
+  "answer": []
+ },
+ {
+  "query": {
+   "name": "g.mail.com",
+   "type": "A",
+   "class": "IN"
+  },
+  "answer": []
+ },
+ {
+  "query": {
+   "name": "g.mail.com",
+   "type": "AAAA",
+   "class": "IN"
+  },
+  "answer": [
+   "::1"
+  ]
+ },
  {
   "query": {
    "name": "nellis.af.mil",

{email_validator-2.1.1 → email_validator-2.1.2}/tests/test_deliverability.py

@@ -10,36 +10,33 @@ from mocked_dns_response import MockedDnsResponseData, MockedDnsResponseDataClea
 RESOLVER = MockedDnsResponseData.create_resolver()
 
 
-def test_deliverability_found():
-    response = validate_email_deliverability('gmail.com', 'gmail.com', dns_resolver=RESOLVER)
-    assert response.keys() == {'mx', 'mx_fallback_type'}
-    assert response['mx_fallback_type'] is None
-    assert len(response['mx']) > 1
-    assert len(response['mx'][0]) == 2
-    assert isinstance(response['mx'][0][0], int)
-    assert response['mx'][0][1].endswith('.com')
-
-
-def test_deliverability_fails():
-    # Domain does not exist.
-    domain = 'xkxufoekjvjfjeodlfmdfjcu.com'
-    with pytest.raises(EmailUndeliverableError, match=f'The domain name {domain} does not exist'):
-        validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
-
-    # Null MX record.
-    domain = 'example.com'
-    with pytest.raises(EmailUndeliverableError, match=f'The domain name {domain} does not accept email'):
-        validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
+@pytest.mark.parametrize(
+    'domain,expected_response',
+    [
+        ('gmail.com', {'mx': [(5, 'gmail-smtp-in.l.google.com'), (10, 'alt1.gmail-smtp-in.l.google.com'), (20, 'alt2.gmail-smtp-in.l.google.com'), (30, 'alt3.gmail-smtp-in.l.google.com'), (40, 'alt4.gmail-smtp-in.l.google.com')], 'mx_fallback_type': None}),
+        ('pages.github.com', {'mx': [(0, 'pages.github.com')], 'mx_fallback_type': 'A'}),
+    ],
+)
+def test_deliverability_found(domain, expected_response):
+    response = validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
+    assert response == expected_response
 
-    # No MX record, A record fallback, reject-all SPF record.
-    domain = 'nellis.af.mil'
-    with pytest.raises(EmailUndeliverableError, match=f'The domain name {domain} does not send email'):
-        validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
 
-    # No MX or A/AAAA records, but some other DNS records must
-    # exist such that the response is NOANSWER instead of NXDOMAIN.
-    domain = 'justtxt.joshdata.me'
-    with pytest.raises(EmailUndeliverableError, match=f'The domain name {domain} does not accept email'):
+@pytest.mark.parametrize(
+    'domain,error',
+    [
+        ('xkxufoekjvjfjeodlfmdfjcu.com', 'The domain name {domain} does not exist'),
+        ('example.com', 'The domain name {domain} does not accept email'),  # Null MX record
+        ('g.mail.com', 'The domain name {domain} does not accept email'),  # No MX record but invalid AAAA record fallback (issue #134)
+        ('nellis.af.mil', 'The domain name {domain} does not send email'),  # No MX record, A record fallback, reject-all SPF record.
+
+        # No MX or A/AAAA records, but some other DNS records must
+        # exist such that the response is NOANSWER instead of NXDOMAIN.
+        ('justtxt.joshdata.me', 'The domain name {domain} does not accept email'),
+    ],
+)
+def test_deliverability_fails(domain, error):
+    with pytest.raises(EmailUndeliverableError, match=error.format(domain=domain)):
         validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
 
 

{email_validator-2.1.1 → email_validator-2.1.2}/tests/test_syntax.py

@@ -343,9 +343,9 @@ def test_domain_literal():
         ('obsolete."quoted".atom@example.com', 'The email address contains invalid characters before the @-sign: \'"\'.'),
         ('11111111112222222222333333333344444444445555555555666666666677777@example.com', 'The email address is too long before the @-sign (1 character too many).'),
         ('111111111122222222223333333333444444444455555555556666666666777777@example.com', 'The email address is too long before the @-sign (2 characters too many).'),
-        ('me@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.111111111122222222223333333333444444444455555555556.com', 'The email address is too long (4 characters too many).'),
-        ('me@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555566.com', 'The email address is too long after the @-sign (1 character too many).'),
-        ('me@中1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555566.com', 'The email address is too long after the @-sign.'),
+        ('meme@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.com', 'The email address is too long (4 characters too many).'),
+        ('me@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.11111111112222222222333333333344444444445555555555.com', 'The email address is too long after the @-sign (1 character too many).'),
+        ('me@中1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444.com', 'The email address is too long after the @-sign.'),
         ('my.long.address@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.11111111112222222222333333333344444.info', 'The email address is too long (2 characters too many).'),
         ('my.long.address@λ111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.11111111112222222222333333.info', 'The email address is too long (when converted to IDNA ASCII).'),
         ('my.long.address@λ111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444.info', 'The email address is too long (at least 1 character too many).'),

email_validator-2.1.1/email_validator/version.py

@@ -1 +0,0 @@
-__version__ = "2.1.1"