diff --git a/frontend/src/download.js b/frontend/src/download.js
index 6a7f77f1..b0e05fe9 100644
--- a/frontend/src/download.js
+++ b/frontend/src/download.js
@@ -42,10 +42,6 @@ $(document).ready(function() {
});
});
- $('#expired-send-new').click(function() {
- storage.referrer = 'errored-download';
- });
-
const filename = $('#dl-filename').text();
const bytelength = Number($('#dl-bytelength').text());
const timeToExpiry = Number($('#dl-ttl').text());
diff --git a/frontend/src/fileReceiver.js b/frontend/src/fileReceiver.js
index ad1611df..882dcb2b 100644
--- a/frontend/src/fileReceiver.js
+++ b/frontend/src/fileReceiver.js
@@ -67,7 +67,8 @@ class FileReceiver extends EventEmitter {
{
name: 'AES-GCM',
iv: hexToArray(fdata.iv),
- additionalData: hexToArray(fdata.aad)
+ additionalData: hexToArray(fdata.aad),
+ tagLength: 128
},
key,
fdata.data
diff --git a/frontend/src/upload.js b/frontend/src/upload.js
index 85c6fedc..9ecf0247 100644
--- a/frontend/src/upload.js
+++ b/frontend/src/upload.js
@@ -1,4 +1,4 @@
-/* global MAXFILESIZE */
+/* global MAXFILESIZE EXPIRE_SECONDS */
require('./common');
const FileSender = require('./fileSender');
const {
@@ -143,6 +143,10 @@ $(document).ready(function() {
let file = '';
if (event.type === 'drop') {
+ if (!event.originalEvent.dataTransfer.files[0]) {
+ $('.upload-window').removeClass('ondrag');
+ return;
+ }
if (
event.originalEvent.dataTransfer.files.length > 1 ||
event.originalEvent.dataTransfer.files[0].size === 0
@@ -256,7 +260,7 @@ $(document).ready(function() {
const totalTime = endTime - startTime;
const uploadTime = endTime - uploadStart;
const uploadSpeed = file.size / (uploadTime / 1000);
- const expiration = 24 * 60 * 60 * 1000; //will eventually come from a field
+ const expiration = EXPIRE_SECONDS * 1000;
// record upload-stopped (completed) by sender
sendEvent('sender', 'upload-stopped', {
diff --git a/server/config.js b/server/config.js
index 8e7e9873..5c6e540a 100644
--- a/server/config.js
+++ b/server/config.js
@@ -41,6 +41,11 @@ const conf = convict({
format: Number,
default: 1024 * 1024 * 1024 * 2,
env: 'MAX_FILE_SIZE'
+ },
+ expire_seconds: {
+ format: Number,
+ default: 86400,
+ env: 'EXPIRE_SECONDS'
}
});
diff --git a/server/server.js b/server/server.js
index 873f6d6f..cd9c5e90 100644
--- a/server/server.js
+++ b/server/server.js
@@ -86,6 +86,7 @@ app.get('/jsconfig.js', (req, res) => {
trackerId: conf.analytics_id,
dsn: conf.sentry_id,
maxFileSize: conf.max_file_size,
+ expireSeconds: conf.expire_seconds,
layout: false
});
});
diff --git a/server/storage.js b/server/storage.js
index 40a699ec..66a1a192 100644
--- a/server/storage.js
+++ b/server/storage.js
@@ -152,7 +152,7 @@ function localSet(newId, file, filename, meta) {
});
fstream.on('finish', () => {
redis_client.hmset(newId, meta);
- redis_client.expire(newId, 86400000);
+ redis_client.expire(newId, conf.expire_seconds);
log.info('localSet:', 'Upload Finished of ' + newId);
resolve(meta.delete);
});
@@ -238,7 +238,7 @@ function awsSet(newId, file, filename, meta) {
return upload.promise().then(
() => {
redis_client.hmset(newId, meta);
- redis_client.expire(newId, 86400000);
+ redis_client.expire(newId, conf.expire_seconds);
log.info('awsUploadFinish', 'Upload Finished of ' + filename);
},
err => {
diff --git a/test/unit/aws.storage.test.js b/test/unit/aws.storage.test.js
index e7449d75..b4507e38 100644
--- a/test/unit/aws.storage.test.js
+++ b/test/unit/aws.storage.test.js
@@ -115,7 +115,7 @@ describe('Testing Set using aws', function() {
.set('123', {on: sinon.stub()}, 'Filename.moz', {})
.then(() => {
assert(expire.calledOnce);
- assert(expire.calledWith('123', 86400000));
+ assert(expire.calledWith('123', 86400));
})
.catch(err => assert.fail());
});
diff --git a/views/jsconfig.handlebars b/views/jsconfig.handlebars
index 4ff25330..c9ddf16d 100644
--- a/views/jsconfig.handlebars
+++ b/views/jsconfig.handlebars
@@ -5,3 +5,4 @@ window.dsn = '{{{dsn}}}';
window.trackerId = '{{{trackerId}}}';
{{/if}}
const MAXFILESIZE = {{{maxFileSize}}};
+const EXPIRE_SECONDS = {{{expireSeconds}}};
diff --git a/views/notfound.handlebars b/views/notfound.handlebars
index e42fe893..9f89c95a 100644
--- a/views/notfound.handlebars
+++ b/views/notfound.handlebars
@@ -4,5 +4,5 @@