Open platform to collect and prioritize feedback
feature: add fetch supressed emails
goenningbb16053c3752
diff --git a/app/models/query/email.go b/app/models/query/email.gonew file mode 100644index 000000000..f393617d6--- /dev/null+++ b/app/models/query/email.go@@ -0,0 +1,10 @@+package query++import "time"++type FetchRecentSupressions struct {+ StartTime time.Time++ //Output+ EmailAddresses []string+}diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.goindex 2546280f9..36f6576dd 100644--- a/app/pkg/web/engine.go+++ b/app/pkg/web/engine.go@@ -124,7 +124,7 @@ func (e *Engine) Start(address string) {TLSConfig: getDefaultTLSConfig(env.Config.TLS.Automatic),}- for i := 0; i < runtime.NumCPU()*2; i++ {+ for i := 0; i < runtime.NumCPU(); i++ {go e.Worker().Run(strconv.Itoa(i))}diff --git a/app/services/email/emailmock/emailmock.go b/app/services/email/emailmock/emailmock.goindex 2b3360367..830e52ca2 100644--- a/app/services/email/emailmock/emailmock.go+++ b/app/services/email/emailmock/emailmock.go@@ -8,6 +8,7 @@ import ("github.com/getfider/fider/app/models/cmd""github.com/getfider/fider/app/models/dto""github.com/getfider/fider/app/models/entity"+ "github.com/getfider/fider/app/models/query""github.com/getfider/fider/app/pkg/bus")@@ -42,6 +43,12 @@ func (s Service) Enabled() bool {func (s Service) Init() {MessageHistory = make([]*HistoryItem, 0)bus.AddListener(sendMail)+ bus.AddHandler(fetchRecentSupressions)+}++func fetchRecentSupressions(ctx context.Context, c *query.FetchRecentSupressions) error {+ // not implemented for Email Mock+ return nil}func sendMail(ctx context.Context, c *cmd.SendMail) {diff --git a/app/services/email/mailgun/mailgun.go b/app/services/email/mailgun/sendmail.gosimilarity index 67%rename from app/services/email/mailgun/mailgun.gorename to app/services/email/mailgun/sendmail.goindex ceee24531..687284141 100644--- a/app/services/email/mailgun/mailgun.go+++ b/app/services/email/mailgun/sendmail.go@@ -19,60 +19,6 @@ import ("github.com/getfider/fider/app/services/email")-// Known base URLs-// Should Mailgun add other regions we'll just need to add their URLs here-// Use upper case keys - incoming env var values are normalized before being used-var baseURLs = map[string]string{- "US": "https://api.mailgun.net/v3/%s/messages",- "EU": "https://api.eu.mailgun.net/v3/%s/messages",-}--func init() {- bus.Register(Service{})-}--type Service struct{}--func (s Service) Name() string {- return "Mailgun"-}--func (s Service) Category() string {- return "email"-}--func (s Service) Enabled() bool {- return env.Config.Email.Mailgun.APIKey != ""-}--func (s Service) Init() {- bus.AddListener(sendMail)-}--// Try getting the URL of the Mailgun API using Environment vars and the Sender's domain-// Fall back to the URL for the US region if that fails to maintain compatibility with older installs-func getEndpoint(ctx context.Context, domain string) string {- var regionCode = env.Config.Email.Mailgun.Region- regionCode = strings.ToUpper(regionCode)-- // Default to the US domain if no region code was provided (ENV not set)- // or if the provided code isn't valid- if len(regionCode) < 1 {- regionCode = "US"- } else if len(baseURLs[regionCode]) < 1 {- log.Warnf(ctx,- "Unknown Mailgun region code '@{Code}' configured - falling back to 'US'",- dto.Props{- "Code": env.Config.Email.Mailgun.Region,- },- )-- regionCode = "US"- }-- return fmt.Sprintf(baseURLs[regionCode], domain)-}-func sendMail(ctx context.Context, c *cmd.SendMail) {if len(c.To) == 0 {return@@ -153,7 +99,7 @@ func sendMail(ctx context.Context, c *cmd.SendMail) {req := &cmd.HTTPRequest{Method: "POST",- URL: getEndpoint(ctx, env.Config.Email.Mailgun.Domain),+ URL: getEndpoint(ctx, env.Config.Email.Mailgun.Domain, "/messages"),Body: strings.NewReader(form.Encode()),Headers: map[string]string{"Content-Type": "application/x-www-form-urlencoded",diff --git a/app/services/email/mailgun/mailgun_test.go b/app/services/email/mailgun/sendmail_test.gosimilarity index 100%rename from app/services/email/mailgun/mailgun_test.gorename to app/services/email/mailgun/sendmail_test.godiff --git a/app/services/email/mailgun/service.go b/app/services/email/mailgun/service.gonew file mode 100644index 000000000..f23a4fcd1--- /dev/null+++ b/app/services/email/mailgun/service.go@@ -0,0 +1,67 @@+package mailgun++import (+ "context"+ "fmt"+ "strings"++ "github.com/getfider/fider/app/models/dto"+ "github.com/getfider/fider/app/pkg/bus"+ "github.com/getfider/fider/app/pkg/env"+ "github.com/getfider/fider/app/pkg/log"+)++// Known base URLs+// Should Mailgun add other regions we'll just need to add their URLs here+// Use upper case keys - incoming env var values are normalized before being used+var baseURLs = map[string]string{+ "US": "https://api.mailgun.net/v3/%s",+ "EU": "https://api.eu.mailgun.net/v3/%s",+}++func init() {+ bus.Register(Service{})+}++type Service struct{}++func (s Service) Name() string {+ return "Mailgun"+}++func (s Service) Category() string {+ return "email"+}++func (s Service) Enabled() bool {+ return env.Config.Email.Mailgun.APIKey != ""+}++func (s Service) Init() {+ bus.AddListener(sendMail)+ bus.AddHandler(fetchRecentSupressions)+}++// Try getting the URL of the Mailgun API using Environment vars and the Sender's domain+// Fall back to the URL for the US region if that fails to maintain compatibility with older installs+func getEndpoint(ctx context.Context, domain, path string) string {+ var regionCode = env.Config.Email.Mailgun.Region+ regionCode = strings.ToUpper(regionCode)++ // Default to the US domain if no region code was provided (ENV not set)+ // or if the provided code isn't valid+ if len(regionCode) < 1 {+ regionCode = "US"+ } else if len(baseURLs[regionCode]) < 1 {+ log.Warnf(ctx,+ "Unknown Mailgun region code '@{Code}' configured - falling back to 'US'",+ dto.Props{+ "Code": env.Config.Email.Mailgun.Region,+ },+ )++ regionCode = "US"+ }++ return fmt.Sprintf(baseURLs[regionCode], domain) + path+}diff --git a/app/services/email/mailgun/supression.go b/app/services/email/mailgun/supression.gonew file mode 100644index 000000000..131771e47--- /dev/null+++ b/app/services/email/mailgun/supression.go@@ -0,0 +1,90 @@+package mailgun++import (+ "context"+ "encoding/json"+ "fmt"+ "net/url"+ "strconv"+ "strings"++ "github.com/getfider/fider/app/models/cmd"+ "github.com/getfider/fider/app/models/dto"+ "github.com/getfider/fider/app/models/query"+ "github.com/getfider/fider/app/pkg/bus"+ "github.com/getfider/fider/app/pkg/env"+ "github.com/getfider/fider/app/pkg/errors"+)++type EventsResponse struct {+ Items []struct {+ ID string `json:"id"`+ Recipient string `json:"recipient"`+ } `json:"items"`+ Paging struct {+ Next string `json:"next"`+ } `json:"paging"`+}++func fetchRecentSupressions(ctx context.Context, q *query.FetchRecentSupressions) error {+ supressedAddresses := make(map[string]bool)++ params := url.Values{}+ params.Set("event", "failed")+ params.Set("limit", "300")+ params.Set("severity", "permanent")+ params.Set("begin", strconv.FormatInt(q.StartTime.Unix(), 10))++ endpointURL := fmt.Sprintf("%s?%s", getEndpoint(ctx, env.Config.Email.Mailgun.Domain, "/events"), params.Encode())+ for {+ res, err := fetchEvents(ctx, endpointURL)+ if err != nil {+ return err+ }++ for _, item := range res.Items {+ supressedAddresses[strings.TrimSpace(item.Recipient)] = true+ }++ // No more emails to fetch+ if len(res.Items) == 0 {+ q.EmailAddresses = make([]string, 0)+ for email := range supressedAddresses {+ q.EmailAddresses = append(q.EmailAddresses, email)+ }+ return nil+ }++ // continue on the next page+ endpointURL = res.Paging.Next+ }+}++func fetchEvents(ctx context.Context, endpoint string) (*EventsResponse, error) {+ req := &cmd.HTTPRequest{+ Method: "GET",+ URL: endpoint,+ Headers: map[string]string{+ "Content-Type": "application/x-www-form-urlencoded",+ },+ BasicAuth: &dto.BasicAuth{+ User: "api",+ Password: env.Config.Email.Mailgun.APIKey,+ },+ }++ if err := bus.Dispatch(ctx, req); err != nil {+ return nil, errors.Wrap(err, "failed to fetch failed events")+ }++ if req.ResponseStatusCode >= 300 {+ return nil, errors.New("unexpected status code while fetching failed events: %d", req.ResponseStatusCode)+ }++ res := &EventsResponse{}+ if err := json.Unmarshal(req.ResponseBody, &res); err != nil {+ return nil, errors.Wrap(err, "failed to unmarshal response body")+ }++ return res, nil+}diff --git a/app/services/email/smtp/smtp.go b/app/services/email/smtp/smtp.goindex 51516e452..f1f40be57 100644--- a/app/services/email/smtp/smtp.go+++ b/app/services/email/smtp/smtp.go@@ -14,6 +14,7 @@ import ("github.com/getfider/fider/app/models/cmd""github.com/getfider/fider/app/models/dto"+ "github.com/getfider/fider/app/models/query""github.com/getfider/fider/app/pkg/bus""github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/errors"@@ -42,6 +43,12 @@ func (s Service) Enabled() bool {func (s Service) Init() {bus.AddListener(sendMail)+ bus.AddHandler(fetchRecentSupressions)+}++func fetchRecentSupressions(ctx context.Context, c *query.FetchRecentSupressions) error {+ //not implemented for SMTP+ return nil}func sendMail(ctx context.Context, c *cmd.SendMail) {