server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix GHSA-6g9p-wv47-4fxq

Browse Source
This commit is contained in:
Deng Ming 2024-04-25 16:54:02 +08:00 committed by Ming Deng
parent 5a366cd62b
commit 8f89e12e6c
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/logs/alils/request.go
View File

@ -13,7 +13,7 @@ func request(project *LogProject, method, uri string, headers map[string]string,
// The caller should provide 'x-sls-bodyrawsize' header // The caller should provide 'x-sls-bodyrawsize' header
if _, ok := headers["x-sls-bodyrawsize"]; !ok { if _, ok := headers["x-sls-bodyrawsize"]; !ok {
err = fmt.Errorf("Can't find 'x-sls-bodyrawsize' header") err = fmt.Errorf("can't find 'x-sls-bodyrawsize' header")
return return
} }
@ -27,7 +27,7 @@ func request(project *LogProject, method, uri string, headers map[string]string,
headers["Content-MD5"] = bodyMD5 headers["Content-MD5"] = bodyMD5
if _, ok := headers["Content-Type"]; !ok { if _, ok := headers["Content-Type"]; !ok {
err = fmt.Errorf("Can't find 'Content-Type' header") err = fmt.Errorf("can't find 'Content-Type' header")
return return
} }
} }

10
core/logs/smtp.go
View File

@ -32,13 +32,16 @@ type SMTPWriter struct {
FromAddress string `json:"fromAddress"` FromAddress string `json:"fromAddress"`
RecipientAddresses []string `json:"sendTos"` RecipientAddresses []string `json:"sendTos"`
Level int `json:"level"` Level int `json:"level"`
// InsecureSkipVerify default value: true
InsecureSkipVerify bool `json:"insecureSkipVerify"`
formatter LogFormatter formatter LogFormatter
Formatter string `json:"formatter"` Formatter string `json:"formatter"`
} }
// NewSMTPWriter creates the smtp writer. // NewSMTPWriter creates the smtp writer.
func newSMTPWriter() Logger { func newSMTPWriter() Logger {
res := &SMTPWriter{Level: LevelTrace} res := &SMTPWriter{Level: LevelTrace, InsecureSkipVerify: true}
res.formatter = res res.formatter = res
return res return res
} }
@ -53,7 +56,8 @@ func newSMTPWriter() Logger {
// "subject":"email title", // "subject":"email title",
// "fromAddress":"from@example.com", // "fromAddress":"from@example.com",
// "sendTos":["email1","email2"], // "sendTos":["email1","email2"],
// "level":LevelError // "level":LevelError,
// "insecureSkipVerify": false
// } // }
func (s *SMTPWriter) Init(config string) error { func (s *SMTPWriter) Init(config string) error {
res := json.Unmarshal([]byte(config), s) res := json.Unmarshal([]byte(config), s)
@ -91,7 +95,7 @@ func (s *SMTPWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAd
host, _, _ := net.SplitHostPort(hostAddressWithPort) host, _, _ := net.SplitHostPort(hostAddressWithPort)
tlsConn := &tls.Config{ tlsConn := &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: s.InsecureSkipVerify,
ServerName: host, ServerName: host,
} }
if err = client.StartTLS(tlsConn); err != nil { if err = client.StartTLS(tlsConn); err != nil {