dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use header for file metadata

Browse source
This commit is contained in:
Danny Coates 2017-06-29 10:27:36 -07:00
parent 4cb34844aa
commit 05fe534e14
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
4 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/fileReceiver.js
View file

@ -34,12 +34,11 @@ class FileReceiver extends EventEmitter {
const blob = new Blob([this.response]);
const fileReader = new FileReader();
fileReader.onload = function() {
const meta = JSON.parse(xhr.getResponseHeader('X-File-Metadata'))
resolve({
data: this.result,
aad: xhr.getResponseHeader('Additional-Data'),
fname: xhr
.getResponseHeader('Content-Disposition')
.match(/=(.+)/)[1]
aad: meta.aad,
filename: meta.filename
});
};
@ -78,7 +77,7 @@ class FileReceiver extends EventEmitter {
fdata.data
),
new Promise((resolve, reject) => {
resolve(fdata.fname);
resolve(fdata.filename);
})
]);
});

3
frontend/src/fileSender.js
View file

@ -75,9 +75,7 @@ class FileSender extends EventEmitter {
const dataView = new DataView(encrypted);
const blob = new Blob([dataView], { type: file.type });
const fd = new FormData();
fd.append('fname', file.name);
fd.append('data', blob, file.name);
fd.append('aad', arrayToHex(this.aad));
const xhr = new XMLHttpRequest();
@ -102,6 +100,7 @@ class FileSender extends EventEmitter {
};
xhr.open('post', '/upload/' + fileId, true);
xhr.setRequestHeader('X-File-Metadata', JSON.stringify({ aad: arrayToHex(this.aad), iv: fileId, filename: file.name }))
xhr.send(fd);
});
})