mirror_html/filegator
1
0
Fork 0
mirror of https://github.com/filegator/filegator.git synced 2025-07-31 22:11:07 +02:00
Code Issues Projects Releases Wiki Activity

Fix for UTF8 filename issues (#12)

Browse Source
This commit is contained in:
Milos Stojanovic
2019-09-05 13:59:20 +02:00
parent 3182ed058a
commit 2ea77cc88e
7 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/Controllers/DownloadController.php
View File

@@ -43,10 +43,10 @@ class DownloadController
$this->storage->setPathPrefix($user->getHomeDir());
}
public function download($path_encoded, Request $request, Response $response, StreamedResponse $streamedResponse)
public function download(Request $request, Response $response, StreamedResponse $streamedResponse)
{
try {
$file = $this->storage->readStream((string) base64_decode($path_encoded));
$file = $this->storage->readStream((string) base64_decode($request->input('path')));
} catch (\Exception $e) {
return $response->redirect('/');
}
@@ -67,7 +67,7 @@ class DownloadController
$streamedResponse->headers->set(
'Content-Disposition',
HeaderUtils::makeDisposition(HeaderUtils::DISPOSITION_ATTACHMENT, $file['filename'])
HeaderUtils::makeDisposition(HeaderUtils::DISPOSITION_ATTACHMENT, $file['filename'], 'file')
);
$streamedResponse->headers->set(
'Content-Type',
@@ -131,7 +131,8 @@ class DownloadController
'Content-Disposition',
HeaderUtils::makeDisposition(
HeaderUtils::DISPOSITION_ATTACHMENT,
$this->config->get('frontend_config.default_archive_name')
$this->config->get('frontend_config.default_archive_name'),
'archive.zip'
)
);
$streamedResponse->headers->set(

2
backend/Controllers/routes.php
View File

@@ -184,7 +184,7 @@ return [
],
[
'route' => [
'GET', '/download/{path_encoded}', '\Filegator\Controllers\DownloadController@download',
'GET', '/download', '\Filegator\Controllers\DownloadController@download',
],
'roles' => [
'guest', 'user', 'admin',

3
frontend/views/Browser.vue
View File

@@ -155,6 +155,7 @@ import Pagination from './partials/Pagination'
import Upload from './partials/Upload'
import api from '../api/api'
import VueClipboard from 'vue-clipboard2'
import { Base64 } from 'js-base64'
import _ from 'lodash'
Vue.use(VueClipboard)
@@ -335,7 +336,7 @@ export default {
})
},
getDownloadLink(item) {
return Vue.config.baseURL+'/download/'+btoa(item.path)
return Vue.config.baseURL+'/download&path='+encodeURIComponent(Base64.encode(item.path))
},
download(item) {
window.open(this.getDownloadLink(item), '_blank')

3
package-lock.json generated
View File

@@ -11200,8 +11200,7 @@
"js-base64": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
"dev": true
"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
},
"js-beautify": {
"version": "1.10.0",

4
package.json
View File

@@ -35,5 +35,7 @@
"vue-template-compiler": "^2.5.21",
"vuex": "^3.1.1"
},
"dependencies": {}
"dependencies": {
"js-base64": "^2.5.1"
}
}

22
tests/backend/Feature/FilesTest.php
View File

@@ -156,7 +156,21 @@ class FilesTest extends TestCase
touch(TEST_REPOSITORY.'/john/john.txt', $this->timestamp);
$path_encoded = base64_encode('john.txt');
$this->sendRequest('GET', '/download/'.$path_encoded);
$this->sendRequest('GET', '/download&path='.$path_encoded);
$this->assertOk();
}
public function testDownloadUTF8File()
{
$username = 'john@example.com';
$this->signIn($username, 'john123');
mkdir(TEST_REPOSITORY.'/john');
touch(TEST_REPOSITORY.'/john/ąčęėįšųū.txt', $this->timestamp);
$path_encoded = base64_encode('/ąčęėįšųū.txt');
$this->sendRequest('GET', '/download&path='.$path_encoded);
$this->assertOk();
}
@@ -166,7 +180,7 @@ class FilesTest extends TestCase
touch(TEST_REPOSITORY.'/test.txt', $this->timestamp);
$path_encoded = base64_encode('test.txt');
$this->sendRequest('GET', '/download/'.$path_encoded);
$this->sendRequest('GET', '/download&path='.$path_encoded);
$this->assertStatus(404);
}
@@ -181,7 +195,7 @@ class FilesTest extends TestCase
touch(TEST_REPOSITORY.'/jane/jane.txt', $this->timestamp);
$path_encoded = base64_encode('jane.txt');
$this->sendRequest('GET', '/download/'.$path_encoded);
$this->sendRequest('GET', '/download&path='.$path_encoded);
$this->assertStatus(404);
}
@@ -192,7 +206,7 @@ class FilesTest extends TestCase
$this->signIn($username, 'john123');
$path_encoded = base64_encode('missing.txt');
$this->sendRequest('GET', '/download/'.$path_encoded);
$this->sendRequest('GET', '/download&path='.$path_encoded);
$this->assertStatus(302);
}

39
tests/backend/Feature/UploadTest.php
View File

@@ -317,4 +317,43 @@ class UploadTest extends TestCase
],
]);
}
public function testFileUploadWithUTF8()
{
$this->signIn('john@example.com', 'john123');
$files = ['file' => new UploadedFile(TEST_FILE, 'ąčęėįšųū.txt', 'text/plain', null, true)];
$data = [
'resumableChunkNumber' => 1,
'resumableChunkSize' => 1048576,
'resumableCurrentChunkSize' => 0.5 * 1024 * 1024,
'resumableTotalChunks' => 1,
'resumableTotalSize' => 0.5 * 1024 * 1024,
'resumableType' => 'text/plain',
'resumableIdentifier' => 'CHUNKS-SIMPLE-TEST',
'resumableFilename' => "ąčęėįšųū.txt",
'resumableRelativePath' => '/',
];
$this->sendRequest('POST', '/upload', $data, $files);
$this->assertOk();
$this->sendRequest('POST', '/getdir', [
'dir' => '/',
]);
$this->assertResponseJsonHas([
'data' => [
'files' => [
0 => [
'type' => 'file',
'path' => '/ąčęėįšųū.txt',
'name' => 'ąčęėįšųū.txt',
],
],
],
]);
}
}