Merge branch 'release/v1.5.2'

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Notable changes to Mailpit will be documented in this file.
 
+## [v1.5.2]
+
+### API
+- Include Reply-To in message summary (including Web UI)
+
+### UI
+- Tab to view formatted message headers
+
+
 ## [v1.5.1]
 
 ### Feature

README.md

@@ -19,7 +19,7 @@ Mailpit is inspired by [MailHog](#why-rewrite-mailhog), but much, much faster.
 
 - Runs entirely from a single binary, no installation required
 - SMTP server (default `0.0.0.0:1025`)
-- Web UI to view emails (formatted HTML, highlighted HTML source, text, raw source and MIME attachments including image thumbnails)
+- Web UI to view emails (formatted HTML, highlighted HTML source, text, headers, raw source and MIME attachments including image thumbnails)
 - Advanced mail search ([see wiki](https://github.com/axllent/mailpit/wiki/Mail-search))
 - Message tagging ([see wiki](https://github.com/axllent/mailpit/wiki/Tagging))
 - Real-time web UI updates using web sockets for new mail
@@ -41,10 +41,12 @@ The Mailpit web UI listens by default on `http://0.0.0.0:8025`, and the SMTP por
 
 Mailpit runs as a single binary and can be installed in different ways:
 
+
 ### Install via Brew (Mac)
 
 Add the repository to your taps with `brew tap axllent/apps`, and then install Mailpit with `brew install mailpit`.
 
+
 ### Install via bash script (Linux & Mac)
 
 Linux & Mac users can install it directly to `/usr/local/bin/mailpit` with:
@@ -53,14 +55,17 @@ Linux & Mac users can install it directly to `/usr/local/bin/mailpit` with:
 sudo bash < <(curl -sL https://raw.githubusercontent.com/axllent/mailpit/develop/install.sh)
 ```
 
+
 ### Download static binary (Windows, Linux and Mac)
 
 Static binaries can always be found on the [releases](https://github.com/axllent/mailpit/releases/latest). The `mailpit` binary can extracted and copied to your `$PATH`, or simply run as `./mailpit`.
 
+
 ### Docker
 
 See [Docker instructions](https://github.com/axllent/mailpit/wiki/Docker-images).
 
+
 ### Compile from source
 
 To build Mailpit from source see [building from source](https://github.com/axllent/mailpit/wiki/Building-from-source).

docs/apiv1/Message.md

@@ -28,6 +28,7 @@ Returns a JSON summary of the message and attachments.
   ],
   "Cc": [],
   "Bcc": [],
+  "ReplyTo": [],
   "Subject": "Message subject",
   "Date": "2016-09-07T16:46:00+13:00",
   "Text": "Plain text MIME part of the email",
@@ -57,7 +58,7 @@ Returns a JSON summary of the message and attachments.
 
 - `Read` - always true (message marked read on open)
 - `From` - Name & Address, or null
-- `To`, `CC`, `BCC` - Array of Names & Address
+- `To`, `CC`, `BCC`, `ReplyTo` - Array of Names & Address
 - `Date` - Parsed email local date & time from headers
 - `Size` - Total size of raw email
 - `Inline`, `Attachments` - Array of attachments and inline images.

server/ui-src/assets/styles.scss

@@ -38,6 +38,14 @@
     }
 }
 
+.nav-tabs .nav-link {
+    @include media-breakpoint-down(sm) {
+        // font-size: 14px;
+        padding-left: 10px;
+        padding-right: 10px;
+    }
+}
+
 #loading {
     position: absolute;
     top: 0;

server/ui-src/templates/Headers.vue

@@ -0,0 +1,38 @@
+
+<script>
+import commonMixins from '../mixins.js';
+
+export default {
+    props: {
+        message: Object
+    },
+
+    mixins: [commonMixins],
+
+    data() {
+        return {
+            headers: false
+        }
+    },
+
+    mounted() {
+        let self = this;
+        let uri = 'api/v1/message/' + self.message.ID + '/headers';
+        self.get(uri, false, function (response) {
+            self.headers = response.data;
+        });
+    },
+
+}
+</script>
+
+<template>
+    <div v-if="headers" class="small">
+        <div v-for="vals, k in headers" class="row mb-2 pb-2 border-bottom w-100">
+            <div class="col-md-4 col-lg-3 col-xl-2 mb-2"><b>{{ k }}</b></div>
+            <div class="col-md-8 col-lg-9 col-xl-10 text-muted">
+                <div v-for="x in vals" class="mb-2 text-break">{{ x }}</div>
+            </div>
+        </div>
+    </div>
+</template>

server/ui-src/templates/Message.vue

@@ -4,6 +4,7 @@ import commonMixins from '../mixins.js';
 import Prism from "prismjs";
 import Tags from "bootstrap5-tags";
 import Attachments from './Attachments.vue';
+import Headers from './Headers.vue';
 
 export default {
 	props: {
@@ -12,7 +13,8 @@ export default {
 	},
 
 	components: {
-		Attachments
+		Attachments,
+		Headers
 	},
 
 	mixins: [commonMixins],
@@ -24,6 +26,7 @@ export default {
 			showTags: false, // to force rerendering of component
 			messageTags: [],
 			allTags: [],
+			loadHeaders: false
 		}
 	},
 
@@ -34,6 +37,7 @@ export default {
 				self.showTags = false;
 				self.messageTags = self.message.Tags;
 				self.allTags = self.existingTags;
+				self.loadHeaders = false;
 				// delay to select first tab and add HTML highlighting (prev/next)
 				self.$nextTick(function () {
 					self.renderUI();
@@ -60,9 +64,16 @@ export default {
 		self.allTags = self.existingTags;
 		window.addEventListener("resize", self.resizeIframes);
 		self.renderUI();
-		var tabEl = document.getElementById('nav-raw-tab');
-		tabEl.addEventListener('shown.bs.tab', function (event) {
+
+		let headersTab = document.getElementById('nav-headers-tab');
+		headersTab.addEventListener('shown.bs.tab', function (event) {
+			self.loadHeaders = true;
+		});
+
+		let rawTab = document.getElementById('nav-raw-tab');
+		rawTab.addEventListener('shown.bs.tab', function (event) {
 			self.srcURI = 'api/v1/message/' + self.message.ID + '/raw';
+			self.resizeIframes();
 		});
 
 		self.showTags = true;
@@ -147,12 +158,14 @@ export default {
 			<div class="col-md">
 				<table class="messageHeaders">
 					<tbody>
-						<tr class="small">
-							<th>From</th>
+						<tr>
+							<th class="small">From</th>
 							<td class="privacy">
 								<span v-if="message.From">
 									<span v-if="message.From.Name">{{ message.From.Name + " " }}</span>
-									<span v-if="message.From.Address">&lt;{{ message.From.Address }}&gt;</span>
+									<span v-if="message.From.Address" class="small">
+										&lt;{{ message.From.Address }}&gt;
+									</span>
 								</span>
 								<span v-else>
 									[ Unknown ]
@@ -164,9 +177,9 @@ export default {
 							<td class="privacy">
 								<span v-if="message.To && message.To.length" v-for="(t, i) in message.To">
 									<template v-if="i > 0">, </template>
-									<span class="text-nowrap">{{ t.Name + " <" + t.Address + ">" }}</span>
-									</span>
-									<span v-else>Undisclosed recipients</span>
+									<span class="text-nowrap">{{ t.Name + " &lt;" + t.Address + "&gt;" }}</span>
+								</span>
+								<span v-else>Undisclosed recipients</span>
 							</td>
 						</tr>
 						<tr v-if="message.Cc && message.Cc.length" class="small">
@@ -174,7 +187,7 @@ export default {
 							<td class="privacy">
 								<span v-for="(t, i) in message.Cc">
 									<template v-if="i > 0">,</template>
-									{{ t.Name + " <" + t.Address + ">" }} </span>
+									{{ t.Name + " &lt;" + t.Address + "&gt;" }} </span>
 							</td>
 						</tr>
 						<tr v-if="message.Bcc && message.Bcc.length" class="small">
@@ -182,7 +195,15 @@ export default {
 							<td class="privacy">
 								<span v-for="(t, i) in message.Bcc">
 									<template v-if="i > 0">,</template>
-									{{ t.Name + " <" + t.Address + ">" }} </span>
+									{{ t.Name + " &lt;" + t.Address + "&gt;" }} </span>
+							</td>
+						</tr>
+						<tr v-if="message.ReplyTo && message.ReplyTo.length" class="small">
+							<th class="text-nowrap">Reply-To</th>
+							<td class="privacy text-muted">
+								<span v-for="(t, i) in message.ReplyTo">
+									<template v-if="i > 0">,</template>
+									{{ t.Name + " &lt;" + t.Address + "&gt;" }} </span>
 							</td>
 						</tr>
 						<tr>
@@ -226,15 +247,21 @@ export default {
 				<button class="nav-link" id="nav-html-tab" data-bs-toggle="tab" data-bs-target="#nav-html" type="button"
 					role="tab" aria-controls="nav-html" aria-selected="true" v-if="message.HTML">HTML</button>
 				<button class="nav-link" id="nav-html-source-tab" data-bs-toggle="tab" data-bs-target="#nav-html-source"
-					type="button" role="tab" aria-controls="nav-html-source" aria-selected="false" v-if="message.HTML">HTML
-					Source</button>
+					type="button" role="tab" aria-controls="nav-html-source" aria-selected="false" v-if="message.HTML">
+					HTML <span class="d-sm-none">Src</span><span class="d-none d-sm-inline">Source</span>
+				</button>
 				<button class="nav-link" id="nav-plain-text-tab" data-bs-toggle="tab" data-bs-target="#nav-plain-text"
 					type="button" role="tab" aria-controls="nav-plain-text" aria-selected="false"
 					:class="message.HTML == '' ? 'show' : ''">Text</button>
+				<button class="nav-link" id="nav-headers-tab" data-bs-toggle="tab" data-bs-target="#nav-headers"
+					type="button" role="tab" aria-controls="nav-headers" aria-selected="false">
+					<span class="d-sm-none">Hdrs</span><span class="d-none d-sm-inline">Headers</span>
+				</button>
 				<button class="nav-link" id="nav-raw-tab" data-bs-toggle="tab" data-bs-target="#nav-raw" type="button"
 					role="tab" aria-controls="nav-raw" aria-selected="false">Raw</button>
 			</div>
 		</nav>
+
 		<div class="tab-content mb-5" id="nav-tabContent">
 			<div v-if="message.HTML != ''" class="tab-pane fade show" id="nav-html" role="tabpanel"
 				aria-labelledby="nav-html-tab" tabindex="0">
@@ -254,6 +281,9 @@ export default {
 				<Attachments v-if="allAttachments(message).length" :message="message"
 					:attachments="allAttachments(message)"></Attachments>
 			</div>
+			<div class="tab-pane fade" id="nav-headers" role="tabpanel" aria-labelledby="nav-headers-tab" tabindex="0">
+				<Headers v-if="loadHeaders" :message="message"></Headers>
+			</div>
 			<div class="tab-pane fade" id="nav-raw" role="tabpanel" aria-labelledby="nav-raw-tab" tabindex="0">
 				<iframe v-if="srcURI" :src="srcURI" v-on:load="resizeIframe" seamless frameborder="0"
 					style="width: 100%; height: 300px;" id="message-src"></iframe>

server/ui/api/v1/swagger.json

@@ -586,6 +586,13 @@
           "description": "Read status",
           "type": "boolean"
         },
+        "ReplyTo": {
+          "description": "ReplyTo addresses",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Address"
+          }
+        },
         "Size": {
           "description": "Message size in bytes",
           "type": "integer",

storage/database.go

@@ -442,6 +442,7 @@ func GetMessage(id string) (*Message, error) {
 		To:      addressToSlice(env, "To"),
 		Cc:      addressToSlice(env, "Cc"),
 		Bcc:     addressToSlice(env, "Bcc"),
+		ReplyTo: addressToSlice(env, "Reply-To"),
 		Subject: env.GetHeader("Subject"),
 		Tags:    getMessageTags(id),
 		Size:    len(raw),

storage/structs.go

@@ -23,6 +23,8 @@ type Message struct {
 	Cc []*mail.Address
 	// Bcc addresses
 	Bcc []*mail.Address
+	// ReplyTo addresses
+	ReplyTo []*mail.Address
 	// Message subject
 	Subject string
 	// Message date if set, else date received