Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

fix regexp for user and group name

Browse Source
This commit is contained in:
Mohamed Karray
2018-10-01 16:30:30 +02:00
parent c99c3782bd
commit d6fd11fe95
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/main/java/sonia/scm/api/v2/ValidationConstraints.java
View File

@@ -9,6 +9,6 @@ public final class ValidationConstraints {
* and it not contains whitespaces * and it not contains whitespaces
* and the characters: . - _ @ are allowed * and the characters: . - _ @ are allowed
*/ */
public static final String USER_GROUP_PATTERN = "^[^@\\s][A-z0-9\\.\\-_@]+$"; public static final String USER_GROUP_PATTERN = "^[^@\\s][A-Za-z0-9\\.\\-_@]+$";
} }

34
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
View File

@@ -238,7 +238,7 @@ public class GroupRootResourceTest {
assertEquals(400, response.getStatus()); assertEquals(400, response.getStatus());
// the whitespace at the begin opf the name is not allowed // the whitespace at the begin of the name is not allowed
groupJson = "{ \"name\": \" grpname\", \"type\": \"admin\" }"; groupJson = "{ \"name\": \" grpname\", \"type\": \"admin\" }";
request = MockHttpRequest request = MockHttpRequest
.post("/" + GroupRootResource.GROUPS_PATH_V2) .post("/" + GroupRootResource.GROUPS_PATH_V2)
@@ -248,6 +248,38 @@ public class GroupRootResourceTest {
dispatcher.invoke(request, response); dispatcher.invoke(request, response);
assertEquals(400, response.getStatus()); assertEquals(400, response.getStatus());
// the characters {[ are not allowed
groupJson = "{ \"name\": \"grp{name}\", \"type\": \"admin\" }";
request = MockHttpRequest
.post("/" + GroupRootResource.GROUPS_PATH_V2)
.contentType(VndMediaType.GROUP)
.content(groupJson.getBytes());
dispatcher.invoke(request, response);
assertEquals(400, response.getStatus());
groupJson = "{ \"name\": \"grp[name]\", \"type\": \"admin\" }";
request = MockHttpRequest
.post("/" + GroupRootResource.GROUPS_PATH_V2)
.contentType(VndMediaType.GROUP)
.content(groupJson.getBytes());
dispatcher.invoke(request, response);
assertEquals(400, response.getStatus());
groupJson = "{ \"name\": \"grp/name\", \"type\": \"admin\" }";
request = MockHttpRequest
.post("/" + GroupRootResource.GROUPS_PATH_V2)
.contentType(VndMediaType.GROUP)
.content(groupJson.getBytes());
dispatcher.invoke(request, response);
assertEquals(400, response.getStatus());
} }
@Test @Test