From b989427215c2be6b10915da0450e91238db46604 Mon Sep 17 00:00:00 2001
From: Chris Caron <lead2gold@gmail.com>
Date: Thu, 13 Oct 2022 19:53:32 -0400
Subject: [PATCH] Allow extended characters in ID of email address (#693)

---
 apprise/plugins/NotifyForm.py |  3 ++-
 apprise/plugins/NotifyXML.py  |  3 ++-
 apprise/utils.py              |  8 ++++----
 test/test_apprise_utils.py    | 24 ++++++++++++++++++++++++
 test/test_config_base.py      |  1 +
 test/test_plugin_email.py     |  2 +-
 test/test_plugin_mailgun.py   |  2 +-
 test/test_plugin_smtp2go.py   |  2 +-
 test/test_plugin_sparkpost.py |  2 +-
 9 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/apprise/plugins/NotifyForm.py b/apprise/plugins/NotifyForm.py
index ba81e5d2..600713b3 100644
--- a/apprise/plugins/NotifyForm.py
+++ b/apprise/plugins/NotifyForm.py
@@ -129,7 +129,8 @@ class NotifyForm(NotifyBase):
         },
     }
 
-    def __init__(self, headers=None, method=None, payload=None, params=None, **kwargs):
+    def __init__(self, headers=None, method=None, payload=None, params=None,
+                 **kwargs):
         """
         Initialize Form Object
 
diff --git a/apprise/plugins/NotifyXML.py b/apprise/plugins/NotifyXML.py
index c238caf6..96c2f561 100644
--- a/apprise/plugins/NotifyXML.py
+++ b/apprise/plugins/NotifyXML.py
@@ -136,7 +136,8 @@ class NotifyXML(NotifyBase):
         },
     }
 
-    def __init__(self, headers=None, method=None, payload=None, params=None, **kwargs):
+    def __init__(self, headers=None, method=None, payload=None, params=None,
+                 **kwargs):
         """
         Initialize XML Object
 
