diff --git a/pom.xml b/pom.xml index d89f94b443..2f004117e4 100644 --- a/pom.xml +++ b/pom.xml @@ -37,8 +37,8 @@ ${project.build.directory}/alf_data convert - 8.174 - 8.106 + 8.178 + 8.111 8.32 1.1 diff --git a/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java b/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java index 99acdb8b6b..de7dcd7f15 100644 --- a/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java +++ b/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java @@ -87,7 +87,6 @@ public class GroupsImpl implements Groups private static final String DISPLAY_NAME = "displayName"; private static final String AUTHORITY_NAME = "authorityName"; private static final String ERR_MSG_MODIFY_FIXED_AUTHORITY = "Trying to modify a fixed authority"; - private static final char[] illegalCharacters = {'/', '\\', '\r', '\n'}; private final static Map SORT_PARAMS_TO_NAMES; static @@ -949,14 +948,6 @@ public class GroupsImpl implements Groups throw new InvalidArgumentException("groupId is null or empty"); } - for (char illegalCharacter : illegalCharacters) - { - if (groupId.indexOf(illegalCharacter) != -1) - { - throw new IllegalArgumentException("groupId contains characters that are not permitted: "+groupId.charAt(groupId.indexOf(illegalCharacter))); - } - } - if (groupAuthorityExists(groupId)) { throw new ConstraintViolatedException("Group '" + group.getId() + "' already exists."); diff --git a/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java b/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java index cf81755e77..9d8ea818cc 100644 --- a/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java +++ b/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java @@ -111,7 +111,6 @@ public class PeopleImpl implements People PermissionService.GROUP_PREFIX, PermissionService.ROLE_PREFIX }; - private static final char[] illegalCharacters = {'/', '\\', '\r', '\n'}; protected Nodes nodes; protected Sites sites; @@ -670,14 +669,6 @@ public class PeopleImpl implements People throw new InvalidArgumentException("Username exceeds max length of " + USERNAME_MAXLENGTH + " characters."); } - for (char illegalCharacter : illegalCharacters) - { - if (username.indexOf(illegalCharacter) != -1) - { - throw new IllegalArgumentException("Username contains characters that are not permitted: "+username.charAt(username.indexOf(illegalCharacter))); - } - } - for (String prefix : RESERVED_AUTHORITY_PREFIXES) { if (username.toUpperCase().startsWith(prefix)) diff --git a/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java b/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java index fb9e04432a..e28de0e99d 100644 --- a/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java +++ b/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java @@ -1450,11 +1450,11 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest groupsProxy.createGroup(group, null, HttpServletResponse.SC_BAD_REQUEST); } - // Create group with an id that contains invalid characters ("/", "\", "\n", "\r") should return an error. + // Create group with an id that contains invalid characters {'/', '\\', '\n', '\r', '"'} should return an error. { setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD); - char[] invalidCharacters = {'/', '\\', '\n', '\r'}; + char[] invalidCharacters = {'/', '\\', '\n', '\r', '"'}; for (char invalidCharacter : invalidCharacters) { Group group = new Group(); diff --git a/src/test/java/org/alfresco/rest/api/tests/TestPeople.java b/src/test/java/org/alfresco/rest/api/tests/TestPeople.java index 4e228d5194..560c1c182e 100644 --- a/src/test/java/org/alfresco/rest/api/tests/TestPeople.java +++ b/src/test/java/org/alfresco/rest/api/tests/TestPeople.java @@ -331,14 +331,14 @@ public class TestPeople extends AbstractBaseApiTest person.setUserName("myUserName11111111111111111111111111111111111111111111111111111111111111111111111111111111@" + account1.getId()); people.create(person, 400); - // create person with invalid characters ("/", "\", "\n", "\r") + // create person with invalid characters {'/', '\\', '\n', '\r', '"'} { - char[] invalidCharacters = {'/', '\\', '\n', '\r'}; + char[] invalidCharacters = {'/', '\\', '\n', '\r', '"'}; for (char invalidCharacter : invalidCharacters) { person.setUserName("myUser" + invalidCharacter + "Name@" + account1.getId()); - people.create(person, 400); + people.create(person, 400); } }