From bc00eeec60a50ec165fc3d463782d8b9592a45c3 Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Thu, 25 Jul 2019 18:21:01 +0200
Subject: [PATCH] Use UTF-8 for non-ASCII characters in file names

Store uploaded files using UTF-8 path names.

Note that this breaks HEAD/GET requests against files uploaded using
earlier versions of this module.

Closes #5.
---
 upload.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/upload.pm b/upload.pm
index ca9d050..92bf7dd 100644
--- a/upload.pm
+++ b/upload.pm
@@ -36,6 +36,7 @@ use warnings;
 use strict;
 use Carp;
 use Digest::SHA qw(hmac_sha256_hex);
+use Encode qw(decode :fallback_all);
 use Errno qw(:POSIX);
 use Fcntl;
 use File::Copy;
@@ -183,9 +184,11 @@ sub add_custom_headers {
 
 sub safe_filename {
     my $r = shift;
-    my $safe_uri = $r->uri =~ s|[^\p{Alnum}/_.-]|_|gr;
+    my $filename = decode('UTF-8', $r->filename, FB_DEFAULT | LEAVE_SRC);
+    my $uri = decode('UTF-8', $r->uri, FB_DEFAULT | LEAVE_SRC);
+    my $safe_uri = $uri =~ s|[^\p{Alnum}/_.-]|_|gr;
 
-    return substr($r->filename, 0, -length($r->uri)) . $safe_uri;
+    return substr($filename, 0, -length($uri)) . $safe_uri;
 }
 
 sub safe_eq {