You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/11/13 02:18:26 UTC
[james-project] branch master updated: JAMES-3443 Fetch text body
for parts nested inside multipart/alternative
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 23fb00d JAMES-3443 Fetch text body for parts nested inside multipart/alternative
23fb00d is described below
commit 23fb00dd2429c6949053291839f502abd7a6006f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Nov 3 18:03:14 2020 +0700
JAMES-3443 Fetch text body for parts nested inside multipart/alternative
---
.../eml/related_in_alternative_multipart.eml | 55 +++++++++++++++++++
.../rfc8621/contract/EmailGetMethodContract.scala | 63 ++++++++++++++++++++++
.../org/apache/james/jmap/mail/EmailBodyPart.scala | 20 ++++---
3 files changed, 131 insertions(+), 7 deletions(-)
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/resources/eml/related_in_alternative_multipart.eml b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/resources/eml/related_in_alternative_multipart.eml
new file mode 100644
index 0000000..79b1222
--- /dev/null
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/resources/eml/related_in_alternative_multipart.eml
@@ -0,0 +1,55 @@
+Return-Path: <fr...@linagora.com>
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="----sinikael-?=_1-16049770230370.5904051543231188"
+
+This is a multi-part message in MIME format.
+------sinikael-?=_1-16049770230370.5904051543231188
+Content-Type: multipart/alternative;
+ boundary="----sinikael-?=_2-16049770230370.5904051543231188"
+
+------sinikael-?=_2-16049770230370.5904051543231188
+Content-Type: multipart/related; type="text/html";
+ boundary="----sinikael-?=_3-16049770230370.5904051543231188"
+
+------sinikael-?=_3-16049770230370.5904051543231188
+Content-Type: text/html
+Content-Transfer-Encoding: base64
+
+PHRhYmxlPjwvdGFibGU+
+------sinikael-?=_3-16049770230370.5904051543231188--
+
+------sinikael-?=_2-16049770230370.5904051543231188
+Content-Type: text/calendar; charset=UTF-8; method=CANCEL
+Content-Transfer-Encoding: base64
+
+QkVHSU46VkNBTEVOREFSDQpWRVJTSU9OOjIuMA0KUFJPRElEOi0vL1NhYnJlLy9TYWJyZSBWT2Jq
+ZWN0IDQuMS4zLy9FTg0KQ0FMU0NBTEU6R1JFR09SSUFODQpNRVRIT0Q6Q0FOQ0VMDQpCRUdJTjpW
+VElNRVpPTkUNClRaSUQ6QXNpYS9KYWthcnRhDQpCRUdJTjpTVEFOREFSRA0KVFpPRkZTRVRGUk9N
+OiswNzAwDQpUWk9GRlNFVFRPOiswNzAwDQpUWk5BTUU6V0lCDQpEVFNUQVJUOjE5NzAwMTAxVDAw
+MDAwMA0KRU5EOlNUQU5EQVJEDQpFTkQ6VlRJTUVaT05FDQpCRUdJTjpWRVZFTlQNClVJRDpkYTdj
+MzljNS0xNzg3LTQ0MDktYjAwNS05MjBmZTBiMmMxYTINCkRUU1RBTVA6MjAyMDExMTBUMDI1NzAx
+Wg0KU0VRVUVOQ0U6MQ0KU1VNTUFSWTo8QVQ+IFZlcmlmeSBVc2VyIFNlbmQgRW1haWwgVG8gQXR0
+ZW5kZWVzIFR1ZSBOb3ZlbWJlciAxMCAwOTo1MjoxMiBVDQogVEMgMjAyMA0KRFRTVEFSVDoyMDIw
+MTIwNlQwMzAwMDBaDQpEVEVORDoyMDIwMTIwNlQwNDAwMDBaDQpPUkdBTklaRVI7Q049VXNlciBB
+Om1haWx0bzp1c2VyYUBxYS5vcGVuLXBhYXMub3JnDQpBVFRFTkRFRTtDTj06bWFpbHRvOnVzZXJk
+QHFhLm9wZW4tcGFhcy5vcmcNCkVORDpWRVZFTlQNCkVORDpWQ0FMRU5EQVINCg==
+------sinikael-?=_2-16049770230370.5904051543231188--
+
+------sinikael-?=_1-16049770230370.5904051543231188
+Content-Type: application/ics; name=meeting.ics
+Content-Disposition: attachment; filename=meeting.ics
+Content-Transfer-Encoding: base64
+
+QkVHSU46VkNBTEVOREFSDQpWRVJTSU9OOjIuMA0KUFJPRElEOi0vL1NhYnJlLy9TYWJyZSBWT2Jq
+ZWN0IDQuMS4zLy9FTg0KQ0FMU0NBTEU6R1JFR09SSUFODQpNRVRIT0Q6Q0FOQ0VMDQpCRUdJTjpW
+VElNRVpPTkUNClRaSUQ6QXNpYS9KYWthcnRhDQpCRUdJTjpTVEFOREFSRA0KVFpPRkZTRVRGUk9N
+OiswNzAwDQpUWk9GRlNFVFRPOiswNzAwDQpUWk5BTUU6V0lCDQpEVFNUQVJUOjE5NzAwMTAxVDAw
+MDAwMA0KRU5EOlNUQU5EQVJEDQpFTkQ6VlRJTUVaT05FDQpCRUdJTjpWRVZFTlQNClVJRDpkYTdj
+MzljNS0xNzg3LTQ0MDktYjAwNS05MjBmZTBiMmMxYTINCkRUU1RBTVA6MjAyMDExMTBUMDI1NzAx
+Wg0KU0VRVUVOQ0U6MQ0KU1VNTUFSWTo8QVQ+IFZlcmlmeSBVc2VyIFNlbmQgRW1haWwgVG8gQXR0
+ZW5kZWVzIFR1ZSBOb3ZlbWJlciAxMCAwOTo1MjoxMiBVDQogVEMgMjAyMA0KRFRTVEFSVDoyMDIw
+MTIwNlQwMzAwMDBaDQpEVEVORDoyMDIwMTIwNlQwNDAwMDBaDQpPUkdBTklaRVI7Q049VXNlciBB
+Om1haWx0bzp1c2VyYUBxYS5vcGVuLXBhYXMub3JnDQpBVFRFTkRFRTtDTj06bWFpbHRvOnVzZXJk
+QHFhLm9wZW4tcGFhcy5vcmcNCkVORDpWRVZFTlQNCkVORDpWQ0FMRU5EQVINCg==
+------sinikael-?=_1-16049770230370.5904051543231188--
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala
index 347c4ea..17b6fe2 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala
@@ -4549,6 +4549,69 @@ trait EmailGetMethodContract {
}
@Test
+ def htmlBodyValuesForRelatedMultipartInsideAlternative(server: GuiceJamesServer): Unit = {
+ val path = MailboxPath.inbox(BOB)
+ server.getProbe(classOf[MailboxProbeImpl]).createMailbox(path)
+ val messageId: MessageId = server.getProbe(classOf[MailboxProbeImpl])
+ .appendMessage(BOB.asString, path, AppendCommand.from(
+ ClassLoader.getSystemResourceAsStream("eml/related_in_alternative_multipart.eml")))
+ .getMessageId
+
+ val request =
+ s"""{
+ | "using": [
+ | "urn:ietf:params:jmap:core",
+ | "urn:ietf:params:jmap:mail"],
+ | "methodCalls": [[
+ | "Email/get",
+ | {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "ids": ["${messageId.serialize}"],
+ | "properties":["bodyValues"],
+ | "fetchHTMLBodyValues": true
+ | },
+ | "c1"]]
+ |}""".stripMargin
+ val response = `given`
+ .header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
+ .body(request)
+ .when
+ .post
+ .`then`
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
+
+ assertThatJson(response).isEqualTo(
+ s"""{
+ | "sessionState": "75128aab4b1b",
+ | "methodResponses": [[
+ | "Email/get",
+ | {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "state": "000001",
+ | "list": [
+ | {
+ | "id": "${messageId.serialize}",
+ | "bodyValues": {
+ | "4": {
+ | "value": "<table></table>",
+ | "isEncodingProblem": false,
+ | "isTruncated": false
+ | }
+ | }
+ | }
+ | ],
+ | "notFound": []
+ | },
+ | "c1"
+ | ]]
+ |}""".stripMargin)
+ }
+
+ @Test
def bodyValueShouldBeTruncatedIfNeeded(server: GuiceJamesServer): Unit = {
val path = MailboxPath.inbox(BOB)
server.getProbe(classOf[MailboxProbeImpl]).createMailbox(path)
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala
index 348fe37..631fcb5 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala
@@ -251,13 +251,14 @@ case class EmailBodyPart(partId: PartId,
private val shouldBeDisplayedAsAttachment: Boolean = !shouldBeDisplayedAsBody && subParts.isEmpty
private def textBodyOfMultipart: List[EmailBodyPart] = `type` match {
- case MULTIPART_ALTERNATIVE => textPlainSubparts
+ case MULTIPART_ALTERNATIVE => getBodyParts(subParts.getOrElse(Nil), TEXT_PLAIN)
case _ => subParts.getOrElse(Nil)
.flatMap(subPart => subPart.textBody)
}
private def htmlBodyOfMultipart: List[EmailBodyPart] = `type` match {
- case MULTIPART_ALTERNATIVE => textHtmlSubparts
+ case MULTIPART_ALTERNATIVE => getBodyParts(subParts.getOrElse(Nil), TEXT_HTML)
+ .flatMap(subPart => subPart.htmlBody)
case _ => subParts.getOrElse(Nil)
.flatMap(subPart => subPart.htmlBody)
}
@@ -265,9 +266,14 @@ case class EmailBodyPart(partId: PartId,
private def attachmentsOfMultipart: List[EmailBodyPart] = subParts.getOrElse(Nil)
.flatMap(_.attachments)
- private def textPlainSubparts: List[EmailBodyPart] = subParts.getOrElse(Nil)
- .filter(subPart => subPart.`type`.equals(TEXT_PLAIN))
-
- private def textHtmlSubparts: List[EmailBodyPart] = subParts.getOrElse(Nil)
- .filter(subPart => subPart.`type`.equals(TEXT_HTML))
+ private def getBodyParts(bodyParts: List[EmailBodyPart], `type`: Type): List[EmailBodyPart] =
+ if (bodyParts.isEmpty) {
+ Nil
+ } else {
+ bodyParts.filter(subPart => subPart.`type`.equals(`type`)) ++
+ getBodyParts(
+ bodyParts
+ .filter(subPart => !subPart.`type`.equals(`type`))
+ .flatMap(subPart => subPart.subParts.getOrElse(Nil)), `type`)
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org