From faded05e47c57116328defc7de9c87bcd58be566 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 13 Apr 2024 00:25:04 +1200 Subject: [PATCH 01/16] Feature: Add UI settings screen --- package-lock.json | 6 + package.json | 1 + server/ui-src/App.vue | 2 - server/ui-src/assets/styles.scss | 18 +-- server/ui-src/components/AboutMailpit.vue | 117 ++++------------- server/ui-src/components/Settings.vue | 119 ++++++++++++++++++ .../ui-src/components/message/HTMLCheck.vue | 76 ++--------- server/ui-src/components/message/Message.vue | 38 +++--- .../components/message/SpamAssassin.vue | 6 +- server/ui-src/stores/mailbox.js | 53 +++++++- 10 files changed, 251 insertions(+), 185 deletions(-) create mode 100644 server/ui-src/components/Settings.vue diff --git a/package-lock.json b/package-lock.json index 6d757e1ca..2be1bf893 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "moment": "^2.29.4", "prismjs": "^1.29.0", "rapidoc": "^9.3.4", + "timezones-list": "^3.0.3", "vue": "^3.2.13", "vue-css-donut-chart": "^2.0.0", "vue-router": "^4.2.4" @@ -3559,6 +3560,11 @@ "node": ">=6" } }, + "node_modules/timezones-list": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/timezones-list/-/timezones-list-3.0.3.tgz", + "integrity": "sha512-C+Vdvvj2c1xB6pu81pOX8geo6mrk/QsudFVlTVQET7QQwu8WAIyhDNeCrK5grU7EMzmbKLWqz7uU6dN8fvQvPQ==" + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index 9b2b43c72..dfcdf3d9d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "moment": "^2.29.4", "prismjs": "^1.29.0", "rapidoc": "^9.3.4", + "timezones-list": "^3.0.3", "vue": "^3.2.13", "vue-css-donut-chart": "^2.0.0", "vue-router": "^4.2.4" diff --git a/server/ui-src/App.vue b/server/ui-src/App.vue index 08a85b6a8..200d91760 100644 --- a/server/ui-src/App.vue +++ b/server/ui-src/App.vue @@ -15,8 +15,6 @@ export default { beforeMount() { document.title = document.title + ' - ' + location.hostname - mailbox.showTagColors = !localStorage.getItem('hideTagColors') == '1' - mailbox.timeZone = localStorage.getItem('timezone') ? localStorage.getItem('timezone') : Intl.DateTimeFormat().resolvedOptions().timeZone; // load global config this.get(this.resolve('/api/v1/webui'), false, function (response) { diff --git a/server/ui-src/assets/styles.scss b/server/ui-src/assets/styles.scss index d3d4b2f83..cdd22d831 100644 --- a/server/ui-src/assets/styles.scss +++ b/server/ui-src/assets/styles.scss @@ -320,16 +320,18 @@ body.blur { display: none; } -.form-control.dropdown { - padding: 0; - border: 0; +#message-view { + .form-control.dropdown { + padding: 0; + border: 0; - input { - font-size: 0.875em; - } + input { + font-size: 0.875em; + } - div { - cursor: text; // html5-tags + div { + cursor: text; // html5-tags + } } } diff --git a/server/ui-src/components/AboutMailpit.vue b/server/ui-src/components/AboutMailpit.vue index 38d04bde8..eae4d2fc4 100644 --- a/server/ui-src/components/AboutMailpit.vue +++ b/server/ui-src/components/AboutMailpit.vue @@ -1,5 +1,6 @@ + + diff --git a/server/ui-src/components/message/HTMLCheck.vue b/server/ui-src/components/message/HTMLCheck.vue index 57c81090c..805cc1c37 100644 --- a/server/ui-src/components/message/HTMLCheck.vue +++ b/server/ui-src/components/message/HTMLCheck.vue @@ -20,7 +20,6 @@ export default { data() { return { error: false, - enabled: true, check: false, platforms: [], allPlatforms: { @@ -37,7 +36,6 @@ export default { }, mounted() { - this.enabled = !localStorage.getItem('htmlCheckDisabled') this.loadConfig() this.doCheck() }, @@ -46,7 +44,7 @@ export default { summary: function () { let self = this - if (!this.enabled || !this.check) { + if (!this.check) { return false } @@ -199,23 +197,19 @@ export default { platforms(v) { localStorage.setItem('html-check-platforms', JSON.stringify(v)) }, - enabled(v) { - if (!v) { - localStorage.setItem('htmlCheckDisabled', true) - this.$emit('setHtmlScore', false) - } else { - localStorage.removeItem('htmlCheckDisabled') - this.doCheck() - } - } + // enabled(v) { + // if (!v) { + // localStorage.setItem('htmlCheckDisabled', true) + // this.$emit('setHtmlScore', false) + // } else { + // localStorage.removeItem('htmlCheckDisabled') + // this.doCheck() + // } + // } }, methods: { doCheck: function () { - if (!this.enabled) { - return - } - this.check = false if (this.message.HTML == "") { @@ -314,20 +308,6 @@ export default { - - - - diff --git a/server/ui-src/components/message/Message.vue b/server/ui-src/components/message/Message.vue index fcb746865..3a5faf338 100644 --- a/server/ui-src/components/message/Message.vue +++ b/server/ui-src/components/message/Message.vue @@ -69,6 +69,14 @@ export default { } }, + computed: { + hasAnyChecksEnabled: function() { + return (mailbox.showHTMLCheck && this.message.HTML) + || mailbox.showLinkCheck + || (mailbox.showSpamCheck && mailbox.uiConfig.SpamAssassin) + } + }, + mounted() { let self = this self.canSaveTags = false @@ -263,7 +271,7 @@ export default { To - + {{ t.Name }} @@ -278,7 +286,7 @@ export default { Cc - + {{ t.Name }} < @@ -423,16 +431,16 @@ export default { role="tab" aria-controls="nav-raw" aria-selected="false"> Raw -
+
    -
  • +
    • -
  • +
    • -
  • +
