diff options
author | Chris <ccbrown112@gmail.com> | 2017-06-26 11:33:48 -0700 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-06-26 14:33:48 -0400 |
commit | 69ae5cef166501dee49cd3a63d7131323796169e (patch) | |
tree | 9cba33f483cd4bbc7baf6acb4a4a550970209a91 /app | |
parent | f404483834613fc1250b105461c68145f9543421 (diff) | |
download | chat-69ae5cef166501dee49cd3a63d7131323796169e.tar.gz chat-69ae5cef166501dee49cd3a63d7131323796169e.tar.bz2 chat-69ae5cef166501dee49cd3a63d7131323796169e.zip |
verify for email domain for everything but ldap / saml (#6718)
Diffstat (limited to 'app')
-rw-r--r-- | app/user.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/user.go b/app/user.go index 6a6050cc8..6ab6f8344 100644 --- a/app/user.go +++ b/app/user.go @@ -176,7 +176,7 @@ func IsFirstUserAccount() bool { } func CreateUser(user *model.User) (*model.User, *model.AppError) { - if !user.IsSSOUser() && !CheckUserDomain(user, utils.Cfg.TeamSettings.RestrictCreationToDomains) { + if !user.IsLDAPUser() && !user.IsSAMLUser() && !CheckUserDomain(user, utils.Cfg.TeamSettings.RestrictCreationToDomains) { return nil, model.NewLocAppError("CreateUser", "api.user.create_user.accepted_domain.app_error", nil, "") } @@ -313,15 +313,13 @@ func CheckUserDomain(user *model.User, domains string) bool { domainArray := strings.Fields(strings.TrimSpace(strings.ToLower(strings.Replace(strings.Replace(domains, "@", " ", -1), ",", " ", -1)))) - matched := false for _, d := range domainArray { if strings.HasSuffix(strings.ToLower(user.Email), "@"+d) { - matched = true - break + return true } } - return matched + return false } // Check if the username is already used by another user. Return false if the username is invalid. |