Merge branch 'release/1.1.6'

axllent · Sep 19, 2022 · fced671 · fced671
2 parents 8f05b97 + d918fdb
commit fced671
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 Notable changes to Mailpit will be documented in this file.
 
+## 1.1.6
+
+### Fix
+- Workaround for Safari source matching bug blocking event listener
+
+### UI
+- Add documentation link (wiki)
+
+
 ## 1.1.5
 
 ### Build

diff --git a/server/server.go b/server/server.go
@@ -21,7 +21,7 @@ import (
 //go:embed ui
 var embeddedFS embed.FS
 
-var contentSecurityPolicy = "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; frame-src 'self'; img-src * data: blob:; font-src 'self' data:; media-src 'self'; connect-src 'self'; object-src 'none'; base-uri 'self';"
+var contentSecurityPolicy = "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; frame-src 'self'; img-src * data: blob:; font-src 'self' data:; media-src 'self'; connect-src 'self' ws: wss:; object-src 'none'; base-uri 'self';"
 
 // Listen will start the httpd
 func Listen() {

diff --git a/server/ui-src/App.vue b/server/ui-src/App.vue
@@ -173,7 +173,8 @@ export default {
 								new RegExp('cid:'+a.ContentID, 'g'), 
 								window.location.origin+'/api/'+d.ID+'/part/'+a.PartID
 							);
-						} else if (a.FileName.match(/^[a-zA-Z\_\-\.]+$/)) {
+						}
+						if (a.FileName.match(/^[a-zA-Z0-9\_\-\.]+$/)) {
 							// some old email clients use the filename
 							d.HTML = d.HTML.replace(
 								new RegExp('src=(\'|")'+a.FileName+'(\'|")', 'g'), 
@@ -191,7 +192,8 @@ export default {
 								new RegExp('cid:'+a.ContentID, 'g'), 
 								window.location.origin+'/api/'+d.ID+'/part/'+a.PartID
 							);
-						} else if (a.FileName.match(/^[a-zA-Z\_\-\.]+$/)) {
+						}
+						if (a.FileName.match(/^[a-zA-Z0-9\_\-\.]+$/)) {
 							// some old email clients use the filename
 							d.HTML = d.HTML.replace(
 								new RegExp('src=(\'|")'+a.FileName+'(\'|")', 'g'), 
@@ -596,11 +598,15 @@ export default {
 						Enable alerts
 					</a>
 				</li>
-				<li class="mt-5 position-fixed bottom-0">
-					<a href="https://github.com/axllent/mailpit" target="_blank" class="text-muted w-100 d-block bg-white my-3">
+				<li class="mt-5 position-fixed bottom-0 bg-white py-2 text-muted">
+					<a href="https://github.com/axllent/mailpit" target="_blank" class="text-muted me-1">
 						<i class="bi bi-github"></i>
 						GitHub
 					</a>
+					/
+					<a href="https://github.com/axllent/mailpit/wiki" target="_blank" class="text-muted ms-1">
+						Docs
+					</a>
 				</li>
 			</ul>
 		</div>