jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Deliver content-length and file not found errors for file downloads

Browse Source
This commit is contained in:
Johannes Zellner
2017-08-19 10:48:12 +02:00
parent cf518b0285
commit 3d59b8a5b0
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/apps.js
View File

@@ -1136,10 +1136,28 @@ function downloadFile(appId, filePath, callback) {
assert.strictEqual(typeof callback, 'function');
var filename = path.basename(filePath);
exec(appId, { cmd: ['cat', filePath ], tty: false }, function (error, stream) {
exec(appId, { cmd: [ 'stat', '--printf=%F-%s', filePath ], tty: true }, function (error, stream) {
if (error) return callback(error);
return callback(null, stream, filename);
var data = '';
stream.setEncoding('utf8');
stream.on('data', function (d) { data += d; });
stream.on('end', function () {
var parts = data.split('-');
if (parts.length !== 2) return callback(new AppsError(AppsError.NOT_FOUND, 'file does not exist'));
var type = parts[0];
if (type !== 'regular file') return callback(new AppsError(AppsError.NOT_FOUND, 'only files can be downloaded'));
var size = parseInt(parts[1], 10);
if (isNaN(size)) return callback(new AppsError(AppsError.NOT_FOUND, 'file does not exist'));
exec(appId, { cmd: [ 'cat', filePath ], tty: false }, function (error, stream) {
if (error) return callback(error);
return callback(null, stream, { filename: filename, size: size });
});
});
});
}

7
src/routes/apps.js
View File

@@ -557,14 +557,15 @@ function downloadFile(req, res, next) {
if (typeof req.query.file !== 'string' || !req.query.file) return next(new HttpError(400, 'file query argument must be provided'));
apps.downloadFile(req.params.id, req.query.file, function (error, result, filename) {
apps.downloadFile(req.params.id, req.query.file, function (error, result, info) {
if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, error.message));
if (error) return next(new HttpError(500, error));
// TODO get real content type and size
res.writeHead(200, {
'Content-Type': 'application/octet-stream',
'Content-Disposition': 'attachment; filename="' + filename + '"'
// 'Content-Length': stat.size
'Content-Disposition': 'attachment; filename="' + info.filename + '"',
'Content-Length': info.size
});
result.pipe(res);