Mirrors/send
1
0
Fork 0
mirror of https://gitlab.com/timvisee/send.git synced 2024-11-08 20:22:45 +01:00
Code Issues Releases Activity

fixes #543 added FILE_DIR environment variable

Browse Source
This commit is contained in:
Danny Coates 2017-09-06 13:25:27 -07:00
parent bbaeb44b26
commit 7a8e9b5de1
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -6813,7 +6813,6 @@
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
"minimist": "0.0.8"
},
@ -6821,8 +6820,7 @@
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
}
}
},

1
package.json
View File

@ -102,6 +102,7 @@
"fluent": "^0.4.1",
"fluent-langneg": "^0.1.0",
"helmet": "^3.8.1",
"mkdirp": "^0.5.1",
"mozlog": "^2.1.1",
"raven": "^2.1.2",
"redis": "^2.8.0"

8
server/config.js
View File

@ -1,4 +1,7 @@
const convict = require('convict');
const { tmpdir } = require('os');
const path = require('path');
const { randomBytes } = require('crypto');
const conf = convict({
s3_bucket: {
@ -56,6 +59,11 @@ const conf = convict({
format: 'url',
default: 'https://send.firefox.com',
env: 'BASE_URL'
},
file_dir: {
format: 'String',
default: `${tmpdir()}${path.sep}send-${randomBytes(4).toString('hex')}`,
env: 'FILE_DIR'
}
});

18
server/storage.js
View File

@ -1,8 +1,8 @@
const AWS = require('aws-sdk');
const s3 = new AWS.S3();
const mkdirp = require('mkdirp');
const config = require('./config');
const { tmpdir } = require('os');
const fs = require('fs');
const path = require('path');
@ -25,7 +25,7 @@ redis_client.on('error', err => {
log.error('Redis:', err);
});
let tempDir = null;
const fileDir = config.file_dir;
if (config.s3_bucket) {
module.exports = {
@ -44,8 +44,8 @@ if (config.s3_bucket) {
metadata
};
} else {
tempDir = fs.mkdtempSync(`${tmpdir()}${path.sep}send-`);
log.info('tempDir', tempDir);
mkdirp.sync(config.file_dir);
log.info('fileDir', fileDir);
module.exports = {
filename: filename,
exists: exists,
@ -123,7 +123,7 @@ function setField(id, key, value) {
function localLength(id) {
return new Promise((resolve, reject) => {
try {
resolve(fs.statSync(path.join(tempDir, id)).size);
resolve(fs.statSync(path.join(fileDir, id)).size);
} catch (err) {
reject();
}
@ -131,12 +131,12 @@ function localLength(id) {
}
function localGet(id) {
return fs.createReadStream(path.join(tempDir, id));
return fs.createReadStream(path.join(fileDir, id));
}
function localSet(newId, file, filename, meta) {
return new Promise((resolve, reject) => {
const filepath = path.join(tempDir, newId);
const filepath = path.join(fileDir, newId);
const fstream = fs.createWriteStream(filepath);
file.pipe(fstream);
file.on('limit', () => {
@ -166,7 +166,7 @@ function localDelete(id, delete_token) {
} else {
redis_client.del(id);
log.info('Deleted:', id);
resolve(fs.unlinkSync(path.join(tempDir, id)));
resolve(fs.unlinkSync(path.join(fileDir, id)));
}
});
});
@ -175,7 +175,7 @@ function localDelete(id, delete_token) {
function localForceDelete(id) {
return new Promise((resolve, reject) => {
redis_client.del(id);
resolve(fs.unlinkSync(path.join(tempDir, id)));
resolve(fs.unlinkSync(path.join(fileDir, id)));
});
}