Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-04 13:49:13 +01:00
Code Issues Packages Projects Releases Activity

use same validation rules for user and group names

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-10-28 13:15:12 +01:00
parent 5f782811a2
commit 152abc58c2
3 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
View File

@@ -55,16 +55,13 @@ public final class ValidationUtil
"^[A-z0-9][\\w.-]*@[A-z0-9][\\w\\-\\.]+\\.[A-z0-9]{2,6}$";
/** Field description */
private static final String REGEX_NAME = "^[A-z0-9\\.\\-_]+$";
private static final String REGEX_NAME =
"^[A-z0-9\\.\\-_@]|[^ ]([A-z0-9\\.\\-_@ ]*[A-z0-9\\.\\-_@]|[^ ])?$";
/** Field description */
private static final String REGEX_REPOSITORYNAME =
"(?!^\\.\\.$)(?!^\\.$)(?!.*[\\\\\\[\\]])^[A-z0-9\\.][A-z0-9\\.\\-_/]*$";
/** Field description */
private static final String REGEX_USERNAME =
"^[A-z0-9\\.\\-_@]|[^ ]([A-z0-9\\.\\-_@ ]*[A-z0-9\\.\\-_@]|[^ ])?$";
//~--- constructors ---------------------------------------------------------
/**
@@ -185,10 +182,12 @@ public final class ValidationUtil
* @param username
*
* @return
* @deprecated use {@link #isNameValid(String)}
*/
@Deprecated
public static boolean isUsernameValid(String username)
{
return Util.isNotEmpty(username) && username.matches(REGEX_USERNAME);
return isNameValid(username);
}
/**