From e79c42391727c208df7c9e1cea441529b2f69573 Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Thu, 18 Apr 2024 15:33:52 +0100
Subject: [PATCH 1/9] increase test coverage to include the <script src="">
 element handling

---
 .../mail2/jakarta/ImageHtmlEmailTest.java     | 193 +++++++++++-------
 .../test/resources/scripts/example-script.js  |  19 ++
 2 files changed, 139 insertions(+), 73 deletions(-)
 create mode 100644 commons-email2-jakarta/src/test/resources/scripts/example-script.js
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java
index afe71b765..4749c4f5b 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java
@@ -17,6 +17,7 @@
 package org.apache.commons.mail2.jakarta;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -25,11 +26,13 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -45,6 +48,9 @@
 
 import jakarta.activation.DataSource;
 import jakarta.mail.internet.MimeMessage;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ImageHtmlEmailTest extends HtmlEmailTest {
 
@@ -70,6 +76,8 @@ public DataSource resolve(final String resourceLocation, final boolean isLenient
 
     private static final URL TEST2_HTML_URL = ImageHtmlEmailTest.class.getResource("/attachments/classpathtest.html");
 
+    private static final Pattern imgSrcPattern = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);
+    private static final Pattern scriptSrcPattern = Pattern.compile(ImageHtmlEmail.REGEX_SCRIPT_SRC);
     private MockImageHtmlEmailConcrete email;
 
     private String loadUrlContent(final URL url) throws IOException {
@@ -123,79 +131,82 @@ public void testEmail127() throws Exception {
                 email.getBccAddresses(), true);
     }
 
-    @Test
-    public void testRegex() {
-        final Pattern pattern = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);
-
-        // ensure that the regex that we use is catching the cases correctly
-        Matcher matcher = pattern.matcher("<html><body><img src=\"h\"/></body></html>");
-        assertTrue(matcher.find());
-        assertEquals("h", matcher.group(2));
-
-        matcher = pattern.matcher("<html><body><img id=\"laskdasdkj\" src=\"h\"/></body></html>");
-        assertTrue(matcher.find());
-        assertEquals("h", matcher.group(2));
-
-        // uppercase
-        matcher = pattern.matcher("<html><body><IMG id=\"laskdasdkj\" SRC=\"h\"/></body></html>");
-        assertTrue(matcher.find());
-        assertEquals("h", matcher.group(2));
-
-        // matches twice
-        matcher = pattern.matcher(
-                "<html><body><img id=\"laskdasdkj\" src=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>");
-        assertTrue(matcher.find());
-        assertEquals("http://dstadler1.org/", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("http://dstadler2.org/", matcher.group(2));
-
-        // what about newlines
-        matcher = pattern.matcher(
-                "<html><body><img\n \rid=\"laskdasdkj\"\n \rsrc=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>");
-        assertTrue(matcher.find());
-        assertEquals("http://dstadler1.org/", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("http://dstadler2.org/", matcher.group(2));
-
-        // what about newlines and other whitespaces
-        matcher = pattern.matcher(
-                "<html><body><img\n \t\rid=\"laskdasdkj\"\n \rsrc \n =\r  \"http://dstadler1.org/\"/><img  \r  id=\" laskdasdkj\"    src    =   \"http://dstadler2.org/\"/></body></html>");
-        assertTrue(matcher.find());
-        assertEquals("http://dstadler1.org/", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("http://dstadler2.org/", matcher.group(2));
-
-        // what about some real markup
-        matcher = pattern.matcher(
-                "<img alt=\"Chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0\" src=\"/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0\"");
-        assertTrue(matcher.find());
-        assertEquals("/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0", matcher.group(2));
-
-        // had a problem with multiple img-source tags
-        matcher = pattern.matcher("<img src=\"file1\"/><img src=\"file2\"/>");
-        assertTrue(matcher.find());
-        assertEquals("file1", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("file2", matcher.group(2));
-
-        matcher = pattern.matcher("<img src=\"file1\"/><img src=\"file2\"/><img src=\"file3\"/><img src=\"file4\"/><img src=\"file5\"/>");
-        assertTrue(matcher.find());
-        assertEquals("file1", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("file2", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("file3", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("file4", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("file5", matcher.group(2));
-
-        // try with invalid HTML that is seems sometimes, i.e. without closing "/" or "</img>"
-        matcher = pattern.matcher("<img src=\"file1\"><img src=\"file2\">");
-        assertTrue(matcher.find());
-        assertEquals("file1", matcher.group(2));
-        assertTrue(matcher.find());
-        assertEquals("file2", matcher.group(2));
+    @ParameterizedTest
+    @MethodSource
+    public void testImgRegex(String inputHtml, List<String> srcMatches) {
+        Matcher matcher = imgSrcPattern.matcher(inputHtml);
+        for (String expectedMatch : srcMatches) {
+            assertTrue(matcher.find());
+            assertEquals(expectedMatch, matcher.group(2));
+        }
+        assertFalse(matcher.find());
+    }
+
+    private static Stream<Arguments> testImgRegex() {
+        Stream<Arguments> argumentsStream = Stream.of(
+                // ensure that the regex that we use is catching the cases correctly
+                Arguments.of("<html><body><img src=\"h\"/></body></html>", Arrays.asList("h")),
+                Arguments.of("<html><body><img id=\"laskdasdkj\" src=\"h\"/></body></html>", Arrays.asList("h")),
+                // uppercase
+                Arguments.of("<html><body><IMG id=\"laskdasdkj\" SRC=\"h\"/></body></html>", Arrays.asList("h")),
+                // matches twice
+                Arguments.of("<html><body><img id=\"laskdasdkj\" src=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>", Arrays.asList("http://dstadler1.org/", "http://dstadler2.org/")),
+                // what about newlines
+                Arguments.of("<html><body><img\n \rid=\"laskdasdkj\"\n \rsrc=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>", Arrays.asList("http://dstadler1.org/", "http://dstadler2.org/")),
+                // what about newlines and other whitespaces
+                Arguments.of("<html><body><img\n \t\rid=\"laskdasdkj\"\n \rsrc \n =\r  \"http://dstadler1.org/\"/><img  \r  id=\" laskdasdkj\"    src    =   \"http://dstadler2.org/\"/></body></html>", Arrays.asList("http://dstadler1.org/", "http://dstadler2.org/")),
+                // what about some real markup
+                Arguments.of("<img alt=\"Chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0\" src=\"/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0\"", Arrays.asList("/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0")),
+                // had a problem with multiple img-source tags
+                Arguments.of("<img src=\"file1\"/><img src=\"file2\"/>", Arrays.asList("file1", "file2")),
+                Arguments.of("<img src=\"file1\"/><img src=\"file2\"/><img src=\"file3\"/><img src=\"file4\"/><img src=\"file5\"/>", Arrays.asList("file1", "file2", "file3", "file4", "file5")),
+                // try with invalid HTML that is seen sometimes, i.e. without closing "/" or "</img>"
+                Arguments.of("<img src=\"file1\"><img src=\"file2\">", Arrays.asList("file1", "file2")),
+                // should not match some other tag
+                Arguments.of("<nomatch src=\"s\" />", Arrays.asList()),
+                Arguments.of("<imgx src=\"file1\">", Arrays.asList()),
+                Arguments.of("<img xsrc=\"file1\">", Arrays.asList())
+        );
+        return argumentsStream;
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testScriptRegex(String inputHtml, List<String> srcMatches) {
+        Matcher matcher = scriptSrcPattern.matcher(inputHtml);
+        for (String expectedMatch : srcMatches) {
+            assertTrue(matcher.find());
+            assertEquals(expectedMatch, matcher.group(2));
+        }
+        assertFalse(matcher.find());
+    }
+
+    private static Stream<Arguments> testScriptRegex() {
+        Stream<Arguments> argumentsStream = Stream.of(
+                // ensure that the regex that we use is catching the cases correctly
+                Arguments.of("<html><body><script src=\"s\"></script></body></html>", Arrays.asList("s")),
+                Arguments.of("<html><body><script blocking=\"render\" async src=\"s\"></script></body></html>", Arrays.asList("s")),
+                // uppercase
+                Arguments.of("<html><body><SCRIPT BLOCKING=\"render\" ASYNC SRC=\"s\"></script></body></html>", Arrays.asList("s")),
+                // matches twice
+                Arguments.of("<html><body><script src=\"s1\"></script><script src=\"s2\"></script></body></html>", Arrays.asList("s1", "s2")),
+                // what about newlines
+                Arguments.of("<html><body><script\n \rsrc=\"s1\"></script><script \nsrc=\"s2\"></script></body></html>", Arrays.asList("s1", "s2")),
+                // what about newlines and other whitespaces
+                Arguments.of("<html><body><script\n \rsrc  = \t \"s1\" ></script><script \nsrc =\t\"s2\" ></script></body></html>", Arrays.asList("s1", "s2")),
+                // what about some real markup
+                Arguments.of("<script defer=\"\" nomodule=\"\" nonce=\"\" src=\"/jkao/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js\"></script>", Arrays.asList("/jkao/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js")),
+                // try with 5
+                Arguments.of("<html><body><script src=\"s1\"></script><script src=\"s2\"></script><script src=\"s3\"></script><script src=\"s4\"></script><script src=\"s5\"></script></body></html>", Arrays.asList("s1", "s2", "s3", "s4", "s5")),
+                // try with invalid scripts
+                Arguments.of("<script src=\"s\" />", Arrays.asList("s")),
+                Arguments.of("<script src=\"s\">", Arrays.asList("s")),
+                // should not match some other tag
+                Arguments.of("<nomatch src=\"s\" />", Arrays.asList()),
+                Arguments.of("<scriptx src=\"s\" />", Arrays.asList()),
+                Arguments.of("<script xsrc=\"s\" />", Arrays.asList())
+        );
+        return argumentsStream;
     }
 
     @Test
@@ -486,4 +497,40 @@ public void testSendHtmlUrl() throws Exception {
         validateSend(fakeMailServer, strSubject, email.getHtml(), email.getFromAddress(), email.getToAddresses(), email.getCcAddresses(),
                 email.getBccAddresses(), true);
     }
+
+    @Test
+    public void testEmailWithScript() throws Exception {
+        Logger.getLogger(ImageHtmlEmail.class.getName()).setLevel(Level.FINEST);
+
+        getMailServer();
+
+        final String strSubject = "Test HTML Send with Script";
+
+        // Create the email message
+        email = new MockImageHtmlEmailConcrete();
+        final DataSourceResolver dataSourceResolver = new DataSourceClassPathResolver("/", true);
+
+        email.setDataSourceResolver(dataSourceResolver);
+        email.setHostName(strTestMailServer);
+        email.setSmtpPort(getMailServerPort());
+        email.setFrom(strTestMailFrom);
+        email.addTo(strTestMailTo);
+        email.setSubject(strSubject);
+
+        // set the html message
+        email.setHtmlMsg("<html><body><script  type=\"text/javascript\" src=\"scripts/example-script.js\"/></body></html>");
+
+        // send the email
+        email.send();
+
+        fakeMailServer.stop();
+
+        assertEquals(1, fakeMailServer.getMessages().size());
+        final MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();
+        MimeMessageUtils.writeMimeMessage(mimeMessage, new File("./target/test-emails/testEmailWithScript.eml"));
+
+        final MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();
+        assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
+        assertEquals(1, mimeMessageParser.getAttachmentList().size());
+    }
 }
diff --git a/commons-email2-jakarta/src/test/resources/scripts/example-script.js b/commons-email2-jakarta/src/test/resources/scripts/example-script.js
new file mode 100644
index 000000000..df6349cf8
--- /dev/null
+++ b/commons-email2-jakarta/src/test/resources/scripts/example-script.js
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+function hello(){
+  return "Hello, World!";
+}
\ No newline at end of file

From 178a9ffbd3fd89f99097e0e71f507ede80a9e1fa Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Thu, 18 Apr 2024 15:36:35 +0100
Subject: [PATCH 2/9] fix bug with REGEX_SCRIPT_SRC where it only got the last
 script tag

---
 .../org/apache/commons/mail2/jakarta/ImageHtmlEmail.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
index 164c815ff..cb9e44ae9 100644
--- a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
+++ b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
@@ -29,8 +29,9 @@
 
 /**
  * <p>
- * Small wrapper class on top of HtmlEmail which encapsulates the required logic to retrieve images that are contained in "&lt;img src=../&gt;" elements in the
- * HTML code. This is done by replacing all img-src-elements with "cid:"-entries and embedding images in the email.
+ * Small wrapper class on top of HtmlEmail which encapsulates the required logic to retrieve images and scripts that are contained in
+ * "&lt;img src=../&gt;" and "&lt;script src=../&gt;" elements in the HTML code.
+ * This is done by replacing all the src-elements with "cid:"-entries and embedding the images/scripts in the email.
  * </p>
  * <p>
  * For local files the class tries to either load them via an absolute path or - if available - use a relative path starting from a base directory. For files
@@ -52,7 +53,7 @@ public class ImageHtmlEmail extends HtmlEmail {
     public static final String REGEX_IMG_SRC = "(<[Ii][Mm][Gg]\\s*[^>]*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
 
     /** Regexp for extracting {@code <script>} tags */
-    public static final String REGEX_SCRIPT_SRC = "(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s*.*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
+    public static final String REGEX_SCRIPT_SRC = "(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s*[^>]*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
 
     // this pattern looks for the HTML image tag which indicates embedded images,
     // the grouping is necessary to allow to replace the element with the CID

From de854999b2764626d24d85c75c6a34f47b12fd6c Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Thu, 18 Apr 2024 15:36:57 +0100
Subject: [PATCH 3/9] add benchmark for regex

---
 commons-email2-jakarta/pom.xml                | 13 ++++
 .../jakarta/ImageHtmlEmailBenchmark.java      | 61 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java

diff --git a/commons-email2-jakarta/pom.xml b/commons-email2-jakarta/pom.xml
index 83f34318e..212ef078d 100644
--- a/commons-email2-jakarta/pom.xml
+++ b/commons-email2-jakarta/pom.xml
@@ -78,6 +78,18 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-core</artifactId>
+      <version>${jmh.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-generator-annprocess</artifactId>
+      <version>${jmh.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <properties>
@@ -91,6 +103,7 @@
     <commons.jacoco.branchRatio>0.18</commons.jacoco.branchRatio>
     <commons.jacoco.lineRatio>0.84</commons.jacoco.lineRatio>
     <commons.jacoco.complexityRatio>0.76</commons.jacoco.complexityRatio>
+    <jmh.version>1.37</jmh.version>
   </properties>
   <build>
     <resources>
diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
new file mode 100644
index 000000000..888ac764b
--- /dev/null
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.mail2.jakarta;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ImageHtmlEmailBenchmark  {
+
+    @Benchmark
+    public void testRegularExpressions(BenchmarkContext context, Blackhole blackhole) {
+        blackhole.consume(context.matcherImg.find());
+        blackhole.consume(context.matcherScript.find());
+        context.matcherImg.reset();
+        context.matcherScript.reset();
+    }
+
+    @State(Scope.Thread)
+    public static class BenchmarkContext {
+        Matcher matcherImg;
+        Matcher matcherScript;
+
+        @Setup
+        public void prepare() {
+            StringBuilder html = new StringBuilder();
+            html.append("<html><body><pre>");
+            html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
+            html.append("<img    some=\"true\" other=\"1\" attributes=\"yes\"  src = \"this-might-be-a-long-url-url\">");
+            html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
+            html.append("</pre></body></html>");
+            Pattern patternImg = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);
+            matcherImg = patternImg.matcher(html);
+            Pattern patternScript = Pattern.compile(ImageHtmlEmail.REGEX_SCRIPT_SRC);
+            matcherScript = patternScript.matcher(html);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        org.openjdk.jmh.Main.main(args);
+    }
+}

From 159fb047e04f58d19110ee34e1d3013b9464a0c4 Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Thu, 18 Apr 2024 16:00:46 +0100
Subject: [PATCH 4/9] regex performance improvements

---
 .../java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
index cb9e44ae9..e907dcb05 100644
--- a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
+++ b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
@@ -50,10 +50,10 @@ public class ImageHtmlEmail extends HtmlEmail {
     // can be arbitrary text between "IMG" and "SRC" like IDs and other things.
 
     /** Regexp for extracting {@code <img>} tags */
-    public static final String REGEX_IMG_SRC = "(<[Ii][Mm][Gg]\\s*[^>]*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
+    public static final String REGEX_IMG_SRC = "(<[Ii][Mm][Gg]\\s[^>]*?(?<=\\s)[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+)([\"'])";
 
     /** Regexp for extracting {@code <script>} tags */
-    public static final String REGEX_SCRIPT_SRC = "(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s*[^>]*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
+    public static final String REGEX_SCRIPT_SRC = "(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s[^>]*?(?<=\\s)[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+)([\"'])";
 
     // this pattern looks for the HTML image tag which indicates embedded images,
     // the grouping is necessary to allow to replace the element with the CID

From 8a2ae2a47e7b39e3403a1517457fdc2cc8ab3140 Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Thu, 18 Apr 2024 17:26:01 +0100
Subject: [PATCH 5/9] prefer lookahead - minor performance improvement

---
 .../java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
index e907dcb05..4b52c8dbf 100644
--- a/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
+++ b/commons-email2-jakarta/src/main/java/org/apache/commons/mail2/jakarta/ImageHtmlEmail.java
@@ -50,10 +50,10 @@ public class ImageHtmlEmail extends HtmlEmail {
     // can be arbitrary text between "IMG" and "SRC" like IDs and other things.
 
     /** Regexp for extracting {@code <img>} tags */
-    public static final String REGEX_IMG_SRC = "(<[Ii][Mm][Gg]\\s[^>]*?(?<=\\s)[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+)([\"'])";
+    public static final String REGEX_IMG_SRC = "(<[Ii][Mm][Gg](?=\\s)[^>]*?\\s[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+)([\"'])";
 
     /** Regexp for extracting {@code <script>} tags */
-    public static final String REGEX_SCRIPT_SRC = "(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s[^>]*?(?<=\\s)[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+)([\"'])";
+    public static final String REGEX_SCRIPT_SRC = "(<[Ss][Cc][Rr][Ii][Pp][Tt](?=\\s)[^>]*?\\s[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+)([\"'])";
 
     // this pattern looks for the HTML image tag which indicates embedded images,
     // the grouping is necessary to allow to replace the element with the CID

From c9f48c2cf55de484afcfb85df789f5567c288b65 Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Fri, 19 Apr 2024 10:44:54 +0100
Subject: [PATCH 6/9] add some data variation to benchmark

---
 .../mail2/jakarta/ImageHtmlEmailBenchmark.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
index 888ac764b..7b22ba33e 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
@@ -29,8 +29,10 @@ public class ImageHtmlEmailBenchmark  {
 
     @Benchmark
     public void testRegularExpressions(BenchmarkContext context, Blackhole blackhole) {
-        blackhole.consume(context.matcherImg.find());
-        blackhole.consume(context.matcherScript.find());
+        for (int i = 0; i < context.matchesToFind; i++) {
+            blackhole.consume(context.matcherImg.find());
+            blackhole.consume(context.matcherScript.find());
+        }
         context.matcherImg.reset();
         context.matcherScript.reset();
     }
@@ -39,14 +41,20 @@ public void testRegularExpressions(BenchmarkContext context, Blackhole blackhole
     public static class BenchmarkContext {
         Matcher matcherImg;
         Matcher matcherScript;
+        int matchesToFind = 50;
 
         @Setup
         public void prepare() {
+            String longUrl = new String(new char[200]).replace("\0", "a");
+            String longSpace = new String(new char[100]).replace("\0", " ");
             StringBuilder html = new StringBuilder();
             html.append("<html><body><pre>");
             html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
-            html.append("<img    some=\"true\" other=\"1\" attributes=\"yes\"  src = \"this-might-be-a-long-url-url\">");
-            html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
+            for (int i = 0; i < matchesToFind; i++) {
+                html.append("<img" + longSpace +  "xxx=\"no-src-attribute\">");
+                html.append("<script    some=\"true\" other=\"1\" attributes=\"yes\"  src = \"" + longUrl + "\">");
+                html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
+            }
             html.append("</pre></body></html>");
             Pattern patternImg = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);
             matcherImg = patternImg.matcher(html);

From c35c88cda3c45b26d792022f96c3d8de5fc3f32e Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Fri, 19 Apr 2024 15:34:26 +0100
Subject: [PATCH 7/9] newline required at end of file

---
 .../src/test/resources/scripts/example-script.js                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons-email2-jakarta/src/test/resources/scripts/example-script.js b/commons-email2-jakarta/src/test/resources/scripts/example-script.js
index df6349cf8..8e6d1a02b 100644
--- a/commons-email2-jakarta/src/test/resources/scripts/example-script.js
+++ b/commons-email2-jakarta/src/test/resources/scripts/example-script.js
@@ -16,4 +16,4 @@
  */
 function hello(){
   return "Hello, World!";
-}
\ No newline at end of file
+}

From 427b34e627b87222f2550728c51e3d9fb097664b Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Fri, 19 Apr 2024 15:43:16 +0100
Subject: [PATCH 8/9] restore original test - no need to rewrite it

---
 .../mail2/jakarta/ImageHtmlEmailTest.java     | 120 ++++++++++++------
 1 file changed, 84 insertions(+), 36 deletions(-)

diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java
index 4749c4f5b..51c5c7f77 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailTest.java
@@ -131,43 +131,90 @@ public void testEmail127() throws Exception {
                 email.getBccAddresses(), true);
     }
 
-    @ParameterizedTest
-    @MethodSource
-    public void testImgRegex(String inputHtml, List<String> srcMatches) {
-        Matcher matcher = imgSrcPattern.matcher(inputHtml);
-        for (String expectedMatch : srcMatches) {
-            assertTrue(matcher.find());
-            assertEquals(expectedMatch, matcher.group(2));
-        }
+    @Test
+    public void testRegex() {
+        final Pattern pattern = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);
+
+        // ensure that the regex that we use is catching the cases correctly
+        Matcher matcher = pattern.matcher("<html><body><img src=\"h\"/></body></html>");
+        assertTrue(matcher.find());
+        assertEquals("h", matcher.group(2));
+
+        matcher = pattern.matcher("<html><body><img id=\"laskdasdkj\" src=\"h\"/></body></html>");
+        assertTrue(matcher.find());
+        assertEquals("h", matcher.group(2));
+
+        // uppercase
+        matcher = pattern.matcher("<html><body><IMG id=\"laskdasdkj\" SRC=\"h\"/></body></html>");
+        assertTrue(matcher.find());
+        assertEquals("h", matcher.group(2));
+
+        // matches twice
+        matcher = pattern.matcher(
+                "<html><body><img id=\"laskdasdkj\" src=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>");
+        assertTrue(matcher.find());
+        assertEquals("http://dstadler1.org/", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("http://dstadler2.org/", matcher.group(2));
+
+        // what about newlines
+        matcher = pattern.matcher(
+                "<html><body><img\n \rid=\"laskdasdkj\"\n \rsrc=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>");
+        assertTrue(matcher.find());
+        assertEquals("http://dstadler1.org/", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("http://dstadler2.org/", matcher.group(2));
+
+        // what about newlines and other whitespaces
+        matcher = pattern.matcher(
+                "<html><body><img\n \t\rid=\"laskdasdkj\"\n \rsrc \n =\r  \"http://dstadler1.org/\"/><img  \r  id=\" laskdasdkj\"    src    =   \"http://dstadler2.org/\"/></body></html>");
+        assertTrue(matcher.find());
+        assertEquals("http://dstadler1.org/", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("http://dstadler2.org/", matcher.group(2));
+
+        // what about some real markup
+        matcher = pattern.matcher(
+                "<img alt=\"Chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0\" src=\"/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0\"");
+        assertTrue(matcher.find());
+        assertEquals("/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0", matcher.group(2));
+
+        // had a problem with multiple img-source tags
+        matcher = pattern.matcher("<img src=\"file1\"/><img src=\"file2\"/>");
+        assertTrue(matcher.find());
+        assertEquals("file1", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("file2", matcher.group(2));
+
+        matcher = pattern.matcher("<img src=\"file1\"/><img src=\"file2\"/><img src=\"file3\"/><img src=\"file4\"/><img src=\"file5\"/>");
+        assertTrue(matcher.find());
+        assertEquals("file1", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("file2", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("file3", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("file4", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("file5", matcher.group(2));
+
+        // try with invalid HTML that is seems sometimes, i.e. without closing "/" or "</img>"
+        matcher = pattern.matcher("<img src=\"file1\"><img src=\"file2\">");
+        assertTrue(matcher.find());
+        assertEquals("file1", matcher.group(2));
+        assertTrue(matcher.find());
+        assertEquals("file2", matcher.group(2));
+
+        // should not match any other tags
+        matcher = pattern.matcher("<nomatch src=\"s\" />");
         assertFalse(matcher.find());
-    }
 
-    private static Stream<Arguments> testImgRegex() {
-        Stream<Arguments> argumentsStream = Stream.of(
-                // ensure that the regex that we use is catching the cases correctly
-                Arguments.of("<html><body><img src=\"h\"/></body></html>", Arrays.asList("h")),
-                Arguments.of("<html><body><img id=\"laskdasdkj\" src=\"h\"/></body></html>", Arrays.asList("h")),
-                // uppercase
-                Arguments.of("<html><body><IMG id=\"laskdasdkj\" SRC=\"h\"/></body></html>", Arrays.asList("h")),
-                // matches twice
-                Arguments.of("<html><body><img id=\"laskdasdkj\" src=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>", Arrays.asList("http://dstadler1.org/", "http://dstadler2.org/")),
-                // what about newlines
-                Arguments.of("<html><body><img\n \rid=\"laskdasdkj\"\n \rsrc=\"http://dstadler1.org/\"/><img id=\"laskdasdkj\" src=\"http://dstadler2.org/\"/></body></html>", Arrays.asList("http://dstadler1.org/", "http://dstadler2.org/")),
-                // what about newlines and other whitespaces
-                Arguments.of("<html><body><img\n \t\rid=\"laskdasdkj\"\n \rsrc \n =\r  \"http://dstadler1.org/\"/><img  \r  id=\" laskdasdkj\"    src    =   \"http://dstadler2.org/\"/></body></html>", Arrays.asList("http://dstadler1.org/", "http://dstadler2.org/")),
-                // what about some real markup
-                Arguments.of("<img alt=\"Chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0\" src=\"/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0\"", Arrays.asList("/chart?ck=xradar&amp;w=120&amp;h=120&amp;c=7fff00|7fff00&amp;m=4&amp;g=0.2&amp;l=A,C,S,T&amp;v=3.0,3.0,2.0,2.0")),
-                // had a problem with multiple img-source tags
-                Arguments.of("<img src=\"file1\"/><img src=\"file2\"/>", Arrays.asList("file1", "file2")),
-                Arguments.of("<img src=\"file1\"/><img src=\"file2\"/><img src=\"file3\"/><img src=\"file4\"/><img src=\"file5\"/>", Arrays.asList("file1", "file2", "file3", "file4", "file5")),
-                // try with invalid HTML that is seen sometimes, i.e. without closing "/" or "</img>"
-                Arguments.of("<img src=\"file1\"><img src=\"file2\">", Arrays.asList("file1", "file2")),
-                // should not match some other tag
-                Arguments.of("<nomatch src=\"s\" />", Arrays.asList()),
-                Arguments.of("<imgx src=\"file1\">", Arrays.asList()),
-                Arguments.of("<img xsrc=\"file1\">", Arrays.asList())
-        );
-        return argumentsStream;
+        matcher = pattern.matcher("<imgx src=\"file1\">");
+        assertFalse(matcher.find());
+
+        // should not match any other attribute
+        matcher = pattern.matcher("<img xsrc=\"file1\">");
+        assertFalse(matcher.find());
     }
 
     @ParameterizedTest
@@ -201,9 +248,10 @@ private static Stream<Arguments> testScriptRegex() {
                 // try with invalid scripts
                 Arguments.of("<script src=\"s\" />", Arrays.asList("s")),
                 Arguments.of("<script src=\"s\">", Arrays.asList("s")),
-                // should not match some other tag
+                // should not match any other tags
                 Arguments.of("<nomatch src=\"s\" />", Arrays.asList()),
                 Arguments.of("<scriptx src=\"s\" />", Arrays.asList()),
+                // should not match any other attribute
                 Arguments.of("<script xsrc=\"s\" />", Arrays.asList())
         );
         return argumentsStream;

From 59a9c1608a5c388528e781413b052c7ddc19cefb Mon Sep 17 00:00:00 2001
From: "sean.fabri" <sean.fabri@crunch.co.uk>
Date: Tue, 23 Apr 2024 10:38:30 +0100
Subject: [PATCH 9/9] allow benchmarking regex variants

---
 .../jakarta/ImageHtmlEmailBenchmark.java      | 102 ++++++++++++------
 1 file changed, 71 insertions(+), 31 deletions(-)

diff --git a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
index 7b22ba33e..16957f6ad 100644
--- a/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
+++ b/commons-email2-jakarta/src/test/java/org/apache/commons/mail2/jakarta/ImageHtmlEmailBenchmark.java
@@ -17,9 +17,6 @@
 package org.apache.commons.mail2.jakarta;
 
 import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 
 import java.util.regex.Matcher;
@@ -27,40 +24,83 @@
 
 public class ImageHtmlEmailBenchmark  {
 
+    private final static int MATCHES_TO_FIND = 50;
+
+    private final static String TEST_HTML = testHtml();
+
+    public final static TestHarness testHarnessCurrentRegex = new TestHarness(
+            ImageHtmlEmail.REGEX_IMG_SRC,
+            ImageHtmlEmail.REGEX_SCRIPT_SRC
+    );
+
+    /**
+     * The original regex pre EMAIL-198
+     */
+    public final static TestHarness testHarnessOriginalRegex = new TestHarness(
+            "(<[Ii][Mm][Gg]\\s*[^>]*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])",
+            "(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s*.*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])"
+    );
+
+    /**
+     * Test an alternative regex with a non-greedy url: note the {@code ([^"']+?)} capture.
+     * This should be slower than the current regex test case.
+     */
+    public final static TestHarness testHarnessCurrentRegexNonGreedyUrl = new TestHarness(
+            "(<[Ii][Mm][Gg](?=\\s)[^>]*?\\s[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])",
+            "(<[Ss][Cc][Rr][Ii][Pp][Tt](?=\\s)[^>]*?\\s[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])"
+    );
+
+    @Benchmark
+    public void testCaseCurrentRegex(Blackhole blackhole) {
+        testHarnessCurrentRegex.runTest(blackhole);
+    }
+
+    @Benchmark
+    public void testCaseOriginalRegex(Blackhole blackhole) {
+        testHarnessOriginalRegex.runTest(blackhole);
+    }
+
     @Benchmark
-    public void testRegularExpressions(BenchmarkContext context, Blackhole blackhole) {
-        for (int i = 0; i < context.matchesToFind; i++) {
-            blackhole.consume(context.matcherImg.find());
-            blackhole.consume(context.matcherScript.find());
+    public void testCaseCurrentRegexNonGreedyUrl(Blackhole blackhole) {
+        testHarnessCurrentRegexNonGreedyUrl.runTest(blackhole);
+    }
+
+    public static class TestHarness {
+        private Matcher matcherImg;
+        private Matcher matcherScript;
+
+        public TestHarness(String patternImg, String patternScript){
+            matcherImg = prepareRegex(patternImg);
+            matcherScript = prepareRegex(patternScript);
+        }
+
+        public void runTest(Blackhole blackhole) {
+            for (int i = 0; i < MATCHES_TO_FIND; i++) {
+                blackhole.consume(matcherImg.find());
+                blackhole.consume(matcherScript.find());
+            }
+            matcherImg.reset();
+            matcherScript.reset();
+        }
+
+        public Matcher prepareRegex(String pattern) {
+            return Pattern.compile(pattern).matcher(TEST_HTML);
         }
-        context.matcherImg.reset();
-        context.matcherScript.reset();
     }
 
-    @State(Scope.Thread)
-    public static class BenchmarkContext {
-        Matcher matcherImg;
-        Matcher matcherScript;
-        int matchesToFind = 50;
-
-        @Setup
-        public void prepare() {
-            String longUrl = new String(new char[200]).replace("\0", "a");
-            String longSpace = new String(new char[100]).replace("\0", " ");
-            StringBuilder html = new StringBuilder();
-            html.append("<html><body><pre>");
+    private static String testHtml() {
+        String longUrl = new String(new char[200]).replace("\0", "a");
+        String longSpace = new String(new char[100]).replace("\0", " ");
+        StringBuilder html = new StringBuilder();
+        html.append("<html><body><pre>");
+        html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
+        for (int i = 0; i < MATCHES_TO_FIND; i++) {
+            html.append("<img" + longSpace +  "xxx=\"no-src-attribute\">");
+            html.append("<script    some=\"true\" other=\"1\" attributes=\"yes\"  src = \"" + longUrl + "\">");
             html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
-            for (int i = 0; i < matchesToFind; i++) {
-                html.append("<img" + longSpace +  "xxx=\"no-src-attribute\">");
-                html.append("<script    some=\"true\" other=\"1\" attributes=\"yes\"  src = \"" + longUrl + "\">");
-                html.append("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
-            }
-            html.append("</pre></body></html>");
-            Pattern patternImg = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);
-            matcherImg = patternImg.matcher(html);
-            Pattern patternScript = Pattern.compile(ImageHtmlEmail.REGEX_SCRIPT_SRC);
-            matcherScript = patternScript.matcher(html);
         }
+        html.append("</pre></body></html>");
+        return html.toString();
     }
 
     public static void main(String[] args) throws Exception {
