Skip to content

armgit / posta

Public Imported from GitHub
0

Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.

chore: upgrade Go to 1.27.3 and golangci-lint to v2.15.0, fix lint

Jonas Kaninda6feafee665fc
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8e4f68c..3d7caae 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -31,4 +31,4 @@ jobs:
with:
# Pinned rather than floating: a new linter release must not turn a
# green branch red on a day nobody touched the code.
- version: v2.13.2
+ version: v2.15.0
diff --git a/go.mod b/go.mod
index b2dffe9..51bf0dd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/goposta/posta
-go 1.27.1
+go 1.27.3
require (
github.com/aws/aws-sdk-go-v2 v1.47.5
diff --git a/internal/handlers/form_page_handler.go b/internal/handlers/form_page_handler.go
index 7c795de..c7e0ee7 100644
--- a/internal/handlers/form_page_handler.go
+++ b/internal/handlers/form_page_handler.go
@@ -36,13 +36,16 @@ import (
const maxPrefillLength = 2000
-// fieldEmail is the key of an email field: the widget's built-in field and
-// the email column of a subscriber import.
-const fieldEmail = "email"
+// fieldEmail and fieldName are the keys of the widget's built-in email and
+// name fields, and the default columns of a subscriber import.
+const (
+ fieldEmail = "email"
+ fieldName = "name"
+)
// builtinPrefillKeys are the fields the widget shows for a form without a
// schema, so its share link can prefill them too.
-var builtinPrefillKeys = []string{"name", fieldEmail, "phone", "subject", "message"}
+var builtinPrefillKeys = []string{fieldName, fieldEmail, "phone", "subject", "message"}
// hostedPageCSP keeps a hosted page to Posta's own script and API. Inline
// styles are allowed for the page and the widget's shadow root; images may
diff --git a/internal/handlers/form_submission_handler.go b/internal/handlers/form_submission_handler.go
index c0355cf..9b2b384 100644
--- a/internal/handlers/form_submission_handler.go
+++ b/internal/handlers/form_submission_handler.go
@@ -55,6 +55,10 @@ const (
// from the raw query: field.<key>=value for equality, field.<key>[gte]=n and
// field.<key>[lte]=n for ranges on number, scale, rating, date and time
// questions.
+
+// formatCSV is the default export format.
+const formatCSV = "csv"
+
type SubmissionQueryRequest struct {
FormID int `query:"form_id" doc:"The form whose submissions to read (required)"`
Page int `query:"page" default:"0"`
@@ -313,7 +317,7 @@ func (h *MessageHandler) ExportSubmissions(c *okapi.Context, req *SubmissionQuer
}
format := req.Format
if format != "json" {
- format = "csv"
+ format = formatCSV
}
showPII := canSeePII(c)
cols, withheld := exportColumns(form.Fields, showPII)
@@ -328,7 +332,7 @@ func (h *MessageHandler) ExportSubmissions(c *okapi.Context, req *SubmissionQuer
}
filename := fmt.Sprintf("%s-responses-%s.%s", slug, time.Now().UTC().Format("20060102"), format)
hdr := c.ResponseWriter().Header()
- if format == "csv" {
+ if format == formatCSV {
hdr.Set("Content-Type", "text/csv; charset=utf-8")
} else {
hdr.Set("Content-Type", "application/json; charset=utf-8")
@@ -348,7 +352,7 @@ func (h *MessageHandler) ExportSubmissions(c *okapi.Context, req *SubmissionQuer
var write func(m *models.Message) error
var finish func() error
- if format == "csv" {
+ if format == formatCSV {
// The byte-order mark makes Excel read the file as UTF-8.
_, _ = out.WriteString("\ufeff")
w := csv.NewWriter(out)
diff --git a/internal/handlers/form_submission_test.go b/internal/handlers/form_submission_test.go
index f0d6b5b..de59432 100644
--- a/internal/handlers/form_submission_test.go
+++ b/internal/handlers/form_submission_test.go
@@ -120,7 +120,7 @@ func TestCSVSafe(t *testing.T) {
func TestExportColumnsOrderAndPII(t *testing.T) {
keys := func(cols []models.FieldDef) []string {
- out := []string{}
+ out := make([]string, 0, len(cols))
for _, c := range cols {
out = append(out, c.Key)
}
diff --git a/internal/handlers/subscriber_handler.go b/internal/handlers/subscriber_handler.go
index 6725cca..a1659e6 100644
--- a/internal/handlers/subscriber_handler.go
+++ b/internal/handlers/subscriber_handler.go
@@ -279,7 +279,7 @@ func (h *SubscriberHandler) BulkImportCSV(c *okapi.Context) error {
// Parse optional column mapping: {"0":"email","1":"name","2":"custom_fields.company"}
mappingStr := c.Request().FormValue("column_mapping")
- columnMap := map[int]string{0: fieldEmail, 1: "name"} // defaults
+ columnMap := map[int]string{0: fieldEmail, 1: fieldName} // defaults
if mappingStr != "" {
var raw map[string]string
if err := json.Unmarshal([]byte(mappingStr), &raw); err == nil {
diff --git a/internal/routes/message_routes.go b/internal/routes/message_routes.go
index 6bd5f68..a1f6183 100644
--- a/internal/routes/message_routes.go
+++ b/internal/routes/message_routes.go
@@ -548,7 +548,7 @@ func (r *Router) messageWorkspaceRoutes() []okapi.RouteDefinition {
},
{
Method: http.MethodGet,
- Path: "/teams/{id:int}",
+ Path: pathTeamByID,
Handler: okapi.H(r.h.team.Get),
Group: opsGroup,
Middlewares: r.licensed(),
@@ -560,7 +560,7 @@ func (r *Router) messageWorkspaceRoutes() []okapi.RouteDefinition {
},
{
Method: http.MethodPut,
- Path: "/teams/{id:int}",
+ Path: pathTeamByID,
Handler: okapi.H(r.h.team.Update),
Group: opsGroup,
Middlewares: r.licensedToChange(),
@@ -571,7 +571,7 @@ func (r *Router) messageWorkspaceRoutes() []okapi.RouteDefinition {
},
{
Method: http.MethodDelete,
- Path: "/teams/{id:int}",
+ Path: pathTeamByID,
Handler: okapi.H(r.h.team.Delete),
Group: opsGroup,
Middlewares: r.licensedToChange(),
diff --git a/internal/routes/paths.go b/internal/routes/paths.go
index c14f3ac..7e168be 100644
--- a/internal/routes/paths.go
+++ b/internal/routes/paths.go
@@ -46,6 +46,7 @@ const (
pathSubscriberByID = "/subscribers/{id:int}"
pathSubscriberListByID = "/subscriber-lists/{id:int}"
pathSubscriberListMembers = "/subscriber-lists/{id:int}/members"
+ pathTeamByID = "/teams/{id:int}"
pathUnsubscribeListByID = "/unsubscribe-lists/{id:int}"
pathWorkspaceByID = "/workspaces/{id:int}"
)
diff --git a/internal/services/formrules/check.go b/internal/services/formrules/check.go
index 49b2495..0dce502 100644
--- a/internal/services/formrules/check.go
+++ b/internal/services/formrules/check.go
@@ -173,7 +173,7 @@ func checkCondition(c *models.RuleCondition, form *models.Form) error {
}
c.Value = s
return nil
- case "gt", "gte", "lt", "lte":
+ case opGT, opGTE, opLT, opLTE:
s, err := single(c.Value)
if err != nil {
return err
diff --git a/internal/services/formrules/engine.go b/internal/services/formrules/engine.go
index 276fd8d..65a82e0 100644
--- a/internal/services/formrules/engine.go
+++ b/internal/services/formrules/engine.go
@@ -381,7 +381,7 @@ func test(c models.RuleCondition, f Facts) bool {
case "matches":
re := compiled(toString(c.Value))
return v.present && re != nil && re.MatchString(v.text)
- case "gt", "gte", "lt", "lte":
+ case opGT, opGTE, opLT, opLTE:
return v.present && compare(v, toString(c.Value), c.Op)
}
return false
@@ -457,16 +457,25 @@ func compare(v value, w string, op string) bool {
cmp = strings.Compare(v.text, strings.TrimSpace(w))
}
switch op {
- case "gt":
+ case opGT:
return cmp > 0
- case "gte":
+ case opGTE:
return cmp >= 0
- case "lt":
+ case opLT:
return cmp < 0
}
return cmp <= 0
}
+// The comparison operators: numbers, dates and times compare as such, other
+// values as text.
+const (
+ opGT = "gt"
+ opGTE = "gte"
+ opLT = "lt"
+ opLTE = "lte"
+)
+
var regexCache sync.Map // pattern → *regexp.Regexp (nil when it does not compile)
// compiled returns the case-insensitive regexp for pattern. Patterns are
diff --git a/internal/services/messages/branching_test.go b/internal/services/messages/branching_test.go
index ec62f6b..b76ac4c 100644
--- a/internal/services/messages/branching_test.go
+++ b/internal/services/messages/branching_test.go
@@ -49,8 +49,9 @@ func branchingForm() models.FieldDefs {
}
func routeKeys(defs models.FieldDefs, answers map[string]string) []string {
- var out []string
- for k := range Route(defs, func(key string) string { return answers[key] }) {
+ route := Route(defs, func(key string) string { return answers[key] })
+ out := make([]string, 0, len(route))
+ for k := range route {
out = append(out, k)
}
sort.Strings(out)
diff --git a/internal/services/messages/responses_test.go b/internal/services/messages/responses_test.go
index 608c4b8..86cc151 100644
--- a/internal/services/messages/responses_test.go
+++ b/internal/services/messages/responses_test.go
@@ -59,7 +59,7 @@ func TestSummarizerCountsEveryQuestionType(t *testing.T) {
if got.Total != 3 {
t.Fatalf("total = %d, want 3", got.Total)
}
- keys := []string{}
+ keys := make([]string, 0, len(got.Fields))
byKey := map[string]FieldSummary{}
for _, f := range got.Fields {
keys = append(keys, f.Key)