Fix #565 by validating email as defined in commonmark spec

erusev · Mar 9, 2018 · 721b885 · 721b885
1 parent f70d964
commit 721b885
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Parsedown.php b/Parsedown.php
@@ -1142,8 +1142,14 @@ protected function inlineCode($Excerpt)
 
     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 @@ protected function element(array $Element)
         {
             $markup .= '>';
 
-            if (!isset($Element['nonNestables'])) 
+            if (!isset($Element['nonNestables']))
             {
                 $Element['nonNestables'] = array();
             }