From 75f3e28fe0b04590bb230aa400ed73187cae43b8 Mon Sep 17 00:00:00 2001 From: wmeszar Date: Tue, 10 Jan 2012 05:25:02 +0100 Subject: [PATCH] Change Username-Validation: allow usernames <3 char --- scm-core/src/main/java/sonia/scm/util/ValidationUtil.java | 2 +- scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java b/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java index 6b9c31cc53..c46bdc7432 100644 --- a/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java +++ b/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java @@ -55,7 +55,7 @@ public class ValidationUtil private static final String REGEX_REPOSITORYNAME = "^[A-z0-9\\.\\-_/]+$"; /** Field description */ - private static final String REGEX_USERNAME = "^[^ ][A-z0-9\\.\\-_@ ]+[^ ]$"; + private static final String REGEX_USERNAME = "^[A-z0-9\\.\\-_@]|[^ ]([A-z0-9\\.\\-_@ ]*[A-z0-9\\.\\-_@]|[^ ])?$"; //~--- get methods ---------------------------------------------------------- diff --git a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java index 6eff3f872f..b29ed007ce 100644 --- a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java +++ b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java @@ -146,6 +146,7 @@ public class ValidationUtilTest assertTrue(ValidationUtil.isUsernameValid("Test_user-123.git")); assertTrue(ValidationUtil.isUsernameValid("test@scm-manager.de")); assertTrue(ValidationUtil.isUsernameValid("test 123")); + assertTrue(ValidationUtil.isUsernameValid("t")); // false assertFalse(ValidationUtil.isUsernameValid(" test 123")); @@ -154,5 +155,8 @@ public class ValidationUtilTest assertFalse(ValidationUtil.isUsernameValid("test/123")); assertFalse(ValidationUtil.isUsernameValid("test%123")); assertFalse(ValidationUtil.isUsernameValid("test:123")); + assertFalse(ValidationUtil.isUsernameValid("t ")); + assertFalse(ValidationUtil.isUsernameValid(" t")); + assertFalse(ValidationUtil.isUsernameValid(" t ")); } }