Merge branch 'postgres'
This commit is contained in:
commit
305dd77f43
36 changed files with 1195 additions and 312 deletions
126
lib/uploader.js
126
lib/uploader.js
|
|
@ -4,8 +4,9 @@ import crypto from 'crypto';
|
|||
import fs from 'mz/fs';
|
||||
import sizeOf from 'image-size';
|
||||
|
||||
import models from '../models';
|
||||
import createHostrId from './hostr-id';
|
||||
import { formatFile } from './format';
|
||||
import hostrId from './hostr-id';
|
||||
import resize from './resize';
|
||||
import malware from './malware';
|
||||
import { sniff } from './type';
|
||||
|
|
@ -21,7 +22,6 @@ const supported = ['jpeg', 'jpg', 'png', 'gif'];
|
|||
export default class Uploader {
|
||||
constructor(context) {
|
||||
this.context = context;
|
||||
this.Files = context.db.Files;
|
||||
this.expectedSize = context.request.headers['content-length'];
|
||||
this.tempGuid = context.request.headers['hostr-guid'];
|
||||
this.remoteIp = context.request.headers['x-real-ip'] || context.req.connection.remoteAddress;
|
||||
|
|
@ -54,13 +54,23 @@ export default class Uploader {
|
|||
});
|
||||
|
||||
this.tempGuid = this.tempGuid;
|
||||
this.originalName = this.upload.filename;
|
||||
this.filename = this.upload.filename.replace(/[^a-zA-Z0-9\.\-_\s]/g, '').replace(/\s+/g, '');
|
||||
this.id = yield hostrId(this.Files);
|
||||
this.file = yield models.file.create({
|
||||
id: yield createHostrId(),
|
||||
name: this.upload.filename.replace(/[^a-zA-Z0-9\.\-_\s]/g, '').replace(/\s+/g, ''),
|
||||
originalName: this.upload.filename,
|
||||
userId: this.context.user.id,
|
||||
status: 'uploading',
|
||||
type: sniff(this.upload.filename),
|
||||
ip: this.remoteIp,
|
||||
accessedAt: null,
|
||||
width: null,
|
||||
height: null,
|
||||
});
|
||||
yield this.file.save();
|
||||
}
|
||||
|
||||
receive() {
|
||||
this.path = join(this.id[0], `${this.id}_${this.filename}`);
|
||||
this.path = join(this.file.id[0], `${this.file.id}_${this.file.name}`);
|
||||
this.localStream = fs.createWriteStream(join(storePath, this.path));
|
||||
|
||||
this.upload.pause();
|
||||
|
|
@ -78,8 +88,8 @@ export default class Uploader {
|
|||
this.percentComplete = Math.floor(this.receivedSize * 100 / this.expectedSize);
|
||||
if (this.percentComplete > this.lastPercent && this.lastTick < Date.now() - 1000) {
|
||||
const progressEvent = `{"type": "file-progress", "data":
|
||||
{"id": "${this.upload.id}", "complete": ${this.percentComplete}}}`;
|
||||
this.context.redis.publish(`/file/${this.upload.id}`, progressEvent);
|
||||
{"id": "${this.file.id}", "complete": ${this.percentComplete}}}`;
|
||||
this.context.redis.publish(`/file/${this.file.id}`, progressEvent);
|
||||
this.context.redis.publish(`/user/${this.context.user.id}`, progressEvent);
|
||||
this.lastTick = Date.now();
|
||||
}
|
||||
|
|
@ -89,6 +99,8 @@ export default class Uploader {
|
|||
});
|
||||
|
||||
this.upload.on('end', () => {
|
||||
this.file.size = this.receivedSize;
|
||||
this.file.md5 = this.md5sum.digest('hex');
|
||||
this.localStream.end();
|
||||
});
|
||||
|
||||
|
|
@ -96,61 +108,34 @@ export default class Uploader {
|
|||
}
|
||||
|
||||
acceptedEvent() {
|
||||
const acceptedEvent = `{"type": "file-accepted", "data":
|
||||
{"id": "${this.id}", "guid": "${this.tempGuid}", "href": "${baseURL}/${this.id}"}}`;
|
||||
this.context.redis.publish(`/user/${this.context.user.id}`, acceptedEvent);
|
||||
const accepted = `{"type": "file-accepted", "data":
|
||||
{"id": "${this.file.id}", "guid": "${this.tempGuid}", "href": "${baseURL}/${this.file.id}"}}`;
|
||||
this.context.redis.publish(`/user/${this.context.user.id}`, accepted);
|
||||
this.context.statsd.incr('file.upload.accepted', 1);
|
||||
}
|
||||
|
||||
processingEvent() {
|
||||
const processingEvent = `{"type": "file-progress", "data":
|
||||
{"id": "${this.id}", "complete": 100}}`;
|
||||
this.context.redis.publish(`/file/${this.id}`, processingEvent);
|
||||
this.context.redis.publish(`/user/${this.context.user.id}`, processingEvent);
|
||||
const processing = `{"type": "file-progress", "data":
|
||||
{"id": "${this.file.id}", "complete": 100}}`;
|
||||
this.context.redis.publish(`/file/${this.file.id}`, processing);
|
||||
this.context.redis.publish(`/user/${this.context.user.id}`, processing);
|
||||
this.context.statsd.incr('file.upload.complete', 1);
|
||||
}
|
||||
|
||||
completeEvent() {
|
||||
const completeEvent = `{"type": "file-added", "data": ${JSON.stringify(this.toDBFormat())}}`;
|
||||
this.context.redis.publish(`/file/${this.id}`, completeEvent);
|
||||
this.context.redis.publish(`/user/${this.context.user.id}`, completeEvent);
|
||||
}
|
||||
|
||||
toDBFormat() {
|
||||
const formatted = {
|
||||
owner: this.context.user.id,
|
||||
ip: this.remoteIp,
|
||||
system_name: this.id,
|
||||
file_name: this.filename,
|
||||
original_name: this.originalName,
|
||||
file_size: this.receivedSize,
|
||||
time_added: Math.ceil(Date.now() / 1000),
|
||||
status: 'active',
|
||||
last_accessed: null,
|
||||
s3: false,
|
||||
type: sniff(this.filename),
|
||||
};
|
||||
|
||||
if (this.width) {
|
||||
formatted.width = this.width;
|
||||
formatted.height = this.height;
|
||||
}
|
||||
|
||||
return formatted;
|
||||
}
|
||||
|
||||
save() {
|
||||
return this.Files.insertOne({ _id: this.id, ...this.toDBFormat() });
|
||||
}
|
||||
|
||||
toJSON() {
|
||||
return formatFile({ _id: this.id, ...this.toDBFormat() });
|
||||
const complete = `{"type": "file-added", "data": ${JSON.stringify(formatFile(this.file))}}`;
|
||||
this.context.redis.publish(`/file/${this.file.id}`, complete);
|
||||
this.context.redis.publish(`/user/${this.context.user.id}`, complete);
|
||||
}
|
||||
|
||||
*checkLimit() {
|
||||
const count = yield this.Files.count({
|
||||
owner: this.context.user.id,
|
||||
time_added: { $gt: Math.ceil(Date.now() / 1000) - 86400 },
|
||||
const count = yield models.file.count({
|
||||
where: {
|
||||
userId: this.context.user.id,
|
||||
createdAt: {
|
||||
$gt: Date.now() - 86400000,
|
||||
},
|
||||
},
|
||||
});
|
||||
const userLimit = this.context.user.daily_upload_allowance;
|
||||
const underLimit = (count < userLimit || userLimit === 'unlimited');
|
||||
|
|
@ -167,22 +152,15 @@ export default class Uploader {
|
|||
}
|
||||
|
||||
*finalise() {
|
||||
const dbFile = this.toDBFormat();
|
||||
dbFile.file_size = this.receivedSize;
|
||||
dbFile.status = 'active';
|
||||
dbFile.md5 = this.md5sum.digest('hex');
|
||||
|
||||
if (this.width) {
|
||||
dbFile.width = this.width;
|
||||
dbFile.height = this.height;
|
||||
}
|
||||
|
||||
yield this.Files.updateOne({ _id: this.id }, { $set: dbFile });
|
||||
this.file.size = this.receivedSize;
|
||||
this.file.status = 'active';
|
||||
this.file.processed = 'true';
|
||||
yield this.file.save();
|
||||
}
|
||||
|
||||
resizeImage(upload, type, currentSize, newSize) {
|
||||
return resize(join(storePath, this.path), type, currentSize, newSize).then((image) => {
|
||||
const path = join(this.id[0], String(newSize.width), `${this.id}_${this.filename}`);
|
||||
resizeImage(upload, type, currentSize, dim) {
|
||||
return resize(join(storePath, this.path), type, currentSize, dim).then((image) => {
|
||||
const path = join(this.file.id[0], String(dim.width), `${this.file.id}_${this.file.name}`);
|
||||
debug('Writing file');
|
||||
debug(join(storePath, path));
|
||||
return fs.writeFile(join(storePath, path), image).catch(debug);
|
||||
|
|
@ -209,8 +187,8 @@ export default class Uploader {
|
|||
return;
|
||||
}
|
||||
|
||||
this.width = size.width;
|
||||
this.height = size.height;
|
||||
this.file.width = size.width;
|
||||
this.file.height = size.height;
|
||||
|
||||
Promise.all([
|
||||
this.resizeImage(upload, size.type, size, { width: 150, height: 150 }),
|
||||
|
|
@ -228,9 +206,15 @@ export default class Uploader {
|
|||
debug('Malware Scan');
|
||||
const result = yield malware(this);
|
||||
if (result) {
|
||||
yield this.Files.updateOne({ _id: this.id },
|
||||
{ $set: { malware: result.positive, virustotal: result } });
|
||||
if (result.positive) {
|
||||
this.file.malwarePositives = result.positives;
|
||||
this.file.save();
|
||||
const fileMalware = yield models.malware.create({
|
||||
fileId: this.file.id,
|
||||
positives: result.positives,
|
||||
virustotal: result,
|
||||
});
|
||||
fileMalware.save();
|
||||
if (result.positive > 5) {
|
||||
this.context.statsd.incr('file.malware', 1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue