Merge pull request #1218 from StrangeWill/blank-name-fix

Fixes issue with LDAP inserting users with blank names.
This commit is contained in:
Lunny Xiao 2015-04-20 14:06:48 +08:00
commit 2c4fb6e646

View File

@ -40,6 +40,7 @@ var (
ErrRepoFileNotLoaded = errors.New("Repository file not loaded") ErrRepoFileNotLoaded = errors.New("Repository file not loaded")
ErrMirrorNotExist = errors.New("Mirror does not exist") ErrMirrorNotExist = errors.New("Mirror does not exist")
ErrInvalidReference = errors.New("Invalid reference specified") ErrInvalidReference = errors.New("Invalid reference specified")
ErrNameEmpty = errors.New("Name is empty")
) )
var ( var (
@ -259,7 +260,11 @@ var (
// IsUsableName checks if name is reserved or pattern of name is not allowed. // IsUsableName checks if name is reserved or pattern of name is not allowed.
func IsUsableName(name string) error { func IsUsableName(name string) error {
name = strings.ToLower(name) name = strings.TrimSpace(strings.ToLower(name))
if utf8.RuneCountInString(name) == 0 {
return ErrNameEmpty
}
for i := range reservedNames { for i := range reservedNames {
if name == reservedNames[i] { if name == reservedNames[i] {
return ErrNameReserved{name} return ErrNameReserved{name}