diff --git a/apprise/utils.py b/apprise/utils.py
index 334711de..f1bbd40a 100644
--- a/apprise/utils.py
+++ b/apprise/utils.py
@@ -153,10 +153,10 @@ URL_DETAILS_RE = re.compile(
 #   - user@example.com
 #   - label+user@example.com
 GET_EMAIL_RE = re.compile(
-    r'(([\s"\']+)?(?P<name>[^:<"\']+)?[:<\s"\']+)?'
+    r'(([\s"\']+)?(?P<name>[^:<\'"]+)?[:<\s\'"]+)?'
     r'(?P<full_email>((?P<label>[^+]+)\+)?'
-    r'(?P<email>(?P<userid>[a-z0-9$%=_~-]+'
-    r'(?:\.[a-z0-9$%+=_~-]+)'
+    r'(?P<email>(?P<userid>[a-z0-9_!#$%&*/=?%`{|}~^-]+'
+    r'(?:\.[a-z0-9_!#$%&\'*/=?%`{|}~^-]+)'
     r'*)@(?P<domain>('
     r'(?:[a-z0-9](?:[a-z0-9_-]*[a-z0-9])?\.)+'
     r'[a-z0-9](?:[a-z0-9_-]*[a-z0-9]))|'
@@ -188,7 +188,7 @@ URL_DETECTION_RE = re.compile(
 
 EMAIL_DETECTION_RE = re.compile(
     r'[\s,]*([^@]+@.*?)(?=$|[\s,]+'
-    + r'(?:[^:<]+?[:<\s]+?)?'
+    r'(?:[^:<]+?[:<\s]+?)?'
     r'[^@\s,]+@[^\s,]+)',
     re.IGNORECASE)
 
diff --git a/test/test_apprise_utils.py b/test/test_apprise_utils.py
index c4b1f84a..b034005f 100644
--- a/test/test_apprise_utils.py
+++ b/test/test_apprise_utils.py
@@ -1361,6 +1361,30 @@ def test_is_email():
     assert utils.is_email("Just A Name") is False
     assert utils.is_email("Name <bademail>") is False
 
+    # Extended valid emails
+    #
+    # The first + denotes our label, so this test really validates
+    # that there is a correct split and parsing of our email
+    results = utils.is_email('a-z0-9_!#$%&*+/=?%`{|}~^.-@gmail.com')
+    assert '' == results['name']
+    assert 'a-z0-9_!#$%&*' == results['label']
+    assert '/=?%`{|}~^.-@gmail.com' == results['email']
+    assert 'a-z0-9_!#$%&*+/=?%`{|}~^.-@gmail.com' == results['full_email']
+    assert 'gmail.com' == results['domain']
+    assert '/=?%`{|}~^.-' == results['user']
+
+    # A similar test without '+' (use of a label)
+
+    # The first + denotes our label, so this test really validates
+    # that there is a correct split and parsing of our email
+    results = utils.is_email('a-z0-9_!#$%&*/=?%`{|}~^.-@gmail.com')
+    assert '' == results['name']
+    assert '' == results['label']
+    assert 'a-z0-9_!#$%&*/=?%`{|}~^.-@gmail.com' == results['email']
+    assert 'a-z0-9_!#$%&*/=?%`{|}~^.-@gmail.com' == results['full_email']
+    assert 'gmail.com' == results['domain']
+    assert 'a-z0-9_!#$%&*/=?%`{|}~^.-' == results['user']
+
 
 def test_is_call_sign_no():
     """
diff --git a/test/test_config_base.py b/test/test_config_base.py
index 8d572a61..fe659054 100644
--- a/test/test_config_base.py
+++ b/test/test_config_base.py
@@ -504,6 +504,7 @@ urls:
     - invalid: test
   - sns://T1JJ3T3L2/:
     - invalid: test
+    - _invalid: Token can not start with an underscore
 
   # some strangeness
   -
diff --git a/test/test_plugin_email.py b/test/test_plugin_email.py
index c7b755b8..72ee758e 100644
--- a/test/test_plugin_email.py
+++ b/test/test_plugin_email.py
@@ -191,7 +191,7 @@ TEST_URLS = (
         'response': False,
     }),
     # Valid URL, but can't structure a proper email
-    ('mailtos://nuxref.com?user=%20!&pass=.', {
+    ('mailtos://nuxref.com?user=%20"&pass=.', {
         'instance': TypeError,
     }),
     # Invalid From (and To) Address
diff --git a/test/test_plugin_mailgun.py b/test/test_plugin_mailgun.py
index abc4dd18..855664ff 100644
--- a/test/test_plugin_mailgun.py
+++ b/test/test_plugin_mailgun.py
@@ -58,7 +58,7 @@ apprise_url_tests = (
         'instance': TypeError,
     }),
     # Invalid from email address
-    ('mailgun://!@localhost.localdomain/{}-{}-{}'.format(
+    ('mailgun://"@localhost.localdomain/{}-{}-{}'.format(
         'a' * 32, 'b' * 8, 'c' * 8), {
         'instance': TypeError,
     }),
diff --git a/test/test_plugin_smtp2go.py b/test/test_plugin_smtp2go.py
index b4afe685..c4c2af6a 100644
--- a/test/test_plugin_smtp2go.py
+++ b/test/test_plugin_smtp2go.py
@@ -58,7 +58,7 @@ apprise_url_tests = (
         'instance': TypeError,
     }),
     # Invalid from email address
-    ('smtp2go://!@localhost.localdomain/{}-{}-{}'.format(
+    ('smtp2go://"@localhost.localdomain/{}-{}-{}'.format(
         'a' * 32, 'b' * 8, 'c' * 8), {
         'instance': TypeError,
     }),
diff --git a/test/test_plugin_sparkpost.py b/test/test_plugin_sparkpost.py
index 41e8d612..ced52c64 100644
--- a/test/test_plugin_sparkpost.py
+++ b/test/test_plugin_sparkpost.py
@@ -59,7 +59,7 @@ apprise_url_tests = (
         'instance': TypeError,
     }),
     # Invalid from email address
-    ('sparkpost://!@localhost.localdomain/{}'.format('b' * 32), {
+    ('sparkpost://"@localhost.localdomain/{}'.format('b' * 32), {
         'instance': TypeError,
     }),
     # No To email address, but everything else is valid