Improve extension handling for uploaded files

mediaendpoint.go

@@ -4,7 +4,9 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
+	"mime"
 	"net/http"
+	"path/filepath"
 	"strings"
 )
 
@@ -45,13 +47,18 @@ func HandleMedia(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		fileName := fmt.Sprintf("%x", h.Sum(nil))
-		mimeType := header.Header.Get("content-type")
+		fileExtension := filepath.Ext(header.Filename)
-		originalName := header.Filename
+		if len(fileExtension) == 0 {
-		if strings.Contains(mimeType, "jpeg") || strings.Contains(originalName, ".jpeg") || strings.Contains(originalName, ".jpg") {
+			// Find correct file extension if original filename does not contain one
-			fileName += ".jpg"
+			mimeType := header.Header.Get("content-type")
-		} else if strings.Contains(mimeType, "png") || strings.Contains(originalName, ".png") {
+			if len(mimeType) > 0 {
-			fileName += ".png"
+				allExtensions, _ := mime.ExtensionsByType(mimeType)
+				if len(allExtensions) > 0 {
+					fileExtension = allExtensions[0]
+				}
+			}
 		}
+		fileName += fileExtension
 		location, err := SelectedMediaStorage.Upload(fileName, file)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)