From f70d96479aa9ebca173c0e2829e8ee051f16c200 Mon Sep 17 00:00:00 2001
From: Aidan Woods <aidantwoods@gmail.com>
Date: Fri, 9 Mar 2018 16:48:32 +0000
Subject: [PATCH 1/4] Add test case for email surrounded by tags

---
 test/data/email.html | 3 ++-
 test/data/email.md   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/data/email.html b/test/data/email.html
index c40759c..93e0705 100644
--- a/test/data/email.html
+++ b/test/data/email.html
@@ -1 +1,2 @@
-<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>
\ No newline at end of file
+<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>
+<p>html tags shouldn't start an email autolink <strong>first.last@example.com</strong></p>
\ No newline at end of file
diff --git a/test/data/email.md b/test/data/email.md
index 26b7b6c..00b6969 100644
--- a/test/data/email.md
+++ b/test/data/email.md
@@ -1 +1,3 @@
-my email is <me@example.com>
\ No newline at end of file
+my email is <me@example.com>
+
+html tags shouldn't start an email autolink <strong>first.last@example.com</strong>
\ No newline at end of file

From 721b885dd3d569b64377bed548efeb743ce5cbf7 Mon Sep 17 00:00:00 2001
From: Aidan Woods <aidantwoods@gmail.com>
Date: Fri, 9 Mar 2018 16:49:04 +0000
Subject: [PATCH 2/4] Fix #565 by validating email as defined in commonmark
 spec

---
 Parsedown.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Parsedown.php b/Parsedown.php
index 87d612a..685d6df 100644
--- a/Parsedown.php
+++ b/Parsedown.php
@@ -1142,8 +1142,14 @@ class Parsedown
 
     protected function inlineEmailTag($Excerpt)
     {
-        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
-        {
+        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9]'
+            .'(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?'
+            .'(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*'
+        ;
+
+        if (strpos($Excerpt['text'], '>') !== false
+            and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches)
+        ){
             $url = $matches[1];
 
             if ( ! isset($matches[2]))
@@ -1479,7 +1485,7 @@ class Parsedown
         {
             $markup .= '>';
 
-            if (!isset($Element['nonNestables'])) 
+            if (!isset($Element['nonNestables']))
             {
                 $Element['nonNestables'] = array();
             }

From 19f1bb9353506f9c25c8b803333606cd6568cfc3 Mon Sep 17 00:00:00 2001
From: Aidan Woods <aidantwoods@gmail.com>
Date: Fri, 9 Mar 2018 16:54:21 +0000
Subject: [PATCH 3/4] Disable backtracking where the regex doesn't need it

---
 Parsedown.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Parsedown.php b/Parsedown.php
index 685d6df..27a35bf 100644
--- a/Parsedown.php
+++ b/Parsedown.php
@@ -1142,7 +1142,7 @@ class Parsedown
 
     protected function inlineEmailTag($Excerpt)
     {
-        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9]'
+        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@[a-zA-Z0-9]'
             .'(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?'
             .'(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*'
         ;

From 6830c3339f70046183280ceaba83bcbc5c60634b Mon Sep 17 00:00:00 2001
From: Aidan Woods <aidantwoods@gmail.com>
Date: Fri, 9 Mar 2018 17:38:41 +0000
Subject: [PATCH 4/4] Readability

Thanks @PhrozenByte for the suggestion :)
---
 Parsedown.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Parsedown.php b/Parsedown.php
index 27a35bf..c0dbf08 100644
--- a/Parsedown.php
+++ b/Parsedown.php
@@ -1142,10 +1142,10 @@ class Parsedown
 
     protected function inlineEmailTag($Excerpt)
     {
-        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@[a-zA-Z0-9]'
-            .'(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?'
-            .'(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*'
-        ;
+        $hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?';
+
+        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@'
+            . $hostnameLabel . '(?:\.' . $hostnameLabel . ')*';
 
         if (strpos($Excerpt['text'], '>') !== false
             and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches)