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 c5b28b3fe4d0ebb6e770105a6df5111c1f35aefb Author: Benoit Tellier <[email protected]> AuthorDate: Tue Aug 27 14:08:41 2019 +0700 JAMES-2352 Add details for webAdmin long domain rejection --- .../java/org/apache/james/webadmin/routes/DomainsRoutes.java | 3 ++- .../org/apache/james/webadmin/routes/DomainsRoutesTest.java | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainsRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainsRoutes.java index 77ed8a6..c8c0a0ed 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainsRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainsRoutes.java @@ -271,7 +271,8 @@ public class DomainsRoutes implements Routes { } private void addDomain(Domain domain) throws DomainListException { - Preconditions.checkArgument(domain.name().length() < MAXIMUM_DOMAIN_SIZE); + Preconditions.checkArgument(domain.name().length() < MAXIMUM_DOMAIN_SIZE, + "Domain name length should not exceed " + (MAXIMUM_DOMAIN_SIZE - 1) + " characters"); domainList.addDomain(domain); } diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java index 640e473..063bc79 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java @@ -180,10 +180,11 @@ class DomainsRoutesTest { @Test void putShouldReturnUserErrorWhenNameIsTooLong() { + String longDomainName = DOMAIN + "0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789." + + "0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789." + + "0123456789.0123456789.0123456789."; Map<String, Object> errors = when() - .put(DOMAIN + "0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789." + - "0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789.0123456789." + - "0123456789.0123456789.0123456789.") + .put(longDomainName) .then() .statusCode(HttpStatus.BAD_REQUEST_400) .contentType(ContentType.JSON) @@ -194,7 +195,9 @@ class DomainsRoutesTest { assertThat(errors) .containsEntry("statusCode", HttpStatus.BAD_REQUEST_400) - .containsEntry("type", "InvalidArgument"); + .containsEntry("type", "InvalidArgument") + .containsEntry("message", "Invalid request for domain creation " + longDomainName) + .containsEntry("details", "Domain name length should not exceed 255 characters"); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
