Validate email in oauth registration form (#15014)

kdumontnu · web-flow · commit df891dc59fd2 · 2021-03-17T04:54:02.000+01:00
diff --git a/routers/user/auth.go b/routers/user/auth.go
@@ -942,6 +942,11 @@ func LinkAccountPostRegister(ctx *context.Context) {
 		}
 	}
 
+	if !form.IsEmailDomainAllowed() {
+		ctx.RenderWithErr(ctx.Tr("auth.email_domain_blacklisted"), tplLinkAccount, &form)
+		return
+	}
+
 	if setting.Service.AllowOnlyExternalRegistration || !setting.Service.RequireExternalRegistrationPassword {
 		// In models.User an empty password is classed as not set, so we set form.Password to empty.
 		// Eventually the database should be changed to indicate "Second Factor"-enabled accounts

Original file line number	Diff line number	Diff line change
`@@ -942,6 +942,11 @@ func LinkAccountPostRegister(ctx *context.Context) {`
`942`	`942`	`}`
`943`	`943`	`}`
`944`	`944`
	`945`	`+ if !form.IsEmailDomainAllowed() {`
	`946`	`+ ctx.RenderWithErr(ctx.Tr("auth.email_domain_blacklisted"), tplLinkAccount, &form)`
	`947`	`+ return`
	`948`	`+ }`
	`949`	`+`
`945`	`950`	`if setting.Service.AllowOnlyExternalRegistration \|\| !setting.Service.RequireExternalRegistrationPassword {`
`946`	`951`	`// In models.User an empty password is classed as not set, so we set form.Password to empty.`
`947`	`952`	`// Eventually the database should be changed to indicate "Second Factor"-enabled accounts`