diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-08-28 17:54:47 +0200 |
|---|---|---|
| committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-08-28 17:54:47 +0200 |
| commit | d466e731496434f5253d36f5c5b3599f4589fdaa (patch) | |
| tree | 6adc7d62ab45621a966838c67199b87dcdb2bade /server | |
| parent | d9c700ff5c0c9e9908602c51aa24df492e76aa63 (diff) | |
| download | sonarqube-d466e731496434f5253d36f5c5b3599f4589fdaa.tar.gz sonarqube-d466e731496434f5253d36f5c5b3599f4589fdaa.zip | |
Trim all WS string request parameters
Diffstat (limited to 'server')
2 files changed, 3 insertions, 2 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java index d9e1c92a5ee..1f7d1b94ee4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java @@ -20,7 +20,6 @@ package org.sonar.server.permission.ws; -import com.google.common.base.CharMatcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import javax.annotation.Nullable; @@ -28,6 +27,7 @@ import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.permission.ProjectPermissions; import org.sonar.server.exceptions.BadRequestException; +import static com.google.common.base.CharMatcher.WHITESPACE; import static com.google.common.base.Strings.isNullOrEmpty; import static java.lang.String.format; import static org.sonar.api.security.DefaultGroups.isAnyone; @@ -59,7 +59,7 @@ public class PermissionRequestValidator { } public static void validateTemplateNameFormat(String name) { - String nameWithoutWhitespaces = CharMatcher.WHITESPACE.removeFrom(name); + String nameWithoutWhitespaces = WHITESPACE.trimFrom(name); checkRequest(!nameWithoutWhitespaces.isEmpty(), MSG_TEMPLATE_NAME_NOT_BLANK); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionRequestValidatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionRequestValidatorTest.java index 82a759778ca..ea19efdfa6e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionRequestValidatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionRequestValidatorTest.java @@ -33,6 +33,7 @@ public class PermissionRequestValidatorTest { @Test public void validate_template_name() { + PermissionRequestValidator.validateTemplateNameFormat(" text \r\n"); expectedException.expect(BadRequestException.class); expectedException.expectMessage(MSG_TEMPLATE_NAME_NOT_BLANK); |