This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a41445c0282e24c8aaa219b52d9eeff97099b0c7
Author: LanKhuat <dlkh...@linagora.com>
AuthorDate: Wed Aug 19 10:56:20 2020 +0700
JAMES-3359 Mailbox/set delegation & partial rights updates
---
.../contract/MailboxSetMethodContract.scala | 128 ++++++++++++++++++++-
1 file changed, 127 insertions(+), 1 deletion(-)
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/MailboxSetMethodContract.scala
b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala
index 90828ee..b624f3b 100644
---
a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala
+++
b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala
@@ -5168,7 +5168,6 @@ trait MailboxSetMethodContract {
|}""".stripMargin)
}
- // TODO testing delegation & partial updates
// TODO write test for rights store manager applyCommandById in
MailboxManagerTest
@Test
@@ -5355,4 +5354,131 @@ trait MailboxSetMethodContract {
| ]
|}""".stripMargin)
}
+
+ @Test
+ def partialUpdateShouldFailOnOthersMailbox(server: GuiceJamesServer): Unit =
{
+ val path = MailboxPath.forUser(ANDRE, "mailbox")
+ val mailboxId =
server.getProbe(classOf[MailboxProbeImpl]).createMailbox(path)
+
+ val request =
+ s"""
+ |{
+ | "using": [ "urn:ietf:params:jmap:core",
"urn:ietf:params:jmap:mail", "urn:apache:james:params:jmap:mail:shares" ],
+ | "methodCalls": [
+ | [
+ | "Mailbox/set",
+ | {
+ | "accountId":
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "update": {
+ | "${mailboxId.serialize()}": {
+ | "/sharedWith/${BOB.asString()}": ["r"],
+ | "/sharedWith/${DAVID.asString()}": ["r"]
+ | }
+ | }
+ | },
+ | "c1"
+ | ]
+ | ]
+ |}
+ |""".stripMargin
+
+ val response = `given`
+ .header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
+ .body(request)
+ .when
+ .post
+ .`then`
+ .log().ifValidationFails()
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
+
+ assertThatJson(response).isEqualTo(
+ s"""{
+ | "sessionState": "75128aab4b1b",
+ | "methodResponses": [
+ | ["Mailbox/set", {
+ | "accountId":
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "000001",
+ | "notUpdated": {
+ | "${mailboxId.serialize()}": {
+ | "type": "notFound",
+ | "description": "${mailboxId.serialize()} can not be found"
+ | }
+ | }
+ | }, "c1"]
+ | ]
+ |}""".stripMargin)
+
+ assertThat(server.getProbe(classOf[ACLProbeImpl]).retrieveRights(path)
+ .getEntries)
+ .doesNotContainKeys(EntryKey.createUserEntryKey(DAVID))
+ }
+
+ @Test
+ def partialUpdateShouldFailWhenDelegatedMailbox(server: GuiceJamesServer):
Unit = {
+ val path = MailboxPath.forUser(ANDRE, "mailbox")
+ val mailboxId =
server.getProbe(classOf[MailboxProbeImpl]).createMailbox(path)
+
+ server.getProbe(classOf[ACLProbeImpl])
+ .replaceRights(path, BOB.asString(), new
MailboxACL.Rfc4314Rights(Right.Lookup))
+
+ val request =
+ s"""
+ |{
+ | "using": [ "urn:ietf:params:jmap:core",
"urn:ietf:params:jmap:mail", "urn:apache:james:params:jmap:mail:shares" ],
+ | "methodCalls": [
+ | [
+ | "Mailbox/set",
+ | {
+ | "accountId":
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "update": {
+ | "${mailboxId.serialize()}": {
+ | "/sharedWith/${BOB.asString()}": ["r"],
+ | "/sharedWith/${DAVID.asString()}": ["r"]
+ | }
+ | }
+ | },
+ | "c1"
+ | ]
+ | ]
+ |}
+ |""".stripMargin
+
+ val response = `given`
+ .header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
+ .body(request)
+ .when
+ .post
+ .`then`
+ .log().ifValidationFails()
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
+
+ assertThatJson(response).isEqualTo(
+ s"""{
+ | "sessionState": "75128aab4b1b",
+ | "methodResponses": [
+ | ["Mailbox/set", {
+ | "accountId":
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "000001",
+ | "notUpdated": {
+ | "${mailboxId.serialize()}": {
+ | "type": "invalidArguments",
+ | "description": "Invalid change to a delegated mailbox"
+ | }
+ | }
+ | }, "c1"]
+ | ]
+ |}""".stripMargin)
+
+ assertThat(server.getProbe(classOf[ACLProbeImpl]).retrieveRights(path)
+ .getEntries)
+ .doesNotContainKeys(EntryKey.createUserEntryKey(DAVID))
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
