This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch 3.9.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/3.9.x by this push:
new de6b05c01f [FIX] JMAP Filtering: AddressHeader::parseFullAddress
should leniently parse malformed address header (#2856)
de6b05c01f is described below
commit de6b05c01feff14be20d6d33249161d7ce68c34a
Author: Trần Hồng Quân <[email protected]>
AuthorDate: Mon Nov 17 09:12:50 2025 +0700
[FIX] JMAP Filtering: AddressHeader::parseFullAddress should leniently
parse malformed address header (#2856)
* [FIX] AddressHeader::parseFullAddress should leniently parse malformed
address header
"message":"error while parsing full address kael >> Kaël
<[email protected]>","context":"default","exception":"jakarta.mail.internet.AddressException:
Missing '<'
at
jakarta.mail.internet.InternetAddress.parse(InternetAddress.java:939)
relax test suite
---
.../james/jmap/mailet/filter/ContentMatcher.java | 40 +++++++++++--
.../jmap/mailet/filter/AddressHeaderTest.java | 70 ++++++++++++++++++++++
.../jmap/mailet/filter/JMAPFilteringTest.java | 5 --
3 files changed, 106 insertions(+), 9 deletions(-)
diff --git
a/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/mailet/filter/ContentMatcher.java
b/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/mailet/filter/ContentMatcher.java
index f0b55e3569..d5863641b1 100644
---
a/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/mailet/filter/ContentMatcher.java
+++
b/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/mailet/filter/ContentMatcher.java
@@ -19,6 +19,7 @@
package org.apache.james.jmap.mailet.filter;
+import java.nio.charset.StandardCharsets;
import java.time.Clock;
import java.time.Duration;
import java.time.Instant;
@@ -33,13 +34,18 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.james.jmap.api.filtering.Rule;
import org.apache.james.jmap.mail.Keyword;
import org.apache.james.mime4j.codec.DecodeMonitor;
+import org.apache.james.mime4j.dom.address.AddressList;
+import org.apache.james.mime4j.dom.address.Mailbox;
import org.apache.james.mime4j.field.DateTimeFieldLenientImpl;
+import org.apache.james.mime4j.field.address.LenientAddressParser;
import org.apache.james.mime4j.stream.RawField;
import org.apache.james.util.DurationParser;
import org.apache.james.util.OptionalUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.github.fge.lambdas.Throwing;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
@@ -63,15 +69,41 @@ public interface ContentMatcher {
.or(() -> Optional.of(fullAddress));
}
- private Optional<InternetAddress> parseFullAddress() {
+ @VisibleForTesting
+ public Optional<InternetAddress> parseFullAddress() {
try {
return Optional.of(new InternetAddress(fullAddress));
- } catch (AddressException e) {
- LOGGER.info("error while parsing full address {}",
fullAddress, e);
- return Optional.empty();
+ } catch (AddressException ignored) {
+ try {
+ return parseFullAddressUsingMime4J();
+ } catch (Exception exception) {
+ LOGGER.info("error while parsing full address {}",
fullAddress, exception);
+ return Optional.empty();
+ }
}
}
+ private Optional<InternetAddress> parseFullAddressUsingMime4J() {
+ AddressList addresses =
LenientAddressParser.DEFAULT.parseAddressList(fullAddress);
+
+ return addresses.flatten()
+ .stream()
+ .findFirst()
+ .map(Throwing.function(mailbox -> {
+ if (looksLikeBareName(fullAddress, mailbox)) {
+ return new InternetAddress(null, fullAddress,
StandardCharsets.UTF_8.name());
+ }
+
+ String addr = mailbox.getAddress();
+ String name = mailbox.getName();
+ return new InternetAddress(addr, name,
StandardCharsets.UTF_8.name());
+ }));
+ }
+
+ private boolean looksLikeBareName(String value, Mailbox mailbox) {
+ return !value.contains("@") && mailbox.getDomain() == null;
+ }
+
boolean matchesIgnoreCase(AddressHeader other) {
boolean sameAddress = OptionalUtils.matches(address,
other.address, String::equalsIgnoreCase);
boolean samePersonal = OptionalUtils.matches(personal,
other.personal, String::equalsIgnoreCase);
diff --git
a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/AddressHeaderTest.java
b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/AddressHeaderTest.java
new file mode 100644
index 0000000000..54d701593d
--- /dev/null
+++
b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/AddressHeaderTest.java
@@ -0,0 +1,70 @@
+/****************************************************************
+ * 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.james.jmap.mailet.filter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Optional;
+
+import jakarta.mail.internet.InternetAddress;
+
+import org.junit.jupiter.api.Test;
+
+public class AddressHeaderTest {
+ @Test
+ void shouldParseAddressWithPersonalName() {
+ Optional<InternetAddress> parsed =
ContentMatcher.asAddressHeader("Kaël <[email protected]>")
+ .parseFullAddress();
+
+ assertThat(parsed).isPresent();
+ assertThat(parsed.get().getAddress()).isEqualTo("[email protected]");
+ assertThat(parsed.get().getPersonal()).isEqualTo("Kaël");
+ }
+
+ @Test
+ void shouldParseBareAddressWithoutPersonalName() {
+ Optional<InternetAddress> parsed =
ContentMatcher.asAddressHeader("[email protected]").parseFullAddress();
+
+ assertThat(parsed).isPresent();
+ assertThat(parsed.get().getAddress()).isEqualTo("[email protected]");
+ assertThat(parsed.get().getPersonal()).isNull();
+ }
+
+ @Test
+ void shouldLenientlyParseMalformedAddressHeader() {
+ Optional<InternetAddress> internetAddress =
ContentMatcher.asAddressHeader("kael >> Kaël <[email protected]>")
+ .parseFullAddress();
+
+ assertThat(internetAddress).isPresent();
+
assertThat(internetAddress.get().getAddress()).isEqualTo("[email protected]");
+ assertThat(internetAddress.get().getPersonal()).isEqualTo("kael >>
Kaël");
+ }
+
+ @Test
+ void shouldLenientlyParseMalformedAddressHeaderWithBareName() {
+ Optional<InternetAddress> internetAddress =
ContentMatcher.asAddressHeader("Frédéric MARTIN")
+ .parseFullAddress();
+
+ assertThat(internetAddress).isPresent();
+ assertThat(internetAddress.get().getPersonal()).isEqualTo("Frédéric
MARTIN");
+ assertThat(internetAddress.get().getAddress()).isNull();
+ }
+
+}
diff --git
a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java
b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java
index 937c6fe14d..76989f1541 100644
---
a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java
+++
b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java
@@ -422,11 +422,6 @@ class JMAPFilteringTest {
.header(fieldAndHeader.headerName, USER_1_FULL_ADDRESS)
.valueToMatch("ser1 <"),
- argumentBuilder(fieldAndHeader.field)
- .description("Address exact match in a full " +
fieldAndHeader.headerName + " header with multiple addresses")
- .header(fieldAndHeader.headerName, USER_1_FULL_ADDRESS
+ ", Invalid <invalid@ white.space.in.domain.tld>")
- .valueToMatch("invalid@ white.space.in.domain.tld"),
-
argumentBuilder(fieldAndHeader.field)
.description("Address partial match in a full " +
fieldAndHeader.headerName + " header")
.header(fieldAndHeader.headerName, USER_1_FULL_ADDRESS)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
