This is an automated email from the ASF dual-hosted git repository.

chibenwa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-jsieve.git

commit abc1b8b5acd3519705178738f08e926ad1ad008e
Author: Benoit TELLIER <[email protected]>
AuthorDate: Wed Nov 18 22:29:42 2026 +0100

    [FIX] Header: decode a header value once per evaluation
    
    The header test RFC 2047-decoded each value it read, at each
    execution: a script testing Subject in N rules decoded the same
    Subject N times per mail. This was 21-26% of the CPU and 37-42% of the
    bytes allocated by a typical filter script.
    
    SieveContext#decodeHeaderValue memoises the decoding for the context,
    which SieveFactory creates for each evaluation: it holds at most the
    header values of the mail evaluated. The decoded value only depends on
    the raw value, so the result does not change.
---
 .../main/java/org/apache/jsieve/SieveContext.java  | 28 ++++++++++++++++++++++
 .../main/java/org/apache/jsieve/tests/Header.java  |  3 +--
 .../test/java/org/apache/jsieve/HeaderTest.java    | 23 ++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/jsieve/SieveContext.java 
b/core/src/main/java/org/apache/jsieve/SieveContext.java
index 3d4ffe1..f0109f8 100644
--- a/core/src/main/java/org/apache/jsieve/SieveContext.java
+++ b/core/src/main/java/org/apache/jsieve/SieveContext.java
@@ -19,6 +19,10 @@
 
 package org.apache.jsieve;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.james.mime4j.util.MimeUtil;
 import org.apache.jsieve.exception.SieveException;
 
 /**
@@ -88,4 +92,28 @@ public abstract class SieveContext {
      */
     public void chargeComparison(long cost) throws SieveException {
     }
+
+    /**
+     * Raw header values already decoded, with their decoded value. A context
+     * lives for one evaluation: this holds at most the header values of the
+     * mail evaluated.
+     */
+    private Map<String, String> decodedHeaderValues;
+
+    /**
+     * Decodes a raw header value, unfolding it and decoding its RFC 2047
+     * encoded words. A value is decoded once per context, that is per
+     * evaluation, whatever the number of tests reading it. The decoded values
+     * are kept as long as the context: a context must not be reused across
+     * evaluations, nor shared between threads.
+     *
+     * @param rawValue not null
+     * @return the decoded value, not null
+     */
+    public String decodeHeaderValue(String rawValue) {
+        if (decodedHeaderValues == null) {
+            decodedHeaderValues = new HashMap<>();
+        }
+        return decodedHeaderValues.computeIfAbsent(rawValue, 
MimeUtil::unscrambleHeaderValue);
+    }
 }
diff --git a/core/src/main/java/org/apache/jsieve/tests/Header.java 
b/core/src/main/java/org/apache/jsieve/tests/Header.java
index 7e61d3d..7097184 100644
--- a/core/src/main/java/org/apache/jsieve/tests/Header.java
+++ b/core/src/main/java/org/apache/jsieve/tests/Header.java
@@ -31,7 +31,6 @@ import java.util.ListIterator;
 
 import org.apache.james.mime4j.codec.DecodeMonitor;
 import org.apache.james.mime4j.codec.DecoderUtil;
-import org.apache.james.mime4j.util.MimeUtil;
 import org.apache.jsieve.Argument;
 import org.apache.jsieve.Arguments;
 import org.apache.jsieve.SieveContext;
@@ -224,7 +223,7 @@ public class Header extends AbstractTest {
         boolean isMatched = false;
         Iterator<String> headerValuesIter = headerValues.iterator();
         while (!isMatched && headerValuesIter.hasNext()) {
-            String headerValue = 
MimeUtil.unscrambleHeaderValue(headerValuesIter.next());
+            String headerValue = 
context.decodeHeaderValue(headerValuesIter.next());
             isMatched = match(comparator, matchType, headerValue, keys, 
context);
         }
         return isMatched;
diff --git a/core/src/test/java/org/apache/jsieve/HeaderTest.java 
b/core/src/test/java/org/apache/jsieve/HeaderTest.java
index 7ea8549..713174c 100644
--- a/core/src/test/java/org/apache/jsieve/HeaderTest.java
+++ b/core/src/test/java/org/apache/jsieve/HeaderTest.java
@@ -34,6 +34,29 @@ import javax.mail.MessagingException;
  */
 public class HeaderTest {
 
+    @Test
+    public void anEncodedHeaderShouldBeDecodedInEveryTestReadingIt() throws 
Exception {
+        SieveMailAdapter mail = (SieveMailAdapter) JUnitUtils.createMail();
+        mail.getMessage().addHeader("Subject", 
"=?UTF-8?Q?Caf=C3=A9_cr=C3=A8me?=");
+        String script = "if header :contains \"Subject\" \"absent\" { stop; }"
+            + " if header :is \"Subject\" \"Caf\u00e9 cr\u00e8me\" { if header 
:matches \"Subject\" \"*cr\u00e8me\" { throwTestException; } }";
+
+        Assert.assertThrows(ThrowTestException.TestException.class, () -> 
JUnitUtils.interpret(mail, script));
+    }
+
+    @Test
+    public void aHeaderValueShouldBeDecodedOncePerContext() throws Exception {
+        ConfigurationManager configurationManager = new ConfigurationManager();
+        SieveContext context = new 
BaseSieveContext(configurationManager.getCommandManager(),
+            configurationManager.getComparatorManager(), 
configurationManager.getTestManager());
+
+        String decoded = context.decodeHeaderValue("=?UTF-8?Q?Caf=C3=A9?=\r\n 
=?UTF-8?Q?_cr=C3=A8me?=");
+
+        Assert.assertEquals("Caf\u00e9 cr\u00e8me", decoded);
+        Assert.assertSame(decoded, 
context.decodeHeaderValue("=?UTF-8?Q?Caf=C3=A9?=\r\n =?UTF-8?Q?_cr=C3=A8me?="));
+        Assert.assertEquals("plain", context.decodeHeaderValue("plain"));
+    }
+
     /**
      * Test for Test 'header'
      */


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to