diff --git a/server/ui-src/components/message/SpamAssassin.vue b/server/ui-src/components/message/SpamAssassin.vue index 739789634..7f135ed9a 100644 --- a/server/ui-src/components/message/SpamAssassin.vue +++ b/server/ui-src/components/message/SpamAssassin.vue @@ -122,7 +122,11 @@ export default { value: p, color: c }, - ]; + ] + }, + + scoreColor: function() { + return this.graphSections[0].color }, } } diff --git a/server/ui-src/stores/mailbox.js b/server/ui-src/stores/mailbox.js index 3cf368412..96301593c 100644 --- a/server/ui-src/stores/mailbox.js +++ b/server/ui-src/stores/mailbox.js @@ -9,7 +9,6 @@ export const mailbox = reactive({ count: 0, // total in mailbox or search messages: [], // current messages tags: [], // all tags - showTagColors: true, // show/hide tag colors selected: [], // currently selected connected: false, // websocket connection searching: false, // current search, false for none @@ -19,7 +18,13 @@ export const mailbox = reactive({ appInfo: {}, // application information uiConfig: {}, // configuration for UI lastMessage: false, // return scrolling - timeZone: '', // browser timezone + + // settings + showTagColors: !localStorage.getItem('hideTagColors') == '1', + showHTMLCheck: !localStorage.getItem('hideHTMLCheck') == '1', + showLinkCheck: !localStorage.getItem('hideLinkCheck') == '1', + showSpamCheck: !localStorage.getItem('hideSpamCheck') == '1', + timeZone: localStorage.getItem('timeZone') ? localStorage.getItem('timeZone') : Intl.DateTimeFormat().resolvedOptions().timeZone, }) watch( @@ -39,3 +44,47 @@ watch( } } ) + +watch( + () => mailbox.showHTMLCheck, + (v) => { + if (v) { + localStorage.removeItem('hideHTMLCheck') + } else { + localStorage.setItem('hideHTMLCheck', '1') + } + } +) + +watch( + () => mailbox.showLinkCheck, + (v) => { + if (v) { + localStorage.removeItem('hideLinkCheck') + } else { + localStorage.setItem('hideLinkCheck', '1') + } + } +) + +watch( + () => mailbox.showSpamCheck, + (v) => { + if (v) { + localStorage.removeItem('hideSpamCheck') + } else { + localStorage.setItem('hideSpamCheck', '1') + } + } +) + +watch( + () => mailbox.timeZone, + (v) => { + if (v == Intl.DateTimeFormat().resolvedOptions().timeZone) { + localStorage.removeItem('timeZone') + } else { + localStorage.setItem('timeZone', v) + } + } +) From 31e4f84f9a2b5bdc33a4b49c4b668bb4447af278 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 13 Apr 2024 00:25:48 +1200 Subject: [PATCH 02/16] Chore: Remove deprecated --disable-html-check option --- cmd/root.go | 12 ++++++++---- config/config.go | 11 ++++++++--- server/apiv1/webui.go | 4 ---- server/server.go | 4 +--- server/ui/api/v1/swagger.json | 4 ---- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index e38c5dc44..b6e2bc1e4 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -96,7 +96,6 @@ func init() { rootCmd.Flags().StringVar(&config.UITLSCert, "ui-tls-cert", config.UITLSCert, "TLS certificate for web UI (HTTPS) - requires ui-tls-key") rootCmd.Flags().StringVar(&config.UITLSKey, "ui-tls-key", config.UITLSKey, "TLS key for web UI (HTTPS) - requires ui-tls-cert") rootCmd.Flags().StringVar(&server.AccessControlAllowOrigin, "api-cors", server.AccessControlAllowOrigin, "Set API CORS Access-Control-Allow-Origin header") - rootCmd.Flags().BoolVar(&config.DisableHTMLCheck, "disable-html-check", config.DisableHTMLCheck, "Disable the HTML check functionality (web UI & API)") rootCmd.Flags().BoolVar(&config.BlockRemoteCSSAndFonts, "block-remote-css-and-fonts", config.BlockRemoteCSSAndFonts, "Block access to remote CSS & fonts") rootCmd.Flags().StringVar(&config.EnableSpamAssassin, "enable-spamassassin", config.EnableSpamAssassin, "Enable integration with SpamAssassin") rootCmd.Flags().BoolVar(&config.AllowUntrustedTLS, "allow-untrusted-tls", config.AllowUntrustedTLS, "Do not verify HTTPS certificates (link checker & screenshots)") @@ -155,6 +154,10 @@ func init() { rootCmd.Flags().BoolVar(&config.SMTPRequireSTARTTLS, "smtp-tls-required", config.SMTPRequireSTARTTLS, "smtp-require-starttls") rootCmd.Flags().Lookup("smtp-tls-required").Hidden = true rootCmd.Flags().Lookup("smtp-tls-required").Deprecated = "use --smtp-require-starttls" + + // DEPRECATED FLAG 2024/04/13 - no longer used + rootCmd.Flags().BoolVar(&config.DisableHTMLCheck, "disable-html-check", config.DisableHTMLCheck, "Disable the HTML check functionality (web UI & API)") + rootCmd.Flags().Lookup("disable-html-check").Hidden = true } // Load settings from environment @@ -201,9 +204,6 @@ func initConfigFromEnv() { if len(os.Getenv("MP_API_CORS")) > 0 { server.AccessControlAllowOrigin = os.Getenv("MP_API_CORS") } - if getEnabledFromEnv("MP_DISABLE_HTML_CHECK") { - config.DisableHTMLCheck = true - } if getEnabledFromEnv("MP_BLOCK_REMOTE_CSS_AND_FONTS") { config.BlockRemoteCSSAndFonts = true } @@ -333,6 +333,10 @@ func initDeprecatedConfigFromEnv() { logger.Log().Warn("ENV MP_SMTP_TLS_REQUIRED has been deprecated, use MP_SMTP_REQUIRE_STARTTLS") config.SMTPRequireSTARTTLS = true } + if getEnabledFromEnv("MP_DISABLE_HTML_CHECK") { + logger.Log().Warn("ENV MP_DISABLE_HTML_CHECK has been deprecated and is no longer used") + config.DisableHTMLCheck = true + } } // Wrapper to get a boolean from an environment variable diff --git a/config/config.go b/config/config.go index c5522cbcb..019b9f49a 100644 --- a/config/config.go +++ b/config/config.go @@ -83,9 +83,6 @@ var ( // IgnoreDuplicateIDs will skip messages with the same ID IgnoreDuplicateIDs bool - // DisableHTMLCheck used to disable the HTML check in bother the API and web UI - DisableHTMLCheck = false - // BlockRemoteCSSAndFonts used to disable remote CSS & fonts BlockRemoteCSSAndFonts = false @@ -153,6 +150,9 @@ var ( // RepoBinaryName on Github for updater RepoBinaryName = "mailpit" + + // DisableHTMLCheck DEPRECATED 2024/04/13 - kept here to display console warning only + DisableHTMLCheck = false ) // AutoTag struct for auto-tagging @@ -361,6 +361,11 @@ func VerifyConfig() error { return fmt.Errorf("webhook URL does not appear to be a valid URL (%s)", WebhookURL) } + // DEPRECATED 2024/04/13 + if DisableHTMLCheck { + logger.Log().Warn("--disable-html-check has been deprecated and is no longer used") + } + if EnableSpamAssassin != "" { spamassassin.SetService(EnableSpamAssassin) logger.Log().Infof("[spamassassin] enabled via %s", EnableSpamAssassin) diff --git a/server/apiv1/webui.go b/server/apiv1/webui.go index 0b134c39b..40015f8cc 100644 --- a/server/apiv1/webui.go +++ b/server/apiv1/webui.go @@ -27,9 +27,6 @@ type webUIConfiguration struct { RecipientAllowlist string } - // Whether the HTML check has been globally disabled - DisableHTMLCheck bool - // Whether SpamAssassin is enabled SpamAssassin bool @@ -65,7 +62,6 @@ func WebUIConfig(w http.ResponseWriter, _ *http.Request) { conf.MessageRelay.RecipientAllowlist = config.SMTPRelayConfig.AllowedRecipients } - conf.DisableHTMLCheck = config.DisableHTMLCheck conf.SpamAssassin = config.EnableSpamAssassin != "" conf.DuplicatesIgnored = config.IgnoreDuplicateIDs diff --git a/server/server.go b/server/server.go index cd4ddb85b..04713957c 100644 --- a/server/server.go +++ b/server/server.go @@ -129,9 +129,7 @@ func apiRoutes() *mux.Router { r.HandleFunc(config.Webroot+"api/v1/message/{id}/headers", middleWareFunc(apiv1.GetHeaders)).Methods("GET") r.HandleFunc(config.Webroot+"api/v1/message/{id}/raw", middleWareFunc(apiv1.DownloadRaw)).Methods("GET") r.HandleFunc(config.Webroot+"api/v1/message/{id}/release", middleWareFunc(apiv1.ReleaseMessage)).Methods("POST") - if !config.DisableHTMLCheck { - r.HandleFunc(config.Webroot+"api/v1/message/{id}/html-check", middleWareFunc(apiv1.HTMLCheck)).Methods("GET") - } + r.HandleFunc(config.Webroot+"api/v1/message/{id}/html-check", middleWareFunc(apiv1.HTMLCheck)).Methods("GET") r.HandleFunc(config.Webroot+"api/v1/message/{id}/link-check", middleWareFunc(apiv1.LinkCheck)).Methods("GET") if config.EnableSpamAssassin != "" { r.HandleFunc(config.Webroot+"api/v1/message/{id}/sa-check", middleWareFunc(apiv1.SpamAssassinCheck)).Methods("GET") diff --git a/server/ui/api/v1/swagger.json b/server/ui/api/v1/swagger.json index 74cc14554..c991ee001 100644 --- a/server/ui/api/v1/swagger.json +++ b/server/ui/api/v1/swagger.json @@ -1401,10 +1401,6 @@ "description": "Response includes global web UI settings", "type": "object", "properties": { - "DisableHTMLCheck": { - "description": "Whether the HTML check has been globally disabled", - "type": "boolean" - }, "DuplicatesIgnored": { "description": "Whether messages with duplicate IDs are ignored", "type": "boolean" From 845fe840d49bb5605ee84520889f7d36e714db24 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 13 Apr 2024 00:29:23 +1200 Subject: [PATCH 03/16] Chore: Move Link check & HTML check features out of beta --- server/apiv1/api.go | 6 ------ server/ui-src/components/message/HTMLCheck.vue | 4 ---- server/ui-src/components/message/LinkCheck.vue | 9 --------- server/ui/api/v1/swagger.json | 4 ++-- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/server/apiv1/api.go b/server/apiv1/api.go index a37d02179..700721503 100644 --- a/server/apiv1/api.go +++ b/server/apiv1/api.go @@ -729,9 +729,6 @@ func HTMLCheck(w http.ResponseWriter, r *http.Request) { // // Returns the summary of the message HTML checker. // - // NOTE: This feature is currently in beta and is documented for reference only. - // Please do not integrate with it (yet) as there may be changes. - // // Produces: // - application/json // @@ -784,9 +781,6 @@ func LinkCheck(w http.ResponseWriter, r *http.Request) { // // Returns the summary of the message Link checker. // - // NOTE: This feature is currently in beta and is documented for reference only. - // Please do not integrate with it (yet) as there may be changes. - // // Produces: // - application/json // diff --git a/server/ui-src/components/message/HTMLCheck.vue b/server/ui-src/components/message/HTMLCheck.vue index 805cc1c37..f19482660 100644 --- a/server/ui-src/components/message/HTMLCheck.vue +++ b/server/ui-src/components/message/HTMLCheck.vue @@ -476,10 +476,6 @@ export default {
-

- HTML check is currently in beta. Constructive feedback is welcome via - GitHub. -

diff --git a/server/ui-src/components/message/LinkCheck.vue b/server/ui-src/components/message/LinkCheck.vue index 5677f68af..1df405e6c 100644 --- a/server/ui-src/components/message/LinkCheck.vue +++ b/server/ui-src/components/message/LinkCheck.vue @@ -247,11 +247,6 @@ export default {

-

- Link check is currently in beta. Constructive feedback is welcome via - GitHub. -

-
Follow HTTP redirects (status 301 & 302)
-

- Link check is currently in beta. Constructive feedback is welcome via - GitHub. -

diff --git a/server/ui/api/v1/swagger.json b/server/ui/api/v1/swagger.json index c991ee001..b092b3c70 100644 --- a/server/ui/api/v1/swagger.json +++ b/server/ui/api/v1/swagger.json @@ -124,7 +124,7 @@ }, "/api/v1/message/{ID}/html-check": { "get": { - "description": "Returns the summary of the message HTML checker.\n\nNOTE: This feature is currently in beta and is documented for reference only.\nPlease do not integrate with it (yet) as there may be changes.", + "description": "Returns the summary of the message HTML checker.", "produces": [ "application/json" ], @@ -161,7 +161,7 @@ }, "/api/v1/message/{ID}/link-check": { "get": { - "description": "Returns the summary of the message Link checker.\n\nNOTE: This feature is currently in beta and is documented for reference only.\nPlease do not integrate with it (yet) as there may be changes.", + "description": "Returns the summary of the message Link checker.", "produces": [ "application/json" ], From 8da8a1ad6b917e3e6367669bb2970c8fe5a95983 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sun, 14 Apr 2024 12:36:45 +1200 Subject: [PATCH 04/16] Chore: Update API documentation regarding date/time searches & timezones --- server/apiv1/api.go | 11 ++++++++--- server/ui/api/v1/swagger.json | 12 +++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/server/apiv1/api.go b/server/apiv1/api.go index 700721503..977290cfe 100644 --- a/server/apiv1/api.go +++ b/server/apiv1/api.go @@ -84,7 +84,7 @@ func Search(w http.ResponseWriter, r *http.Request) { // // # Search messages // - // Returns the latest messages matching a search. + // Returns messages matching [a search](https://mailpit.axllent.org/docs/usage/search-filters/), sorted by received date (descending). // // Produces: // - application/json @@ -111,7 +111,7 @@ func Search(w http.ResponseWriter, r *http.Request) { // default: 50 // + name: tz // in: query - // description: Timezone for `before:` & `after:` queries, eg: "Pacific/Auckland" + // description: [Timezone identifier](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) used specifically for `before:` & `after:` searches (eg: "Pacific/Auckland"). // required: false // type: string // @@ -155,7 +155,7 @@ func DeleteSearch(w http.ResponseWriter, r *http.Request) { // // # Delete messages by search // - // Delete all messages matching a search. + // Delete all messages matching [a search](https://mailpit.axllent.org/docs/usage/search-filters/). // // Produces: // - application/json @@ -168,6 +168,11 @@ func DeleteSearch(w http.ResponseWriter, r *http.Request) { // description: Search query // required: true // type: string + // + name: tz + // in: query + // description: [Timezone identifier](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) used specifically for `before:` & `after:` searches (eg: "Pacific/Auckland"). + // required: false + // type: string // // Responses: // 200: OKResponse diff --git a/server/ui/api/v1/swagger.json b/server/ui/api/v1/swagger.json index b092b3c70..984850e25 100644 --- a/server/ui/api/v1/swagger.json +++ b/server/ui/api/v1/swagger.json @@ -516,7 +516,7 @@ }, "/api/v1/search": { "get": { - "description": "Returns the latest messages matching a search.", + "description": "Returns messages matching [a search](https://mailpit.axllent.org/docs/usage/search-filters/), sorted by received date (descending).", "produces": [ "application/json" ], @@ -553,7 +553,7 @@ }, { "type": "string", - "description": "Timezone for `before:` \u0026 `after:` queries, eg: \"Pacific/Auckland\"", + "description": "[Timezone identifier](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) used specifically for `before:` \u0026 `after:` searches (eg: \"Pacific/Auckland\").", "name": "tz", "in": "query" } @@ -568,7 +568,7 @@ } }, "delete": { - "description": "Delete all messages matching a search.", + "description": "Delete all messages matching [a search](https://mailpit.axllent.org/docs/usage/search-filters/).", "produces": [ "application/json" ], @@ -588,6 +588,12 @@ "name": "query", "in": "query", "required": true + }, + { + "type": "string", + "description": "[Timezone identifier](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) used specifically for `before:` \u0026 `after:` searches (eg: \"Pacific/Auckland\").", + "name": "tz", + "in": "query" } ], "responses": { From 7f430d3a457d75d08082a988650aca6f2cae9f8d Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sun, 14 Apr 2024 21:53:30 +1200 Subject: [PATCH 05/16] Chore: Replace disintegration/imaging with kovidgoyal/imaging to fix CVE-2023-36308 This also bumps the minimum Go version to 1.21.0 --- go.mod | 6 ++++-- go.sum | 17 ++++++++++++++--- server/apiv1/thumbnails.go | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 279862c08..5d23f9244 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,19 @@ module github.com/axllent/mailpit -go 1.20 +go 1.21.0 + +toolchain go1.22.1 require ( github.com/PuerkitoBio/goquery v1.9.1 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de github.com/axllent/semver v0.0.1 - github.com/disintegration/imaging v1.6.2 github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket v1.5.1 github.com/jhillyerd/enmime v1.2.0 github.com/klauspost/compress v1.17.8 + github.com/kovidgoyal/imaging v1.6.3 github.com/leporo/sqlf v1.4.0 github.com/lithammer/shortuuid/v4 v4.0.0 github.com/mhale/smtpd v0.8.2 diff --git a/go.sum b/go.sum index 10addbcfc..c95a443e9 100644 --- a/go.sum +++ b/go.sum @@ -17,17 +17,17 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= -github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= +github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14= github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 h1:4gjrh/PN2MuWCCElk8/I4OCKRKWCCo2zEct3VKCbibU= github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -48,6 +48,8 @@ github.com/jhillyerd/enmime v1.2.0 h1:dIu1IPEymQgoT2dzuB//ttA/xcV40NMPpQtmd4wslH github.com/jhillyerd/enmime v1.2.0/go.mod h1:FRFuUPCLh8PByQv+8xRcLO9QHqaqTqreYhopv5eyk4I= github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/kovidgoyal/imaging v1.6.3 h1:iNPpv7ygiaB/NOztc6APMT7yr9UwBS+rOZwIbAdtyY8= +github.com/kovidgoyal/imaging v1.6.3/go.mod h1:sHvcLOOVhJuto2IoNdPLEqnAUoL5ZfHEF0PpNH+882g= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -67,6 +69,7 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mhale/smtpd v0.8.2 h1:rHKOMHeFoDvcq8Na9ErCbNcjlWTSyGtznOmJpWsOzuc= github.com/mhale/smtpd v0.8.2/go.mod h1:MQl+y2hwIEQCXtNhe5+55n0GZOjSmeqORDIXbqUL3x4= github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= @@ -110,6 +113,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6BY= github.com/tg123/go-htpasswd v1.2.2/go.mod h1:FcIrK0J+6zptgVwK1JDlqyajW/1B4PtuJ/FLWl7nx8A= github.com/unrolled/render v1.0.3/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM= @@ -126,12 +130,12 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -177,6 +181,7 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -187,9 +192,13 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk= +modernc.org/cc/v4 v4.20.0/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ= modernc.org/ccgo/v4 v4.16.0 h1:ofwORa6vx2FMm0916/CkZjpFPSR70VwTjUCe2Eg5BnA= +modernc.org/ccgo/v4 v4.16.0/go.mod h1:dkNyWIjFrVIZ68DTo36vHK+6/ShBn4ysU61So6PIqCI= 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.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw= +modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU= modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b h1:BnN1t+pb1cy61zbvSUV7SeI0PwosMhlAEi/vBY4qxp8= modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4= modernc.org/libc v1.49.3 h1:j2MRCRdwJI2ls/sGbeSk0t2bypOG/uvPZUsGQFDulqg= @@ -199,7 +208,9 @@ modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWP modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E= modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= +modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc= +modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss= modernc.org/sqlite v1.29.6 h1:0lOXGrycJPptfHDuohfYgNqoe4hu+gYuN/pKgY5XjS4= modernc.org/sqlite v1.29.6/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U= modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= diff --git a/server/apiv1/thumbnails.go b/server/apiv1/thumbnails.go index a53190c10..136713831 100644 --- a/server/apiv1/thumbnails.go +++ b/server/apiv1/thumbnails.go @@ -12,7 +12,7 @@ import ( "github.com/axllent/mailpit/internal/logger" "github.com/axllent/mailpit/internal/storage" - "github.com/disintegration/imaging" + "github.com/kovidgoyal/imaging" "github.com/gorilla/mux" "github.com/jhillyerd/enmime" ) From 7085690e3db57ffbfd49db633aefa5094efb7b88 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Tue, 16 Apr 2024 22:15:09 +1200 Subject: [PATCH 06/16] Only compile SMTPRelayConfig.AllowedRecipients if set --- config/config.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index 019b9f49a..dea0b3bca 100644 --- a/config/config.go +++ b/config/config.go @@ -501,9 +501,8 @@ func validateRelayConfig() error { logger.Log().Infof("[smtp] enabling message relaying via %s:%d", SMTPRelayConfig.Host, SMTPRelayConfig.Port) - allowlistRegexp, err := regexp.Compile(SMTPRelayConfig.AllowedRecipients) - if SMTPRelayConfig.AllowedRecipients != "" { + allowlistRegexp, err := regexp.Compile(SMTPRelayConfig.AllowedRecipients) if err != nil { return fmt.Errorf("[smtp] failed to compile relay recipient allowlist regexp: %s", err.Error()) } From 96c33b12337fb1d7254568327e9cd53cbdabd45b Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Thu, 18 Apr 2024 18:04:43 +1200 Subject: [PATCH 07/16] Chore: Auto-rotate thumbnail images based on exif data --- server/apiv1/thumbnails.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/apiv1/thumbnails.go b/server/apiv1/thumbnails.go index 136713831..3d76fc8f1 100644 --- a/server/apiv1/thumbnails.go +++ b/server/apiv1/thumbnails.go @@ -12,9 +12,9 @@ import ( "github.com/axllent/mailpit/internal/logger" "github.com/axllent/mailpit/internal/storage" - "github.com/kovidgoyal/imaging" "github.com/gorilla/mux" "github.com/jhillyerd/enmime" + "github.com/kovidgoyal/imaging" ) var ( @@ -74,7 +74,7 @@ func Thumbnail(w http.ResponseWriter, r *http.Request) { buf := bytes.NewBuffer(a.Content) - img, err := imaging.Decode(buf) + img, err := imaging.Decode(buf, imaging.AutoOrientation(true)) if err != nil { // it's not an image, return default logger.Log().Warnf("[image] %s", err.Error()) From 5ad76cb3a79bcdf1caa3d6bdd35691e51838b959 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Thu, 18 Apr 2024 19:32:09 +1200 Subject: [PATCH 08/16] Fix typo --- config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.go b/config/config.go index dea0b3bca..2993753e2 100644 --- a/config/config.go +++ b/config/config.go @@ -456,7 +456,7 @@ func parseRelayConfig(c string) error { // DEPRECATED 2024/03/12 if SMTPRelayConfig.RecipientAllowlist != "" { - logger.Log().Warn("[smtp] relay 'recipient-allowlist' is deprecated, use 'allowed_recipients' instead") + logger.Log().Warn("[smtp] relay 'recipient-allowlist' is deprecated, use 'allowed-recipients' instead") if SMTPRelayConfig.AllowedRecipients == "" { SMTPRelayConfig.AllowedRecipients = SMTPRelayConfig.RecipientAllowlist } From 072db266be890994c66b3a613886331bc138551a Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 20 Apr 2024 10:28:12 +1200 Subject: [PATCH 09/16] Fix: Add delay to close database on fatal exit (#280) --- cmd/root.go | 5 +++-- internal/storage/database.go | 8 +++++++- server/server.go | 12 ++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index b6e2bc1e4..eea0f595a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -34,14 +34,15 @@ Documentation: os.Exit(1) } if err := storage.InitDB(); err != nil { - logger.Log().Error(err.Error()) + logger.Log().Fatal(err.Error()) os.Exit(1) } go server.Listen() if err := smtpd.Listen(); err != nil { - logger.Log().Error(err.Error()) + storage.Close() + logger.Log().Fatal(err.Error()) os.Exit(1) } }, diff --git a/internal/storage/database.go b/internal/storage/database.go index 699aff9ad..71db4125b 100644 --- a/internal/storage/database.go +++ b/internal/storage/database.go @@ -127,14 +127,20 @@ func tenant(table string) string { return fmt.Sprintf("%s%s", config.TenantID, table) } -// Close will close the database, and delete if a temporary table +// Close will close the database, and delete if temporary func Close() { + // on a fatal exit (eg: ports blocked), allow Mailpit to run migration tasks before closing the DB + time.Sleep(200 * time.Millisecond) + if db != nil { if err := db.Close(); err != nil { logger.Log().Warn("[db] error closing database, ignoring") } } + // allow SQLite to finish closing DB & write WAL logs if local + time.Sleep(100 * time.Millisecond) + if dbIsTemp && isFile(dbFile) { logger.Log().Debugf("[db] deleting temporary file %s", dbFile) if err := os.Remove(dbFile); err != nil { diff --git a/server/server.go b/server/server.go index 04713957c..60efd8f9f 100644 --- a/server/server.go +++ b/server/server.go @@ -105,11 +105,19 @@ func Listen() { } if config.UITLSCert != "" && config.UITLSKey != "" { + if err := server.ListenAndServeTLS(config.UITLSCert, config.UITLSKey); err != nil { + storage.Close() + logger.Log().Fatal(err) + } + logger.Log().Infof("[http] accessible via https://%s%s", logger.CleanHTTPIP(config.HTTPListen), config.Webroot) - logger.Log().Fatal(server.ListenAndServeTLS(config.UITLSCert, config.UITLSKey)) } else { + if err := server.ListenAndServe(); err != nil { + storage.Close() + logger.Log().Fatal(err) + } + logger.Log().Infof("[http] accessible via http://%s%s", logger.CleanHTTPIP(config.HTTPListen), config.Webroot) - logger.Log().Fatal(server.ListenAndServe()) } } From 18e476873944ad9b37c5f990da2f963151f69a20 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 20 Apr 2024 14:40:51 +1200 Subject: [PATCH 10/16] Reduce stale issue duration --- .github/workflows/close-stale-issues.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/close-stale-issues.yml b/.github/workflows/close-stale-issues.yml index 82088dd21..9e757d6d0 100644 --- a/.github/workflows/close-stale-issues.yml +++ b/.github/workflows/close-stale-issues.yml @@ -12,12 +12,12 @@ jobs: steps: - uses: actions/stale@v9.0.0 with: - days-before-issue-stale: 14 - days-before-issue-close: 7 + days-before-issue-stale: 7 + days-before-issue-close: 3 exempt-issue-labels: "enhancement,bug,javascript,docker" stale-issue-label: "stale" - stale-issue-message: "This issue is stale because it has been open for 14 days with no activity." - close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale." + stale-issue-message: "This issue has been marked as stale because it has been open for 7 days with no activity." + close-issue-message: "This issue was closed because there has been no activity since being marked as stale." days-before-pr-stale: -1 days-before-pr-close: -1 repo-token: ${{ secrets.GITHUB_TOKEN }} From cbcf0be1a28b8218d7fc0f3f61921c4d1c691ccd Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 20 Apr 2024 23:42:36 +1200 Subject: [PATCH 11/16] Feature: Option to auto relay for matching recipient expression only (#274) --- cmd/root.go | 8 +++++--- config/config.go | 35 ++++++++++++++++++++++++++++------- server/apiv1/api.go | 20 ++++++++++++-------- server/smtpd/relay.go | 41 +++++++++++++++++++++++++++++++++++++++++ server/smtpd/smtp.go | 34 +--------------------------------- server/smtpd/smtpd.go | 10 ++-------- 6 files changed, 89 insertions(+), 59 deletions(-) create mode 100644 server/smtpd/relay.go diff --git a/cmd/root.go b/cmd/root.go index eea0f595a..631e6ff25 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -116,8 +116,9 @@ func init() { rootCmd.Flags().BoolVar(&smtpd.DisableReverseDNS, "smtp-disable-rdns", smtpd.DisableReverseDNS, "Disable SMTP reverse DNS lookups") // SMTP relay - rootCmd.Flags().StringVar(&config.SMTPRelayConfigFile, "smtp-relay-config", config.SMTPRelayConfigFile, "SMTP configuration file to allow releasing messages") - rootCmd.Flags().BoolVar(&config.SMTPRelayAllIncoming, "smtp-relay-all", config.SMTPRelayAllIncoming, "Relay all incoming messages via external SMTP server (caution!)") + rootCmd.Flags().StringVar(&config.SMTPRelayConfigFile, "smtp-relay-config", config.SMTPRelayConfigFile, "SMTP relay configuration file to allow releasing messages") + rootCmd.Flags().BoolVar(&config.SMTPRelayAll, "smtp-relay-all", config.SMTPRelayAll, "Auto-relay all new messages via external SMTP server (caution!)") + rootCmd.Flags().StringVar(&config.SMTPRelayMatching, "smtp-relay-matching", config.SMTPRelayMatching, "Auto-relay new messages to only matching recipients (regular expression)") // POP3 server rootCmd.Flags().StringVar(&config.POP3Listen, "pop3", config.POP3Listen, "POP3 server bind interface and port") @@ -253,8 +254,9 @@ func initConfigFromEnv() { // SMTP relay config.SMTPRelayConfigFile = os.Getenv("MP_SMTP_RELAY_CONFIG") if getEnabledFromEnv("MP_SMTP_RELAY_ALL") { - config.SMTPRelayAllIncoming = true + config.SMTPRelayAll = true } + config.SMTPRelayMatching = os.Getenv("MP_SMTP_RELAY_MATCHING") config.SMTPRelayConfig = config.SMTPRelayConfigStruct{} config.SMTPRelayConfig.Host = os.Getenv("MP_SMTP_RELAY_HOST") if len(os.Getenv("MP_SMTP_RELAY_PORT")) > 0 { diff --git a/config/config.go b/config/config.go index 2993753e2..906e190dd 100644 --- a/config/config.go +++ b/config/config.go @@ -114,9 +114,15 @@ var ( // ReleaseEnabled is whether message releases are enabled, requires a valid SMTPRelayConfigFile ReleaseEnabled = false - // SMTPRelayAllIncoming is whether to relay all incoming messages via pre-configured SMTP server. + // SMTPRelayAll is whether to relay all incoming messages via pre-configured SMTP server. // Use with extreme caution! - SMTPRelayAllIncoming = false + SMTPRelayAll = false + + // SMTPRelayMatching if set, will auto-release to recipients matching this regular expression + SMTPRelayMatching string + + // SMTPRelayMatchingRegexp is the compiled version of SMTPRelayMatching + SMTPRelayMatchingRegexp *regexp.Regexp // POP3Listen address - if set then Mailpit will start the POP3 server and listen on this address POP3Listen = "[::]:1110" @@ -405,7 +411,7 @@ func VerifyConfig() error { } SMTPAllowedRecipientsRegexp = restrictRegexp - logger.Log().Infof("[smtp] only allowing recipients matching the following regexp: %s", SMTPAllowedRecipients) + logger.Log().Infof("[smtp] only allowing recipients matching regexp: %s", SMTPAllowedRecipients) } if err := parseRelayConfig(SMTPRelayConfigFile); err != nil { @@ -417,13 +423,28 @@ func VerifyConfig() error { return err } - if !ReleaseEnabled && SMTPRelayAllIncoming { - return errors.New("[smtp] relay config must be set to relay all messages") + if !ReleaseEnabled && SMTPRelayAll || !ReleaseEnabled && SMTPRelayMatching != "" { + return errors.New("[relay] a relay configuration must be set to auto-relay any messages") + } + + if SMTPRelayMatching != "" { + if SMTPRelayAll { + logger.Log().Warnf("[relay] ignoring smtp-relay-matching when smtp-relay-all is enabled") + } else { + restrictRegexp, err := regexp.Compile(SMTPRelayMatching) + if err != nil { + return fmt.Errorf("[relay] failed to compile smtp-relay-matching regexp: %s", err.Error()) + } + + SMTPRelayMatchingRegexp = restrictRegexp + logger.Log().Infof("[relay] auto-relaying new messages to recipients matching \"%s\" via %s:%d", + SMTPRelayMatching, SMTPRelayConfig.Host, SMTPRelayConfig.Port) + } } - if SMTPRelayAllIncoming { + if SMTPRelayAll { // this deserves a warning - logger.Log().Warnf("[smtp] enabling automatic relay of all new messages via %s:%d", SMTPRelayConfig.Host, SMTPRelayConfig.Port) + logger.Log().Warnf("[relay] auto-relaying all new messages via %s:%d", SMTPRelayConfig.Host, SMTPRelayConfig.Port) } return nil diff --git a/server/apiv1/api.go b/server/apiv1/api.go index 977290cfe..24a3a6647 100644 --- a/server/apiv1/api.go +++ b/server/apiv1/api.go @@ -640,13 +640,7 @@ func ReleaseMessage(w http.ResponseWriter, r *http.Request) { return } - tos := data.To - if len(tos) == 0 { - httpError(w, "No valid addresses found") - return - } - - for _, to := range tos { + for _, to := range data.To { address, err := mail.ParseAddress(to) if err != nil { @@ -660,6 +654,11 @@ func ReleaseMessage(w http.ResponseWriter, r *http.Request) { } } + if len(data.To) == 0 { + httpError(w, "No valid addresses found") + return + } + reader := bytes.NewReader(msg) m, err := mail.ReadMessage(reader) if err != nil { @@ -673,6 +672,11 @@ func ReleaseMessage(w http.ResponseWriter, r *http.Request) { return } + if len(froms) == 0 { + httpError(w, "No From header found") + return + } + from := froms[0].Address // if sender is used, then change from to the sender @@ -716,7 +720,7 @@ func ReleaseMessage(w http.ResponseWriter, r *http.Request) { return } - if err := smtpd.Send(from, tos, msg); err != nil { + if err := smtpd.Send(from, data.To, msg); err != nil { logger.Log().Errorf("[smtp] error sending message: %s", err.Error()) httpError(w, "SMTP error: "+err.Error()) return diff --git a/server/smtpd/relay.go b/server/smtpd/relay.go new file mode 100644 index 000000000..534b2b7fc --- /dev/null +++ b/server/smtpd/relay.go @@ -0,0 +1,41 @@ +package smtpd + +import ( + "strings" + + "github.com/axllent/mailpit/config" + "github.com/axllent/mailpit/internal/logger" +) + +func autoRelayMessage(from string, to []string, data *[]byte) { + if len(to) == 0 { + return + } + + if config.SMTPRelayAll { + if err := Send(from, to, *data); err != nil { + logger.Log().Errorf("[smtp] error relaying message: %s", err.Error()) + } else { + logger.Log().Debugf("[smtp] auto-relay message to %s from %s via %s:%d", + strings.Join(to, ", "), from, config.SMTPRelayConfig.Host, config.SMTPRelayConfig.Port) + } + } else if config.SMTPRelayMatchingRegexp != nil { + filtered := []string{} + for _, t := range to { + if config.SMTPRelayMatchingRegexp.MatchString(t) { + filtered = append(filtered, t) + } + } + + if len(filtered) == 0 { + return + } + + if err := Send(from, filtered, *data); err != nil { + logger.Log().Errorf("[smtp] error relaying message: %s", err.Error()) + } else { + logger.Log().Debugf("[smtp] auto-relay message to %s from %s via %s:%d", + strings.Join(filtered, ", "), from, config.SMTPRelayConfig.Host, config.SMTPRelayConfig.Port) + } + } +} diff --git a/server/smtpd/smtp.go b/server/smtpd/smtp.go index 863c25699..5ab0e8f94 100644 --- a/server/smtpd/smtp.go +++ b/server/smtpd/smtp.go @@ -4,46 +4,14 @@ import ( "crypto/tls" "errors" "fmt" - "net/mail" "net/smtp" "github.com/axllent/mailpit/config" "github.com/axllent/mailpit/internal/logger" ) -func allowedRecipients(to []string) []string { - if config.SMTPRelayConfig.AllowedRecipientsRegexp == nil { - return to - } - - var ar []string - - for _, recipient := range to { - address, err := mail.ParseAddress(recipient) - - if err != nil { - logger.Log().Warnf("ignoring invalid email address: %s", recipient) - continue - } - - if !config.SMTPRelayConfig.AllowedRecipientsRegexp.MatchString(address.Address) { - logger.Log().Debugf("[smtp] not allowed to relay to %s: does not match the allowlist %s", recipient, config.SMTPRelayConfig.AllowedRecipients) - } else { - ar = append(ar, recipient) - } - } - - return ar -} - // Send will connect to a pre-configured SMTP server and send a message to one or more recipients. func Send(from string, to []string, msg []byte) error { - recipients := allowedRecipients(to) - - if len(recipients) == 0 { - return errors.New("no valid recipients") - } - addr := fmt.Sprintf("%s:%d", config.SMTPRelayConfig.Host, config.SMTPRelayConfig.Port) c, err := smtp.Dial(addr) @@ -75,7 +43,7 @@ func Send(from string, to []string, msg []byte) error { return fmt.Errorf("error response to MAIL command: %s", err.Error()) } - for _, addr := range recipients { + for _, addr := range to { if err = c.Rcpt(addr); err != nil { logger.Log().Warnf("error response to RCPT command for %s: %s", addr, err.Error()) } diff --git a/server/smtpd/smtpd.go b/server/smtpd/smtpd.go index 63786e597..169b5e587 100644 --- a/server/smtpd/smtpd.go +++ b/server/smtpd/smtpd.go @@ -74,14 +74,8 @@ func mailHandler(origin net.Addr, from string, to []string, data []byte) error { } } - // if enabled, this will route the email 1:1 through to the preconfigured smtp server - if config.SMTPRelayAllIncoming { - if err := Send(from, to, data); err != nil { - logger.Log().Warnf("[smtp] error relaying message: %s", err.Error()) - } else { - logger.Log().Debugf("[smtp] relayed message from %s via %s:%d", from, config.SMTPRelayConfig.Host, config.SMTPRelayConfig.Port) - } - } + // if enabled, this may conditionally relay the email through to the preconfigured smtp server + autoRelayMessage(from, to, &data) // build array of all addresses in the header to compare to the []to array emails, hasBccHeader := scanAddressesInHeader(msg.Header) From be67a35e03fd9a278d4715a7c342d1bcc8f69fbe Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 20 Apr 2024 23:58:05 +1200 Subject: [PATCH 12/16] Minor UI dropdown tweak --- server/ui-src/assets/styles.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/server/ui-src/assets/styles.scss b/server/ui-src/assets/styles.scss index cdd22d831..29b10afa9 100644 --- a/server/ui-src/assets/styles.scss +++ b/server/ui-src/assets/styles.scss @@ -357,14 +357,6 @@ body.blur { } } -#ReleaseModal { - .form-control.dropdown { - div { - @extend .form-control; - } - } -} - /* PrismJS 1.29.0 - modified! https://prismjs.com/download.html#themes=prism-coy&languages=markup+css */ code[class*="language-"], From 3354370041b2b186148b95a1a3b631fbf9dcad5a Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sun, 21 Apr 2024 00:03:55 +1200 Subject: [PATCH 13/16] Chore: Update Go dependencies --- go.mod | 4 ++-- go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 5d23f9244..2e79060af 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/PuerkitoBio/goquery v1.9.1 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de github.com/axllent/semver v0.0.1 - github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 + github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2 github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket v1.5.1 github.com/jhillyerd/enmime v1.2.0 @@ -28,7 +28,7 @@ require ( golang.org/x/text v0.14.0 golang.org/x/time v0.5.0 gopkg.in/yaml.v3 v3.0.1 - modernc.org/sqlite v1.29.6 + modernc.org/sqlite v1.29.8 ) require ( diff --git a/go.sum b/go.sum index c95a443e9..a2f3e0bdf 100644 --- a/go.sum +++ b/go.sum @@ -24,10 +24,10 @@ github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14= -github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 h1:4gjrh/PN2MuWCCElk8/I4OCKRKWCCo2zEct3VKCbibU= -github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2 h1:yEt5djSYb4iNtmV9iJGVday+i4e9u6Mrn5iP64HH5QM= +github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= +github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo= +github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -211,8 +211,8 @@ modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc= modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss= -modernc.org/sqlite v1.29.6 h1:0lOXGrycJPptfHDuohfYgNqoe4hu+gYuN/pKgY5XjS4= -modernc.org/sqlite v1.29.6/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U= +modernc.org/sqlite v1.29.8 h1:nGKglNx9K5v0As+zF0/Gcl1kMkmaU1XynYyq92PbsC8= +modernc.org/sqlite v1.29.8/go.mod h1:lQPm27iqa4UNZpmr4Aor0MH0HkCLbt1huYDfWylLZFk= modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= From cfdeda68ddc0a2fd50071ef4c7a86d8cf1f2cd7d Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sun, 21 Apr 2024 00:07:11 +1200 Subject: [PATCH 14/16] Chore: Update node dependencies --- package-lock.json | 165 +++++++++++++++++++++++----------------------- 1 file changed, 81 insertions(+), 84 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2be1bf893..b442b8546 100644 --- a/package-lock.json +++ b/package-lock.json @@ -937,49 +937,49 @@ "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" }, "node_modules/@vue/compiler-core": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz", - "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.23.tgz", + "integrity": "sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==", "dependencies": { - "@babel/parser": "^7.23.9", - "@vue/shared": "3.4.21", + "@babel/parser": "^7.24.1", + "@vue/shared": "3.4.23", "entities": "^4.5.0", "estree-walker": "^2.0.2", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz", - "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.23.tgz", + "integrity": "sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==", "dependencies": { - "@vue/compiler-core": "3.4.21", - "@vue/shared": "3.4.21" + "@vue/compiler-core": "3.4.23", + "@vue/shared": "3.4.23" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz", - "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==", - "dependencies": { - "@babel/parser": "^7.23.9", - "@vue/compiler-core": "3.4.21", - "@vue/compiler-dom": "3.4.21", - "@vue/compiler-ssr": "3.4.21", - "@vue/shared": "3.4.21", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.23.tgz", + "integrity": "sha512-fSDTKTfzaRX1kNAUiaj8JB4AokikzStWgHooMhaxyjZerw624L+IAP/fvI4ZwMpwIh8f08PVzEnu4rg8/Npssw==", + "dependencies": { + "@babel/parser": "^7.24.1", + "@vue/compiler-core": "3.4.23", + "@vue/compiler-dom": "3.4.23", + "@vue/compiler-ssr": "3.4.23", + "@vue/shared": "3.4.23", "estree-walker": "^2.0.2", - "magic-string": "^0.30.7", - "postcss": "^8.4.35", - "source-map-js": "^1.0.2" + "magic-string": "^0.30.8", + "postcss": "^8.4.38", + "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz", - "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.23.tgz", + "integrity": "sha512-hb6Uj2cYs+tfqz71Wj6h3E5t6OKvb4MVcM2Nl5i/z1nv1gjEhw+zYaNOV+Xwn+SSN/VZM0DgANw5TuJfxfezPg==", "dependencies": { - "@vue/compiler-dom": "3.4.21", - "@vue/shared": "3.4.21" + "@vue/compiler-dom": "3.4.23", + "@vue/shared": "3.4.23" } }, "node_modules/@vue/devtools-api": { @@ -988,48 +988,48 @@ "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==" }, "node_modules/@vue/reactivity": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz", - "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.23.tgz", + "integrity": "sha512-GlXR9PL+23fQ3IqnbSQ8OQKLodjqCyoCrmdLKZk3BP7jN6prWheAfU7a3mrltewTkoBm+N7qMEb372VHIkQRMQ==", "dependencies": { - "@vue/shared": "3.4.21" + "@vue/shared": "3.4.23" } }, "node_modules/@vue/runtime-core": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz", - "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.23.tgz", + "integrity": "sha512-FeQ9MZEXoFzFkFiw9MQQ/FWs3srvrP+SjDKSeRIiQHIhtkzoj0X4rWQlRNHbGuSwLra6pMyjAttwixNMjc/xLw==", "dependencies": { - "@vue/reactivity": "3.4.21", - "@vue/shared": "3.4.21" + "@vue/reactivity": "3.4.23", + "@vue/shared": "3.4.23" } }, "node_modules/@vue/runtime-dom": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz", - "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.23.tgz", + "integrity": "sha512-RXJFwwykZWBkMiTPSLEWU3kgVLNAfActBfWFlZd0y79FTUxexogd0PLG4HH2LfOktjRxV47Nulygh0JFXe5f9A==", "dependencies": { - "@vue/runtime-core": "3.4.21", - "@vue/shared": "3.4.21", + "@vue/runtime-core": "3.4.23", + "@vue/shared": "3.4.23", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz", - "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.23.tgz", + "integrity": "sha512-LDwGHtnIzvKFNS8dPJ1SSU5Gvm36p2ck8wCZc52fc3k/IfjKcwCyrWEf0Yag/2wTFUBXrqizfhK9c/mC367dXQ==", "dependencies": { - "@vue/compiler-ssr": "3.4.21", - "@vue/shared": "3.4.21" + "@vue/compiler-ssr": "3.4.23", + "@vue/shared": "3.4.23" }, "peerDependencies": { - "vue": "3.4.21" + "vue": "3.4.23" } }, "node_modules/@vue/shared": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz", - "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==" + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.23.tgz", + "integrity": "sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==" }, "node_modules/anymatch": { "version": "3.1.3", @@ -1360,9 +1360,9 @@ } }, "node_modules/core-js-pure": { - "version": "3.36.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.36.1.tgz", - "integrity": "sha512-NXCvHvSVYSrewP0L5OhltzXeWFJLo2AL2TYnj6iLV3Bw8mM62wAQMNgUCRI6EBu6hVVpbCxmOPlxh1Ikw2PfUA==", + "version": "3.37.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.37.0.tgz", + "integrity": "sha512-d3BrpyFr5eD4KcbRvQ3FTUx/KWmaDesr7+a3+1+P46IUnNoEt+oiLijPINZMEon7w9oGkIINWxrBAU9DEciwFQ==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -2350,14 +2350,11 @@ } }, "node_modules/magic-string": { - "version": "0.30.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.9.tgz", - "integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==", + "version": "0.30.10", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", + "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" - }, - "engines": { - "node": ">=12" } }, "node_modules/marked": { @@ -2485,9 +2482,9 @@ "optional": true }, "node_modules/node-abi": { - "version": "3.57.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.57.0.tgz", - "integrity": "sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==", + "version": "3.60.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.60.0.tgz", + "integrity": "sha512-zcGgwoXbzw9NczqbGzAWL/ToDYAxv1V8gL1D67ClbdkIfeeDBbY0GelZtC25ayLvVjr2q2cloHeQV1R0QAWqRQ==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -2702,9 +2699,9 @@ } }, "node_modules/qs": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz", - "integrity": "sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==", + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz", + "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==", "dependencies": { "side-channel": "^1.0.6" }, @@ -3511,16 +3508,16 @@ } }, "node_modules/swagger-client": { - "version": "3.26.8", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.26.8.tgz", - "integrity": "sha512-NzvHWpWLeNVJAFrH+cRyzCzYrKNYG5AuaTDwaL/sqHRDMxjj8SN9Ua84EbfsUqrUnI50sW270dgQphp0TorAcg==", + "version": "3.27.0", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.27.0.tgz", + "integrity": "sha512-DyuHrUzHxysUbhsCgPfsWKH3EULDwjD7jkRl0SHvXAd6gtZS3e3RHUZjDBA4cbrcgDiIuC7Ju/YIOkE+rKCutw==", "dependencies": { "@babel/runtime-corejs3": "^7.22.15", - "@swagger-api/apidom-core": ">=0.99.0 <1.0.0", + "@swagger-api/apidom-core": ">=0.99.1 <1.0.0", "@swagger-api/apidom-error": ">=0.99.0 <1.0.0", - "@swagger-api/apidom-json-pointer": ">=0.99.0 <1.0.0", - "@swagger-api/apidom-ns-openapi-3-1": ">=0.99.0 <1.0.0", - "@swagger-api/apidom-reference": ">=0.99.0 <1.0.0", + "@swagger-api/apidom-json-pointer": ">=0.99.1 <1.0.0", + "@swagger-api/apidom-ns-openapi-3-1": ">=0.99.1 <1.0.0", + "@swagger-api/apidom-reference": ">=0.99.1 <1.0.0", "cookie": "~0.6.0", "deepmerge": "~4.3.0", "fast-json-patch": "^3.0.0-1", @@ -3782,15 +3779,15 @@ "peer": true }, "node_modules/vue": { - "version": "3.4.21", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz", - "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==", + "version": "3.4.23", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.23.tgz", + "integrity": "sha512-X1y6yyGJ28LMUBJ0k/qIeKHstGd+BlWQEOT40x3auJFTmpIhpbKLgN7EFsqalnJXq1Km5ybDEsp6BhuWKciUDg==", "dependencies": { - "@vue/compiler-dom": "3.4.21", - "@vue/compiler-sfc": "3.4.21", - "@vue/runtime-dom": "3.4.21", - "@vue/server-renderer": "3.4.21", - "@vue/shared": "3.4.21" + "@vue/compiler-dom": "3.4.23", + "@vue/compiler-sfc": "3.4.23", + "@vue/runtime-dom": "3.4.23", + "@vue/server-renderer": "3.4.23", + "@vue/shared": "3.4.23" }, "peerDependencies": { "typescript": "*" @@ -3810,9 +3807,9 @@ } }, "node_modules/vue-router": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.0.tgz", - "integrity": "sha512-dqUcs8tUeG+ssgWhcPbjHvazML16Oga5w34uCUmsk7i0BcnskoLGwjpa15fqMr2Fa5JgVBrdL2MEgqz6XZ/6IQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.2.tgz", + "integrity": "sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==", "dependencies": { "@vue/devtools-api": "^6.5.1" }, From c878619484915eca7e86bbc446dc472f8dd12f77 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sun, 21 Apr 2024 00:08:01 +1200 Subject: [PATCH 15/16] Chore: Update caniemail database --- internal/htmlcheck/caniemail-data.json | 184 ++++++++++++------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/internal/htmlcheck/caniemail-data.json b/internal/htmlcheck/caniemail-data.json index 327e51230..448c1833c 100644 --- a/internal/htmlcheck/caniemail-data.json +++ b/internal/htmlcheck/caniemail-data.json @@ -1,6 +1,6 @@ { "api_version":"1.0.4", - "last_update_date":"2024-04-03 12:33:14 +0000", + "last_update_date":"2024-04-19 09:12:53 +0000", "nicenames":{"family":{"gmail":"Gmail","outlook":"Outlook","yahoo":"Yahoo! Mail","apple-mail":"Apple Mail","aol":"AOL","thunderbird":"Mozilla Thunderbird","microsoft":"Microsoft","samsung-email":"Samsung Email","sfr":"SFR","orange":"Orange","protonmail":"ProtonMail","hey":"HEY","mail-ru":"Mail.ru","fastmail":"Fastmail","laposte":"LaPoste.net","t-online-de":"T-online.de","free-fr":"Free.fr","gmx":"GMX","web-de":"WEB.DE","ionos-1and1":"1&1","rainloop":"RainLoop","wp-pl":"WP.pl"},"platform":{"desktop-app":"Desktop","desktop-webmail":"Desktop Webmail","mobile-webmail":"Mobile Webmail","webmail":"Webmail","ios":"iOS","android":"Android","windows":"Windows","macos":"macOS","windows-mail":"Windows Mail","outlook-com":"Outlook.com"},"support":{"supported":"Supported","mitigated":"Partially supported","unsupported":"Not supported","unknown":"Support unknown","mixed":"Mixed support"},"category":{"html":"HTML","css":"CSS","image":"Image formats","others":"Others"}}, "data":[ { @@ -62,7 +62,7 @@ "last_test_date":"2023-12-19", "test_url":"https://www.caniemail.com/tests/css-align-items.html", "test_results_url":"https://app.emailonacid.com/app/acidtest/FvYneb1dhiR4we6rAOf4AC02oFa6ksA0sTWxbEjgmt6Mg/list", - "stats":{"apple-mail":{"macos":{"11":"y","12":"y","13":"y"},"ios":{"11":"y","12":"y","13":"y","14":"y"}},"gmail":{"desktop-webmail":{"2020-12":"n"},"ios":{"2020-12":"n"},"android":{"2020-12":"n"},"mobile-webmail":{"2020-12":"n"}},"orange":{"desktop-webmail":{"2021-02":"y","2021-03":"n"},"ios":{"2021-03":"y"},"android":{"2021-03":"y"}},"outlook":{"windows":{"2007":"n","2010":"n","2013":"n","2016":"n","2019":"n"},"windows-mail":{"2020-12":"n"},"macos":{"2020-12":"y","16.80":"y"},"outlook-com":{"2020-12":"y"},"ios":{"2020-12":"y"},"android":{"4.2048.4":"y"}},"yahoo":{"desktop-webmail":{"2020-12":"n"},"ios":{"2021-03":"n"},"android":{"6.16.2.1519779":"n"}},"aol":{"desktop-webmail":{"2020-12":"n"},"ios":{"2021-03":"n"},"android":{"2021-03":"n"}},"samsung-email":{"android":{"6.1.31.2":"y"}},"sfr":{"desktop-webmail":{"2021-03":"y"},"ios":{"2021-03":"y"},"android":{"2021-03":"y"}},"thunderbird":{"macos":{"2020-12":"y"}},"protonmail":{"desktop-webmail":{"2021-03":"y"},"ios":{"2021-03":"y"},"android":{"2021-03":"y"}},"hey":{"desktop-webmail":{"2021-03":"y"}},"mail-ru":{"desktop-webmail":{"2020-12":"y"}},"fastmail":{"desktop-webmail":{"2021-07":"y"}},"laposte":{"desktop-webmail":{"2021-08":"y #1"}},"gmx":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"y"}},"web-de":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"y"}},"ionos-1and1":{"desktop-webmail":{"2022-06":"y"},"android":{"2022-06":"y"}}}, + "stats":{"apple-mail":{"macos":{"11":"y","12":"y","13":"y"},"ios":{"11":"y","12":"y","13":"y","14":"y"}},"gmail":{"desktop-webmail":{"2020-12":"n"},"ios":{"2020-12":"n"},"android":{"2020-12":"n"},"mobile-webmail":{"2020-12":"n"}},"orange":{"desktop-webmail":{"2021-02":"y","2021-03":"n"},"ios":{"2021-03":"y","2024-04":"n"},"android":{"2021-03":"y","2024-04":"n"}},"outlook":{"windows":{"2007":"n","2010":"n","2013":"n","2016":"n","2019":"n"},"windows-mail":{"2020-12":"n"},"macos":{"2020-12":"y","16.80":"y"},"outlook-com":{"2020-12":"y"},"ios":{"2020-12":"y"},"android":{"4.2048.4":"y"}},"yahoo":{"desktop-webmail":{"2020-12":"n"},"ios":{"2021-03":"n"},"android":{"6.16.2.1519779":"n"}},"aol":{"desktop-webmail":{"2020-12":"n"},"ios":{"2021-03":"n"},"android":{"2021-03":"n"}},"samsung-email":{"android":{"6.1.31.2":"y"}},"sfr":{"desktop-webmail":{"2021-03":"y"},"ios":{"2021-03":"y"},"android":{"2021-03":"y"}},"thunderbird":{"macos":{"2020-12":"y"}},"protonmail":{"desktop-webmail":{"2021-03":"y"},"ios":{"2021-03":"y"},"android":{"2021-03":"y"}},"hey":{"desktop-webmail":{"2021-03":"y"}},"mail-ru":{"desktop-webmail":{"2020-12":"y"}},"fastmail":{"desktop-webmail":{"2021-07":"y"}},"laposte":{"desktop-webmail":{"2021-08":"y #1"}},"gmx":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"y"}},"web-de":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"y"}},"ionos-1and1":{"desktop-webmail":{"2022-06":"y"},"android":{"2022-06":"y"}}}, "notes":null, "notes_by_num":{"1":"Supported. But a default style of `margin:auto` is applied on every element and can prevent the expected result."} }, @@ -110,9 +110,9 @@ "last_test_date":"2023-12-19", "test_url":"https://www.caniemail.com/tests/css-font-face.html", "test_results_url":"https://app.emailonacid.com/app/acidtest/veY9MhuhgFeF1ly5crrhTXawfLJSwxgpYi27OElI7iSoc/list", - "stats":{"apple-mail":{"macos":{"12.2":"y"},"ios":{"10.3":"y","12.3.1":"y"}},"gmail":{"desktop-webmail":{"2019-07":"n #6"},"ios":{"2019-07":"n"},"android":{"2019-07":"n"},"mobile-webmail":{"2020-02":"n"}},"orange":{"desktop-webmail":{"2019-05":"a #2","2021-03":"n #7"},"ios":{"2019-07":"y","2024-03":"n"},"android":{"2019-07":"a #1"}},"outlook":{"windows":{"2003":"a #3","2007":"a #4 #5","2010":"a #4 #5","2013":"a #4 #5","2016":"a #4 #5","2019":"a #4"},"windows-mail":{"2020-01":"n"},"macos":{"2011":"y","2016":"y","16.80":"n"},"outlook-com":{"2019-07":"n","2023-12":"n"},"ios":{"2.51.1":"y","3.29.0":"n"},"android":{"2019-07":"n"}},"samsung-email":{"android":{"6.0":"y #8","2021-11":"y #8"}},"sfr":{"desktop-webmail":{"2019-07":"a #2"},"ios":{"2019-07":"n"},"android":{"2019-07":"n"}},"thunderbird":{"macos":{"60.7":"y","78.5":"y"}},"aol":{"desktop-webmail":{"2020-01":"n"},"ios":{"2020-01":"n"},"android":{"2020-01":"n"}},"yahoo":{"desktop-webmail":{"2019-07":"n"},"ios":{"2019-07":"n"},"android":{"2019-07":"n"}},"protonmail":{"desktop-webmail":{"2020-03":"n"},"ios":{"2020-03":"n"},"android":{"2020-03":"y"}},"hey":{"desktop-webmail":{"2020-06":"y"}},"mail-ru":{"desktop-webmail":{"2020-10":"n"}},"fastmail":{"desktop-webmail":{"2021-07":"n"}},"laposte":{"desktop-webmail":{"2021-08":"a #2"}},"gmx":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"n"}},"web-de":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"n"}},"ionos-1and1":{"desktop-webmail":{"2022-06":"y"},"android":{"2022-06":"n"}}}, + "stats":{"apple-mail":{"macos":{"12.2":"y"},"ios":{"10.3":"y","12.3.1":"y"}},"gmail":{"desktop-webmail":{"2019-07":"n #6"},"ios":{"2019-07":"n"},"android":{"2019-07":"n"},"mobile-webmail":{"2020-02":"n"}},"orange":{"desktop-webmail":{"2019-05":"a #2","2021-03":"n #7","2024-03":"n"},"ios":{"2019-07":"y","2024-03":"n"},"android":{"2019-07":"a #1","2024-04":"n"}},"outlook":{"windows":{"2003":"a #3","2007":"a #4 #5","2010":"a #4 #5","2013":"a #4 #5","2016":"a #4 #5","2019":"a #4"},"windows-mail":{"2020-01":"n"},"macos":{"2011":"y","2016":"y","16.80":"n"},"outlook-com":{"2019-07":"n","2023-12":"n"},"ios":{"2.51.1":"y","3.29.0":"n"},"android":{"2019-07":"n"}},"samsung-email":{"android":{"6.0":"y #8","2021-11":"y #8"}},"sfr":{"desktop-webmail":{"2019-07":"a #2"},"ios":{"2019-07":"n"},"android":{"2019-07":"n"}},"thunderbird":{"macos":{"60.7":"y","78.5":"y"}},"aol":{"desktop-webmail":{"2020-01":"n"},"ios":{"2020-01":"n"},"android":{"2020-01":"n"}},"yahoo":{"desktop-webmail":{"2019-07":"n"},"ios":{"2019-07":"n"},"android":{"2019-07":"n"}},"protonmail":{"desktop-webmail":{"2020-03":"n"},"ios":{"2020-03":"n"},"android":{"2020-03":"y"}},"hey":{"desktop-webmail":{"2020-06":"y"}},"mail-ru":{"desktop-webmail":{"2020-10":"n"}},"fastmail":{"desktop-webmail":{"2021-07":"n"}},"laposte":{"desktop-webmail":{"2021-08":"a #2"}},"gmx":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"n"}},"web-de":{"desktop-webmail":{"2022-06":"n"},"ios":{"2022-06":"y"},"android":{"2022-06":"n"}},"ionos-1and1":{"desktop-webmail":{"2022-06":"y"},"android":{"2022-06":"n"}}}, "notes":null, - "notes_by_num":{"1":"Partial. Only supported through a `` tag.","2":"Partial. Only supported directly through a `