foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-23 08:47:42 -05:00
Code Issues Wiki Activity

Fix validity of the FROM email address not being checked (#29347) (#29360)

Browse source 
Backport #29347 by @carlosfelgueiras

Fixes #27188.
Introduces a check on the installation that tries to parse the FROM
address. If it fails, shows a new error message to the user.

Co-authored-by: Carlos Felgueiras <carlosfelgueiras@tecnico.ulisboa.pt>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
(cherry picked from commit 35db5a373babd9af157fd63eeb20d6da53320b73)
This commit is contained in:
Giteabot 2024-02-24 16:23:21 +08:00 committed by Earl Warren
parent e4d3067138
commit a28d6686fa
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
options/locales/gitea_en-US.ini
View file

@ -246,6 +246,7 @@ email_title = Email Settings
smtp_addr = SMTP Host smtp_addr = SMTP Host
smtp_port = SMTP Port smtp_port = SMTP Port
smtp_from = Send Email As smtp_from = Send Email As
smtp_from_invalid = The "Send Email As" address is invalid
smtp_from_helper = Email address Gitea will use. Enter a plain email address or use the "Name" <email@example.com> format. smtp_from_helper = Email address Gitea will use. Enter a plain email address or use the "Name" <email@example.com> format.
mailer_user = SMTP Username mailer_user = SMTP Username
mailer_password = SMTP Password mailer_password = SMTP Password

6
routers/install/install.go
View file

@ -7,6 +7,7 @@ package install
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"net/mail"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -423,6 +424,11 @@ func SubmitInstall(ctx *context.Context) {
} }
if len(strings.TrimSpace(form.SMTPAddr)) > 0 { if len(strings.TrimSpace(form.SMTPAddr)) > 0 {
if _, err := mail.ParseAddress(form.SMTPFrom); err != nil {
ctx.RenderWithErr(ctx.Tr("install.smtp_from_invalid"), tplInstall, &form)
return
}
cfg.Section("mailer").Key("ENABLED").SetValue("true") cfg.Section("mailer").Key("ENABLED").SetValue("true")
cfg.Section("mailer").Key("SMTP_ADDR").SetValue(form.SMTPAddr) cfg.Section("mailer").Key("SMTP_ADDR").SetValue(form.SMTPAddr)
cfg.Section("mailer").Key("SMTP_PORT").SetValue(form.SMTPPort) cfg.Section("mailer").Key("SMTP_PORT").SetValue(form.SMTPPort)