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

improve name validation of groups, users and repositories

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-08-06 13:46:27 +02:00
parent 40bc8d88b2
commit 911eff0510
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-core/src/main/java/sonia/scm/group/Group.java
View File

@@ -37,6 +37,7 @@ package sonia.scm.group;
import sonia.scm.ModelObject;
import sonia.scm.util.Util;
import sonia.scm.util.ValidationUtil;
//~--- JDK imports ------------------------------------------------------------
@@ -450,7 +451,7 @@ public class Group implements ModelObject, Iterable<String>
@Override
public boolean isValid()
{
return Util.isNotEmpty(name) && Util.isNotEmpty(type);
return ValidationUtil.isNameValid(name) && Util.isNotEmpty(type);
}
//~--- set methods ----------------------------------------------------------

3
scm-core/src/main/java/sonia/scm/repository/Repository.java
View File

@@ -352,6 +352,7 @@ public class Repository implements ModelObject
*
* @return
*/
@Override
public String getId()
{
return id;
@@ -434,7 +435,7 @@ public class Repository implements ModelObject
@Override
public boolean isValid()
{
return Util.isNotEmpty(name) && Util.isNotEmpty(type)
return ValidationUtil.isNameValid(name) && Util.isNotEmpty(type)
&& ((Util.isEmpty(contact))
|| ValidationUtil.isMailAddressValid(contact));
}

2
scm-core/src/main/java/sonia/scm/user/User.java
View File

@@ -418,7 +418,7 @@ public class User implements Principal, ModelObject
@Override
public boolean isValid()
{
return Util.isNotEmpty(name) && Util.isNotEmpty(displayName)
return ValidationUtil.isUsernameValid(name) && Util.isNotEmpty(displayName)
&& Util.isNotEmpty(type)
&& ((Util.isEmpty(mail)) || ValidationUtil.isMailAddressValid(mail));
}