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 d01113d2a686db5022affdc7ad134713f636f4e1 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Oct 23 16:03:59 2020 +0700 JAMES-3436 Email/set create - delegation testing --- .../rfc8621/contract/EmailSetMethodContract.scala | 96 ++++++++++++++++++++++ .../apache/james/jmap/method/EmailSetMethod.scala | 1 + 2 files changed, 97 insertions(+) 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/EmailSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala index d8a3e14..1730fd0 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala @@ -233,6 +233,102 @@ trait EmailSetMethodContract { } @Test + def createShouldFailIfForbidden(server: GuiceJamesServer): Unit = { + val andrePath = MailboxPath.inbox(ANDRE) + val mailboxId = server.getProbe(classOf[MailboxProbeImpl]).createMailbox(andrePath) + + val request = + s"""{ + | "using": ["urn:ietf:params:jmap:core", "urn:ietf:params:jmap:mail"], + | "methodCalls": [ + | ["Email/set", { + | "accountId": "$ACCOUNT_ID", + | "create": { + | "aaaaaa":{ + | "mailboxIds": { + | "${mailboxId.serialize}": true + | }, + | "subject": "Boredome comes from a boring mind!" + | } + | } + | }, "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) + .inPath("methodResponses[0][1].notCreated.aaaaaa") + .isEqualTo( + s"""{ + | "description": "Mailbox ${mailboxId.serialize} can not be found", + | "type": "notFound" + |}""".stripMargin) + } + + @Test + def createShouldSucceedIfDelegated(server: GuiceJamesServer): Unit = { + val andrePath = MailboxPath.inbox(ANDRE) + val mailboxId = server.getProbe(classOf[MailboxProbeImpl]).createMailbox(andrePath) + + server.getProbe(classOf[ACLProbeImpl]) + .replaceRights(andrePath, BOB.asString, new MailboxACL.Rfc4314Rights(Right.Insert, Right.Lookup, Right.Read)) + + val request = + s"""{ + | "using": ["urn:ietf:params:jmap:core", "urn:ietf:params:jmap:mail"], + | "methodCalls": [ + | ["Email/set", { + | "accountId": "$ACCOUNT_ID", + | "create": { + | "aaaaaa":{ + | "mailboxIds": { + | "${mailboxId.serialize}": true + | } + | } + | } + | }, "c1"], ["Email/get", + | { + | "accountId": "$ACCOUNT_ID", + | "ids": ["#aaaaaa"], + | "properties": ["mailboxIds"] + | }, + | "c2"]] + |}""".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) + .whenIgnoringPaths("methodResponses[1][1].list[0].id") + .inPath(s"methodResponses[1][1].list") + .isEqualTo( + s"""[{ + | "mailboxIds": { + | "${mailboxId.serialize}": true + | } + |}]""".stripMargin) + } + + @Test def shouldNotResetKeywordWhenInvalidKeyword(server: GuiceJamesServer): Unit = { val message: Message = Fixture.createTestMessage diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala index 58f523d..7bb499b 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala @@ -118,6 +118,7 @@ class EmailSetMethod @Inject()(serializer: EmailSetSerializer, case class CreationSuccess(clientId: EmailCreationId, response: EmailCreationResponse) extends CreationResult case class CreationFailure(clientId: EmailCreationId, e: Throwable) extends CreationResult { def asMessageSetError: SetError = e match { + case e: MailboxNotFoundException => SetError.notFound(SetErrorDescription("Mailbox " + e.getMessage)) case _ => SetError.serverFail(SetErrorDescription(e.getMessage)) } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
