Item13897: UTF8 decode uploaded file name.

foswiki · Oct 14, 2016 · 6dd4c91 · 6dd4c91
1 parent 16ebeca
commit 6dd4c91
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/core/lib/Foswiki/Engine/PSGI.pm b/core/lib/Foswiki/Engine/PSGI.pm
@@ -16,6 +16,8 @@ use v5.14;
 use Assert;
 use Plack::Request;
 use Unicode::Normalize;
+use File::Spec ();
+use Encode     ();
 
 use Foswiki::Class;
 extends qw(Foswiki::Engine);
@@ -185,11 +187,16 @@ around _prepareUploads => sub {
     my @uploads;
     my $psgi = $this->psgi;
     foreach my $key ( keys %{ $psgi->uploads } ) {
-        my $upload = $psgi->upload($key);
+        my $upload   = $psgi->upload($key);
+        my $filename = Encode::decode_utf8( $upload->filename );
+        my $basename = ( File::Spec->splitpath($filename) )[2];
+
+        # SMELL Not only filenames but all data should be passed thru
+        # decode_utf8.
         push @uploads,
           {
-            filename    => $upload->filename,
-            basename    => $upload->basename,
+            filename    => $filename,
+            basename    => $basename,
             tmpname     => $upload->path,
             headers     => $upload->headers,
             contentType => $upload->content_type,

diff --git a/core/lib/Foswiki/Validation.pm b/core/lib/Foswiki/Validation.pm
@@ -322,7 +322,6 @@ sub validate {
                 # When the redirect is validated it should pass, because
                 # it will now be using the validation code from the
                 # confirmation screen that brought us here.
-                Foswiki::load_class('Foswiki::Request::Cache');
                 $app->create('Foswiki::Request::Cache')
                   ->load( $cacheUID, $req );
                 $url = $req->url();