MirrorMirror
/
lufi
mirror of https://framagit.org/fiat-tux/hat-softwares/lufi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🐛 — Fix bug with accents in file name with Swift

This commit is contained in:
Luc Didry 2020-05-20 07:58:12 +02:00
parent c7b3509bcf
commit ed302d5a4b
No known key found for this signature in database
GPG Key ID: EA868E12D0257E3C
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Lufi/DB/Slice.pm
View File

@ -131,7 +131,7 @@ sub store {
container_name => $c->app->config('swift')->{container}, container_name => $c->app->config('swift')->{container},
object_name => $c->get_path(), object_name => $c->get_path(),
content_length => length(Encode::encode_utf8($text)), content_length => length(Encode::encode_utf8($text)),
content => $text content => Encode::encode_utf8($text)
); );
} else { } else {
# Create directory # Create directory
@ -176,7 +176,7 @@ sub retrieve {
$file .= $chunk; $file .= $chunk;
} }
); );
return $file; return Encode::decode_utf8($file);
} else { } else {
my $file = catfile($c->app->config('upload_dir'), $c->get_path()); my $file = catfile($c->app->config('upload_dir'), $c->get_path());
return Mojo::File->new($file)->slurp; return Mojo::File->new($file)->slurp;

11
t/test.t
View File

@ -13,18 +13,19 @@ use FindBin qw($Bin);
my ($m, $cfile, $config_orig, $config_file, $config_content); my ($m, $cfile, $config_orig, $config_file, $config_content);
my $msg = to_json { my $msg = Encode::encode_utf8(to_json {
"total" => 1, "total" => 1,
"part" => 0, "part" => 0,
"size" => 7, "size" => 7,
"name" => "foobar.txt", "name" => "foobaré.txt",
"type" => "text/plain", "type" => "text/plain",
"delay" => "0", "delay" => "0",
"del_at_first_view" => 1, "del_at_first_view" => 1,
"id" => undef, "id" => undef,
"zipped" => 0, "zipped" => 0,
"i" => 0 "i" => 0
}; });
my $filename_test = Encode::encode_utf8('foobaré');
my $encrypted = '"{\\"iv\\":\\"2RGAviAeYybBqcLCmnqlgA==\\",\\"v\\":1,\\"iter\\":10000,\\"ks\\":128,\\"ts\\":64,\\"mode\\":\\"ccm\\",\\"adata\\":\\"\\",\\"cipher\\":\\"aes\\",\\"salt\\":\\"1dvKtbZ8hxA=\\",\\"ct\\":\\"w9wDZCwNSyH/yL7q1GW5fPSdi+w=\\"}"'; my $encrypted = '"{\\"iv\\":\\"2RGAviAeYybBqcLCmnqlgA==\\",\\"v\\":1,\\"iter\\":10000,\\"ks\\":128,\\"ts\\":64,\\"mode\\":\\"ccm\\",\\"adata\\":\\"\\",\\"cipher\\":\\"aes\\",\\"salt\\":\\"1dvKtbZ8hxA=\\",\\"ct\\":\\"w9wDZCwNSyH/yL7q1GW5fPSdi+w=\\"}"';
my $encrypted_rgx = $encrypted; my $encrypted_rgx = $encrypted;
$encrypted_rgx =~ s@\\@\\\\@g; $encrypted_rgx =~ s@\\@\\\\@g;
@ -154,7 +155,7 @@ sub test_upload_file {
->message_like(qr@"duration":\d+@) ->message_like(qr@"duration":\d+@)
->message_like(qr@"i":0@) ->message_like(qr@"i":0@)
->message_like(qr@"j":0@) ->message_like(qr@"j":0@)
->message_like(qr@"name":"foobar\.txt"@) ->message_like(qr@"name":"$filename_test\.txt"@)
->message_like(qr@"parts":1@) ->message_like(qr@"parts":1@)
->message_like(qr@"sent_delay":0@) ->message_like(qr@"sent_delay":0@)
->message_like(qr@"short":"[^"]+"@) ->message_like(qr@"short":"[^"]+"@)
@ -192,7 +193,7 @@ sub test_download_file {
->message_like(qr@"id":null@) ->message_like(qr@"id":null@)
->message_like(qr@"del_at_first_view":1@) ->message_like(qr@"del_at_first_view":1@)
->message_like(qr@"delay":"0"@) ->message_like(qr@"delay":"0"@)
->message_like(qr@"name":"foobar\.txt"@) ->message_like(qr@"name":"$filename_test\.txt"@)
->message_like(qr@"size":7@) ->message_like(qr@"size":7@)
->message_like(qr@"type":"text\\/plain"@) ->message_like(qr@"type":"text\\/plain"@)
->message_like(qr@XXMOJOXX@) ->message_like(qr@XXMOJOXX@)