Merge branch 'release/v1.21.7'

2025-08-15 20:13:16 +02:00 · 2024-12-14 23:01:07 +13:00
parent ccd35c7dc9 9d205cfdcc
commit 37c0558ddd
20 changed files with 2015 additions and 344 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
  test:
    strategy:
      matrix:
-        go-version: [1.21.x]
+        go-version: ['1.23']
        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
@@ -26,7 +26,7 @@ jobs:
        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
        restore-keys: |
          ${{ runner.os }}-go-
-    - run: go test -p 1 ./internal/storage ./server ./server/pop3 ./internal/tools ./internal/html2text ./internal/linkcheck -v
+    - run: go test -p 1 ./internal/storage ./server ./internal/smtpd ./internal/pop3 ./internal/tools ./internal/html2text ./internal/linkcheck -v
    - run: go test -p 1 ./internal/storage ./internal/html2text -bench=.
    
    # build the assets
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@

 Notable changes to Mailpit will be documented in this file.

+## [v1.21.7]
+
+### Chore
+- Update node dependencies
+- Update Go dependencies
+- Bump Go version for automated testing
+- Move smtpd & pop3 modules to internal
+- Stricter SMTP 'MAIL FROM' & 'RCPT TO' handling ([#409](https://github.com/axllent/mailpit/issues/409))
+- Display "To" details in mobile messages list
+- Display "From" details in message sidebar (desktop) ([#403](https://github.com/axllent/mailpit/issues/403))
+
+### Fix
+- Ignore unsupported optional SMTP 'MAIL FROM' parameters ([#407](https://github.com/axllent/mailpit/issues/407))
+- Prevent splitting multi-byte characters in message snippets ([#404](https://github.com/axllent/mailpit/issues/404))
+
+### Testing
+- Add smtpd tests
+
+
 ## [v1.21.6]

 ### Feature
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -9,10 +9,10 @@ import (
 	"github.com/axllent/mailpit/config"
 	"github.com/axllent/mailpit/internal/auth"
 	"github.com/axllent/mailpit/internal/logger"
+	"github.com/axllent/mailpit/internal/smtpd"
 	"github.com/axllent/mailpit/internal/storage"
 	"github.com/axllent/mailpit/internal/tools"
 	"github.com/axllent/mailpit/server"
-	"github.com/axllent/mailpit/server/smtpd"
 	"github.com/axllent/mailpit/server/webhook"
 	"github.com/spf13/cobra"
 )
--- a/go.mod
+++ b/go.mod
@@ -53,12 +53,12 @@ require (
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/vanng822/css v1.0.1 // indirect
-	golang.org/x/crypto v0.30.0 // indirect
-	golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
 	golang.org/x/image v0.23.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852 // indirect
+	modernc.org/gc/v3 v3.0.0-20241213165251-3bc300f6d0c9 // indirect
 	modernc.org/libc v1.61.4 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.8.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -128,10 +128,10 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf
 golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0=
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/exp v0.0.0-20241210194714-1829a127f884 h1:Y/Mj/94zIQQGHVSv1tTtQBDaQaJe62U9bkDZKKyhPCU=
+golang.org/x/exp v0.0.0-20241210194714-1829a127f884/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
 golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -231,8 +231,8 @@ modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
 modernc.org/gc/v2 v2.5.0 h1:bJ9ChznK1L1mUtAQtxi0wi5AtAs5jQuw4PrPHO5pb6M=
 modernc.org/gc/v2 v2.5.0/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
-modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852 h1:IYXPPTTjjoSHvUClZIYexDiO7g+4x+XveKT4gCIAwiY=
-modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
+modernc.org/gc/v3 v3.0.0-20241213165251-3bc300f6d0c9 h1:ovz6yUKX71igz2yvk4NpiCL5fvdjZAI+DhuDEGx1xyU=
+modernc.org/gc/v3 v3.0.0-20241213165251-3bc300f6d0c9/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
 modernc.org/libc v1.61.4 h1:wVyqEx6tlltte9lPTjq0kDAdtdM9c4JH8rU6M1ZVawA=
 modernc.org/libc v1.61.4/go.mod h1:VfXVuM/Shh5XsMNrh3C6OkfL78G3loa4ZC/Ljv9k7xc=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
--- a/internal/pop3/functions.go
+++ b/internal/pop3/functions.go
--- a/internal/pop3/pop3_test.go
+++ b/internal/pop3/pop3_test.go
--- a/internal/pop3/server.go
+++ b/internal/pop3/server.go
--- a/internal/smtpd/main.go
+++ b/internal/smtpd/main.go
--- a/internal/smtpd/relay.go
+++ b/internal/smtpd/relay.go
--- a/internal/smtpd/smtpd.go
+++ b/internal/smtpd/smtpd.go
@@ -27,9 +27,11 @@ import (
 var (
 	// Debug `true` enables verbose logging.
 	Debug      = false
-	rcptToRE   = regexp.MustCompile(`[Tt][Oo]:\s?<(.+)>`)
-	mailFromRE = regexp.MustCompile(`[Ff][Rr][Oo][Mm]:\s?<(.*)>(\s(.*))?`) // Delivery Status Notifications are sent with "MAIL FROM:<>"
-	mailSizeRE = regexp.MustCompile(`[Ss][Ii][Zz][Ee]=(\d+)`)
+	rcptToRE   = regexp.MustCompile(`[Tt][Oo]: ?<([^<>\v]+)>( |$)(.*)?`)
+	mailFromRE = regexp.MustCompile(`[Ff][Rr][Oo][Mm]: ?<(|[^<>\v]+)>( |$)(.*)?`) // Delivery Status Notifications are sent with "MAIL FROM:<>"
+
+	// extract mail size from 'MAIL FROM' parameter
+	mailFromSizeRE = regexp.MustCompile(`(?U)(^| |,)[Ss][Ii][Zz][Ee]=(.*)($|,| )`)
 )

 // Handler function called upon successful receipt of an email.
@@ -411,12 +413,15 @@ loop:
 			} else {
 				// Validate the SIZE parameter if one was sent.
 				if len(match[2]) > 0 { // A parameter is present
-					sizeMatch := mailSizeRE.FindStringSubmatch(match[3])
+					sizeMatch := mailFromSizeRE.FindStringSubmatch(match[3])
 					if sizeMatch == nil {
-						s.writef("501 5.5.4 Syntax error in parameters or arguments (invalid SIZE parameter)")
+						// ignore other parameter
+						from = match[1]
+						gotFrom = true
+						s.writef("250 2.1.0 Ok")
 					} else {
 						// Enforce the maximum message size if one is set.
-						size, err := strconv.Atoi(sizeMatch[1])
+						size, err := strconv.Atoi(sizeMatch[2])
 						if err != nil { // Bad SIZE parameter
 							s.writef("501 5.5.4 Syntax error in parameters or arguments (invalid SIZE parameter)")
 						} else if s.srv.MaxSize > 0 && size > s.srv.MaxSize { // SIZE above maximum size, if set
--- a/internal/smtpd/smtpd_test.go
+++ b/internal/smtpd/smtpd_test.go
--- a/internal/tools/snippets.go
+++ b/internal/tools/snippets.go
@@ -26,7 +26,7 @@ func CreateSnippet(text, html string) string {
 			return data
 		}

-		return data[0:limit] + "..."
+		return truncate(data, limit) + "..."
 	}

 	if text != "" {
@@ -37,8 +37,33 @@ func CreateSnippet(text, html string) string {
 			return text
 		}

-		return text[0:limit] + "..."
+		return truncate(text, limit) + "..."
 	}

 	return ""
 }
+
+// Truncate a string allowing for multi-byte encoding.
+// Shamelessly borrowed from Tailscale.
+// See https://github.com/tailscale/tailscale/blob/main/util/truncate/truncate.go
+func truncate(s string, n int) string {
+	if n >= len(s) {
+		return s
+	}
+
+	// Back up until we find the beginning of a UTF-8 encoding.
+	for n > 0 && s[n-1]&0xc0 == 0x80 { // 0x10... is a continuation byte
+		n--
+	}
+
+	// If we're at the beginning of a multi-byte encoding, back up one more to
+	// skip it. It's possible the value was already complete, but it's simpler
+	// if we only have to check in one direction.
+	//
+	// Otherwise, we have a single-byte code (0x00... or 0x01...).
+	if n > 0 && s[n-1]&0xc0 == 0xc0 { // 0x11... starts a multibyte encoding
+		n--
+	}
+
+	return s[:n]
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/server/apiv1/release.go
+++ b/server/apiv1/release.go
@@ -10,9 +10,9 @@ import (

 	"github.com/axllent/mailpit/config"
 	"github.com/axllent/mailpit/internal/logger"
+	"github.com/axllent/mailpit/internal/smtpd"
 	"github.com/axllent/mailpit/internal/storage"
 	"github.com/axllent/mailpit/internal/tools"
-	"github.com/axllent/mailpit/server/smtpd"
 	"github.com/gorilla/mux"
 	"github.com/lithammer/shortuuid/v4"
 )
--- a/server/apiv1/send.go
+++ b/server/apiv1/send.go
@@ -12,8 +12,8 @@ import (
 	"strings"

 	"github.com/axllent/mailpit/config"
+	"github.com/axllent/mailpit/internal/smtpd"
 	"github.com/axllent/mailpit/internal/tools"
-	"github.com/axllent/mailpit/server/smtpd"
 	"github.com/jhillyerd/enmime"
 )

--- a/server/server.go
+++ b/server/server.go
@@ -19,12 +19,12 @@ import (
 	"github.com/axllent/mailpit/config"
 	"github.com/axllent/mailpit/internal/auth"
 	"github.com/axllent/mailpit/internal/logger"
+	"github.com/axllent/mailpit/internal/pop3"
 	"github.com/axllent/mailpit/internal/stats"
 	"github.com/axllent/mailpit/internal/storage"
 	"github.com/axllent/mailpit/internal/tools"
 	"github.com/axllent/mailpit/server/apiv1"
 	"github.com/axllent/mailpit/server/handlers"
-	"github.com/axllent/mailpit/server/pop3"
 	"github.com/axllent/mailpit/server/websockets"
 	"github.com/gorilla/mux"
 	"github.com/lithammer/shortuuid/v4"
--- a/server/ui-src/assets/styles.scss
+++ b/server/ui-src/assets/styles.scss
@@ -314,10 +314,6 @@ body.blur {
 		> div {
 			opacity: 0.7;
 		}
-
-		b {
-			font-weight: normal;
-		}
 	}
 }

--- a/server/ui-src/components/ListMessages.vue
+++ b/server/ui-src/components/ListMessages.vue
@@ -132,21 +132,20 @@ export default {
 						<i class="bi bi-paperclip h6 me-1" v-if="message.Attachments"></i>
 						{{ getRelativeCreated(message) }}
 					</div>
-					<div class="text-truncate d-lg-none privacy">
-						<span v-if="message.From" :title="'From: ' + message.From.Address">
-							{{ message.From.Name ? message.From.Name : message.From.Address }}
-						</span>
+					<div v-if="message.From" class="overflow-x-hidden">
+						<div class="text-truncate privacy">
+							<b :title="'From: ' + message.From.Address">
+								{{ message.From.Name ? message.From.Name : message.From.Address }}
+							</b>
+						</div>
 					</div>
-					<div class="text-truncate d-none d-lg-block privacy">
-						<b v-if="message.From" :title="'From: ' + message.From.Address">
-							{{ message.From.Name ? message.From.Name : message.From.Address }}
-						</b>
-					</div>
-					<div class="d-none d-lg-block text-truncate text-muted small privacy">
-						To: {{ getPrimaryEmailTo(message) }}
-						<span v-if="message.To && message.To.length > 1">
-							[+{{ message.To.length - 1 }}]
-						</span>
+					<div class="overflow-x-hidden">
+						<div class="text-truncate text-muted small privacy">
+							To: {{ getPrimaryEmailTo(message) }}
+							<span v-if="message.To && message.To.length > 1">
+								[+{{ message.To.length - 1 }}]
+							</span>
+						</div>
 					</div>
 				</div>
 				<div class="col-lg-6 col-xxl-7 mt-2 mt-lg-0">
--- a/server/ui-src/views/MessageView.vue
+++ b/server/ui-src/views/MessageView.vue
@@ -601,10 +601,18 @@ export default {
 							:id="message.ID"
 							class="row gx-1 message d-flex small list-group-item list-group-item-action"
 							:class="message.Read ? 'read' : '', isActive(message.ID) ? 'active' : ''">
-							<div class="col-12 overflow-x-hidden">
-								<b>{{ message.Subject != "" ? message.Subject : "[ no subject ]" }}</b>
-							</div>
 							<div class="col overflow-x-hidden">
+								<div class="text-truncate privacy small">
+									<strong v-if="message.From" :title="'From: ' + message.From.Address">
+										{{ message.From.Name ? message.From.Name : message.From.Address }}
+									</strong>
+								</div>
+							</div>
+							<div class="col-auto small">
+								<i class="bi bi-paperclip h6" v-if="message.Attachments"></i>
+								{{ getRelativeCreated(message) }}
+							</div>
+							<div class="col-12 overflow-x-hidden">
 								<div class="text-truncate privacy small">
 									To: {{ getPrimaryEmailTo(message) }}
 									<span v-if="message.To && message.To.length > 1">
@@ -612,9 +620,10 @@ export default {
 									</span>
 								</div>
 							</div>
-							<div class="col-auto small">
-								<i class="bi bi-paperclip h6" v-if="message.Attachments"></i>
-								{{ getRelativeCreated(message) }}
+							<div class="col-12 overflow-x-hidden mt-1">
+								<div class="text-truncates small">
+									<b>{{ message.Subject != "" ? message.Subject : "[ no subject ]" }}</b>
+								</div>
 							</div>
 							<div v-if="message.Tags.length" class="col-12">
 								<RouterLink class="badge me-1" v-for="t in message.Tags" :to="toTagUrl(t)"