From d132de4400c181d69c8d560a5f1e33e95e6d8586 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 25 Aug 2015 14:28:02 -0700 Subject: Fixes PL-1 added ability to disable team creation --- api/team.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index a331e9e34..2d60707bb 100644 --- a/api/team.go +++ b/api/team.go @@ -44,6 +44,11 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } + if utils.Cfg.TeamSettings.DisableTeamCreation { + c.Err = model.NewAppError("createTeamFromSignup", "Team creation has been disabled. Please ask your systems administrator for details.", "") + return + } + subjectPage := NewServerTemplatePage("signup_team_subject", c.GetSiteURL()) bodyPage := NewServerTemplatePage("signup_team_body", c.GetSiteURL()) bodyPage.Props["TourUrl"] = utils.Cfg.TeamSettings.TourLink @@ -79,6 +84,11 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) { return } + if utils.Cfg.TeamSettings.DisableTeamCreation { + c.Err = model.NewAppError("createTeamFromSignup", "Team creation has been disabled. Please ask your systems administrator for details.", "") + return + } + props := model.MapFromJson(strings.NewReader(teamSignup.Data)) teamSignup.Team.Email = props["email"] teamSignup.User.Email = props["email"] @@ -169,6 +179,11 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } + if utils.Cfg.TeamSettings.DisableTeamCreation { + c.Err = model.NewAppError("createTeam", "Team creation has been disabled. Please ask your systems administrator for details.", "") + return + } + if utils.Cfg.ServiceSettings.Mode != utils.MODE_DEV { c.Err = model.NewAppError("createTeam", "The mode does not allow network creation without a valid invite", "") return -- cgit v1.2.3-1-g7c22 From 67bc12e4b72960ce5413a6267f11d505d581f1e7 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 25 Aug 2015 14:40:16 -0700 Subject: Fixes PL-3 Restrict team creation to specific domains --- api/team.go | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index 2d60707bb..10bdafcf0 100644 --- a/api/team.go +++ b/api/team.go @@ -44,8 +44,7 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - if utils.Cfg.TeamSettings.DisableTeamCreation { - c.Err = model.NewAppError("createTeamFromSignup", "Team creation has been disabled. Please ask your systems administrator for details.", "") + if !isTreamCreationAllowed(c, email) { return } @@ -84,11 +83,6 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) { return } - if utils.Cfg.TeamSettings.DisableTeamCreation { - c.Err = model.NewAppError("createTeamFromSignup", "Team creation has been disabled. Please ask your systems administrator for details.", "") - return - } - props := model.MapFromJson(strings.NewReader(teamSignup.Data)) teamSignup.Team.Email = props["email"] teamSignup.User.Email = props["email"] @@ -99,6 +93,11 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } + + if !isTreamCreationAllowed(c, teamSignup.Team.Email) { + return + } + teamSignup.Team.Id = "" password := teamSignup.User.Password @@ -179,8 +178,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - if utils.Cfg.TeamSettings.DisableTeamCreation { - c.Err = model.NewAppError("createTeam", "Team creation has been disabled. Please ask your systems administrator for details.", "") + if !isTreamCreationAllowed(c, team.Email) { return } @@ -211,6 +209,35 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { } } +func isTreamCreationAllowed(c *Context, email string) bool { + + email = strings.ToLower(email) + + if utils.Cfg.TeamSettings.DisableTeamCreation { + c.Err = model.NewAppError("isTreamCreationAllowed", "Team creation has been disabled. Please ask your systems administrator for details.", "") + return false + } + + // commas and @ signs are optional + // can be in the form of "@corp.mattermost.com, mattermost.com mattermost.org" -> corp.mattermost.com mattermost.com mattermost.org + domains := strings.Fields(strings.TrimSpace(strings.ToLower(strings.Replace(strings.Replace(utils.Cfg.TeamSettings.RestrictCreationToDomains, "@", " ", -1), ",", " ", -1)))) + + matched := false + for _, d := range domains { + if strings.HasSuffix(email, "@"+d) { + matched = true + break + } + } + + if len(utils.Cfg.TeamSettings.RestrictCreationToDomains) > 0 && !matched { + c.Err = model.NewAppError("isTreamCreationAllowed", "Email must be from a specific domain (e.g. @example.com). Please ask your systems administrator for details.", "") + return false + } + + return true +} + func findTeamByName(c *Context, w http.ResponseWriter, r *http.Request) { m := model.MapFromJson(r.Body) -- cgit v1.2.3-1-g7c22