From 12c8373f93f20e0bc92958d887bb2059110e89a1 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 16 Jun 2020 17:42:57 +0100
Subject: [PATCH] Return UTF-8 filenames

---
 mediaapi/routing/download.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mediaapi/routing/download.go b/mediaapi/routing/download.go
index 1a025f6f0..4d1f539cc 100644
--- a/mediaapi/routing/download.go
+++ b/mediaapi/routing/download.go
@@ -21,6 +21,7 @@ import (
 	"io"
 	"mime"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -302,7 +303,14 @@ func (r *downloadRequest) respondFromLocalFile(
 		responseMetadata = r.MediaMetadata
 
 		if len(responseMetadata.UploadName) > 0 {
-			w.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename*=utf-8"%s"`, responseMetadata.UploadName))
+			uploadName, err := url.PathUnescape(string(responseMetadata.UploadName))
+			if err != nil {
+				return nil, fmt.Errorf("url.PathUnescape: %w", err)
+			}
+			w.Header().Set("Content-Disposition", fmt.Sprintf(
+				`inline; filename=utf-8"%s"`,
+				strconv.Quote(uploadName),
+			))
 		}
 	}