Commit 28d8210

authored

fix: add nil checks for transport.DialContext (1Panel-dev#9702)

1 parent 80ce60c commit 28d8210Copy full SHA for 28d8210

File tree

1 file changed

-3

lines changed

agent/utils/email
- smtp_sender.go

1 file changed

-3

lines changed

`‎agent/utils/email/smtp_sender.go`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func isValidHeader(key, value string) bool {`
`132`	`132`	`func sendWithSSL(config SMTPConfig, addr string, toList []string, msg string, transport *http.Transport) error {`
`133`	`133`	`var err error`
`134`	`134`	`var conn net.Conn`
`135`		`- if transport != nil {`
	`135`	`+ if transport != nil &&transport.DialContext!=nil{`
`136`	`136`	`conn, err = transport.DialContext(context.Background(), "tcp", addr)`
`137`	`137`	`} else {`
`138`	`138`	`conn, err = net.Dial("tcp", addr)`
`@@ -163,7 +163,7 @@ func sendWithSSL(config SMTPConfig, addr string, toList []string, msg string, tr`
`163`	`163`	`func sendWithStartTLS(config SMTPConfig, addr string, toList []string, msg string, transport *http.Transport) error {`
`164`	`164`	`var err error`
`165`	`165`	`var conn net.Conn`
`166`		`- if transport != nil {`
	`166`	`+ if transport != nil &&transport.DialContext!=nil{`
`167`	`167`	`conn, err = transport.DialContext(context.Background(), "tcp", addr)`
`168`	`168`	`} else {`
`169`	`169`	`conn, err = net.Dial("tcp", addr)`
`@@ -192,7 +192,7 @@ func sendWithStartTLS(config SMTPConfig, addr string, toList []string, msg strin`
`192`	`192`	`func sendPlaintext(config SMTPConfig, addr string, toList []string, msg string, transport *http.Transport) error {`
`193`	`193`	`var err error`
`194`	`194`	`var conn net.Conn`
`195`		`- if transport != nil {`
	`195`	`+ if transport != nil &&transport.DialContext!=nil{`
`196`	`196`	`conn, err = transport.DialContext(context.Background(), "tcp", addr)`
`197`	`197`	`} else {`
`198`	`198`	`conn, err = net.Dial("tcp", addr)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 28d8210

File tree

1 file changed

1 file changed

`‎agent/utils/email/smtp_sender.go`

0 commit comments