hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-09-19 19:00:11 +00:00
Code Issues Projects Releases Wiki Activity

email: use proxy for mailgun, too

Browse Source 
adds proxy transport to the http.Client in the mailgun api client.
This commit is contained in:
Harvey Tindall 2024-08-09 21:11:18 +01:00
parent 6308db495a
commit a52dd26ec6
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
email.go
View File

@ -10,6 +10,7 @@ import (
"html/template" "html/template"
"io" "io"
"io/fs" "io/fs"
"net/http"
"net/url" "net/url"
"os" "os"
"strconv" "strconv"
@ -99,7 +100,7 @@ func NewEmailer(app *appContext) *Emailer {
app.err.Printf(lm.FailedInitSMTP, err) app.err.Printf(lm.FailedInitSMTP, err)
} }
} else if method == "mailgun" { } else if method == "mailgun" {
emailer.NewMailgun(app.config.Section("mailgun").Key("api_url").String(), app.config.Section("mailgun").Key("api_key").String()) emailer.NewMailgun(app.config.Section("mailgun").Key("api_url").String(), app.config.Section("mailgun").Key("api_key").String(), app.proxyTransport)
} else if method == "dummy" { } else if method == "dummy" {
emailer.sender = &DummyClient{} emailer.sender = &DummyClient{}
} }
@ -201,10 +202,14 @@ type Mailgun struct {
} }
// NewMailgun returns a Mailgun emailClient. // NewMailgun returns a Mailgun emailClient.
func (emailer *Emailer) NewMailgun(url, key string) { func (emailer *Emailer) NewMailgun(url, key string, transport *http.Transport) {
sender := &Mailgun{ sender := &Mailgun{
client: mailgun.NewMailgun(strings.Split(emailer.fromAddr, "@")[1], key), client: mailgun.NewMailgun(strings.Split(emailer.fromAddr, "@")[1], key),
} }
if transport != nil {
cli := sender.client.Client()
cli.Transport = transport
}
// Mailgun client takes the base url, so we need to trim off the end (e.g 'v3/messages') // Mailgun client takes the base url, so we need to trim off the end (e.g 'v3/messages')
if strings.Contains(url, "messages") { if strings.Contains(url, "messages") {
url = url[0:strings.LastIndex(url, "/")] url = url[0:strings.LastIndex(url, "/")]