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
The following commit(s) were added to refs/heads/master by this push:
new 4e830a81a6 [FIX] Domain validation should be more informative - Fixup
message (#2522)
4e830a81a6 is described below
commit 4e830a81a624345788d48c0065f0799271985833
Author: vttran <vtt...@linagora.com>
AuthorDate: Tue Nov 26 17:08:24 2024 +0700
[FIX] Domain validation should be more informative - Fixup message (#2522)
ref: 980d3144e9a0be6258d9570c04b9351231536aaf
---
core/src/main/java/org/apache/james/core/Domain.java | 2 +-
.../james/jmap/rfc8621/contract/MailboxSetMethodContract.scala | 2 +-
.../apache/james/webadmin/routes/DLPConfigurationRoutesTest.java | 6 +++---
.../java/org/apache/james/webadmin/routes/MappingRoutesTest.java | 2 +-
.../jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java | 2 +-
.../org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java | 2 +-
.../james/webadmin/service/MailboxesExportRequestToTaskTest.java | 2 +-
.../james/webadmin/service/SubscribeAllRequestToTaskTest.java | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/src/main/java/org/apache/james/core/Domain.java
b/core/src/main/java/org/apache/james/core/Domain.java
index 1718fdd485..50ad81c412 100644
--- a/core/src/main/java/org/apache/james/core/Domain.java
+++ b/core/src/main/java/org/apache/james/core/Domain.java
@@ -56,7 +56,7 @@ public class Domain implements Serializable {
String domainWithoutBrackets = removeBrackets(domain);
Preconditions.checkArgument(PART_CHAR_MATCHER.matchesAllOf(domainWithoutBrackets),
- "Domain parts ASCII chars must be a-z A-Z 0-9 - or _ in {}",
domain);
+ "Domain parts ASCII chars must be a-z A-Z 0-9 - or _ in %s",
domain);
int pos = 0;
int nextDot = domainWithoutBrackets.indexOf('.');
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 21b0e26da0..f6d96190c9 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
@@ -5924,7 +5924,7 @@ trait MailboxSetMethodContract {
| "notUpdated": {
| "${mailboxId.serialize}": {
| "type": "invalidArguments",
- | "description": "Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in {} [inva...@domain.tld]"
+ | "description": "Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in inva...@domain.tld"
| }
| }
| }, "c1"]
diff --git
a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index be6b0bfd2f..9100a410eb 100644
---
a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -329,7 +329,7 @@ class DLPConfigurationRoutesTest {
.body("statusCode", is(HttpStatus.BAD_REQUEST_400))
.body("type", is("InvalidArgument"))
.body("message", is("Invalid arguments supplied in the user
request"))
- .body("details", is("Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in {} [d...@strange.com]"));
+ .body("details", is("Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in d...@strange.com"));
}
@Test
@@ -646,7 +646,7 @@ class DLPConfigurationRoutesTest {
.body("statusCode", is(HttpStatus.BAD_REQUEST_400))
.body("type", is("InvalidArgument"))
.body("message", is("Invalid arguments supplied in the user
request"))
- .body("details", is("Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in {} [d...@strange.com]"));
+ .body("details", is("Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in d...@strange.com"));
}
}
@@ -859,7 +859,7 @@ class DLPConfigurationRoutesTest {
.body("statusCode", is(HttpStatus.BAD_REQUEST_400))
.body("type", is("InvalidArgument"))
.body("message", is("Invalid arguments supplied in the user
request"))
- .body("details", is("Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in {} [d...@strange.com]"));
+ .body("details", is("Domain parts ASCII chars must be a-z A-Z
0-9 - or _ in d...@strange.com"));
}
}
diff --git
a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/MappingRoutesTest.java
b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/MappingRoutesTest.java
index 23553143ee..9e01a1b773 100644
---
a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/MappingRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/MappingRoutesTest.java
@@ -640,7 +640,7 @@ class MappingRoutesTest {
.body("statusCode", is(400))
.body("type", is("InvalidArgument"))
.body("message", is("Invalid arguments supplied in the user request"))
- .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9 - or
_ in {} [dom...@domain.tld]"));
+ .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9 - or
_ in dom...@domain.tld"));
}
@Test
diff --git
a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java
b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java
index bf859d3a88..8269ea0bcd 100644
---
a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java
+++
b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java
@@ -242,7 +242,7 @@ class RecomputeUserFastViewProjectionItemsRequestToTaskTest
{
.body("statusCode", is(400))
.body("type",
is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType()))
.body("message", is("Invalid arguments supplied in the user
request"))
- .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9
- or _ in {} [bad@bad]"));
+ .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9
- or _ in bad@bad"));
}
@Test
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index ac5081f4d5..7c82bdcb0c 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -1577,7 +1577,7 @@ class UserMailboxesRoutesTest {
.body("statusCode", Matchers.is(400))
.body("type", Matchers.is("InvalidArgument"))
.body("message", Matchers.is("Invalid arguments supplied
in the user request"))
- .body("details", Matchers.is("Domain parts ASCII chars
must be a-z A-Z 0-9 - or _ in {} [bad@bad]"));
+ .body("details", Matchers.is("Domain parts ASCII chars
must be a-z A-Z 0-9 - or _ in bad@bad"));
}
}
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
index 5222eec1ee..df577945ec 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
@@ -178,7 +178,7 @@ class MailboxesExportRequestToTaskTest {
.body("statusCode", is(400))
.body("type",
is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType()))
.body("message", is("Invalid arguments supplied in the user
request"))
- .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9
- or _ in {} [bad@bad]"));
+ .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9
- or _ in bad@bad"));
}
@Test
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/SubscribeAllRequestToTaskTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/SubscribeAllRequestToTaskTest.java
index 96b7947688..f785099c49 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/SubscribeAllRequestToTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/SubscribeAllRequestToTaskTest.java
@@ -176,7 +176,7 @@ class SubscribeAllRequestToTaskTest {
.body("statusCode", is(400))
.body("type",
is(ErrorResponder.ErrorType.INVALID_ARGUMENT.getType()))
.body("message", is("Invalid arguments supplied in the user
request"))
- .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9
- or _ in {} [bad@bad]"));
+ .body("details", is("Domain parts ASCII chars must be a-z A-Z 0-9
- or _ in bad@bad"));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
