diff --git a/common/config/config.go b/common/config/config.go index 43f56862..a5241533 100644 --- a/common/config/config.go +++ b/common/config/config.go @@ -64,6 +64,7 @@ var SMTPPort = 587 var SMTPAccount = "" var SMTPFrom = "" var SMTPToken = "" +var SMTPAuthLoginEnabled = false var GitHubClientId = "" var GitHubClientSecret = "" diff --git a/common/message/email.go b/common/message/email.go index 187ac8c3..09f0d9bb 100644 --- a/common/message/email.go +++ b/common/message/email.go @@ -4,6 +4,7 @@ import ( "crypto/rand" "crypto/tls" "encoding/base64" + "errors" "fmt" "github.com/songquanpeng/one-api/common/config" "net" @@ -12,6 +13,32 @@ import ( "time" ) +type loginAuth struct { + username, password string +} + +func LoginAuth(username, password string) smtp.Auth { + return &loginAuth{username, password} +} + +func (a *loginAuth) Start(_ *smtp.ServerInfo) (string, []byte, error) { + return "LOGIN", []byte(a.username), nil +} + +func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) { + if more { + switch string(fromServer) { + case "Username:": + return []byte(a.username), nil + case "Password:": + return []byte(a.password), nil + default: + return nil, errors.New("unknown command from server during login auth") + } + } + return nil, nil +} + func shouldAuth() bool { return config.SMTPAccount != "" || config.SMTPToken != "" } @@ -47,7 +74,13 @@ func SendEmail(subject string, receiver string, content string) error { "Content-Type: text/html; charset=UTF-8\r\n\r\n%s\r\n", receiver, config.SystemName, config.SMTPFrom, encodedSubject, messageId, time.Now().Format(time.RFC1123Z), content)) - auth := smtp.PlainAuth("", config.SMTPAccount, config.SMTPToken, config.SMTPServer) + var auth smtp.Auth + if config.SMTPAuthLoginEnabled { + auth = LoginAuth(config.SMTPAccount, config.SMTPToken) + } else { + auth = smtp.PlainAuth("", config.SMTPAccount, config.SMTPToken, config.SMTPServer) + } + addr := fmt.Sprintf("%s:%d", config.SMTPServer, config.SMTPPort) to := strings.Split(receiver, ";") diff --git a/i18n/en.json b/i18n/en.json index b7f1bd3e..2e57cc2e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -330,6 +330,7 @@ "通常和邮箱地址保持一致": "Usually consistent with the email address", "SMTP 访问凭证": "SMTP Access Credential", "敏感信息不会发送到前端显示": "Sensitive information will not be displayed in the frontend", + "使用 SMTP LOGIN 认证方式": "Use LOGIN as SMTP authentication method", "保存 SMTP 设置": "Save SMTP Settings", "配置 GitHub OAuth App": "Configure GitHub OAuth App", "用以支持通过 GitHub 进行登录注册": "To support login & registration via GitHub", diff --git a/model/option.go b/model/option.go index 8fd30aee..268e4b9b 100644 --- a/model/option.go +++ b/model/option.go @@ -46,6 +46,7 @@ func InitOptionMap() { config.OptionMap["SMTPPort"] = strconv.Itoa(config.SMTPPort) config.OptionMap["SMTPAccount"] = "" config.OptionMap["SMTPToken"] = "" + config.OptionMap["SMTPAuthLoginEnabled"] = strconv.FormatBool(config.SMTPAuthLoginEnabled) config.OptionMap["Notice"] = "" config.OptionMap["About"] = "" config.OptionMap["HomePageContent"] = "" @@ -153,6 +154,8 @@ func updateOptionMap(key string, value string) (err error) { config.DisplayInCurrencyEnabled = boolValue case "DisplayTokenStatEnabled": config.DisplayTokenStatEnabled = boolValue + case "SMTPAuthLoginEnabled": + config.SMTPAuthLoginEnabled = boolValue } } switch key { diff --git a/web/default/src/components/SystemSetting.js b/web/default/src/components/SystemSetting.js index 7eeae92e..9f0da910 100644 --- a/web/default/src/components/SystemSetting.js +++ b/web/default/src/components/SystemSetting.js @@ -18,6 +18,7 @@ const SystemSetting = () => { SMTPAccount: '', SMTPFrom: '', SMTPToken: '', + SMTPAuthLoginEnabled: '', ServerAddress: '', Footer: '', WeChatAuthEnabled: '', @@ -76,6 +77,7 @@ const SystemSetting = () => { case 'TurnstileCheckEnabled': case 'EmailDomainRestrictionEnabled': case 'RegisterEnabled': + case 'SMTPAuthLoginEnabled': value = inputs[key] === 'true' ? 'false' : 'true'; break; default: @@ -107,7 +109,7 @@ const SystemSetting = () => { } if ( name === 'Notice' || - name.startsWith('SMTP') || + (name.startsWith('SMTP') && !name.endsWith('Enabled')) || name === 'ServerAddress' || name === 'GitHubClientId' || name === 'GitHubClientSecret' || @@ -444,6 +446,12 @@ const SystemSetting = () => { checked={inputs.RegisterEnabled === 'true'} placeholder='敏感信息不会发送到前端显示' /> + 保存 SMTP 设置