diff --git a/api/lib/auth.js b/api/lib/auth.js index 67780a1..42cf9dc 100644 --- a/api/lib/auth.js +++ b/api/lib/auth.js @@ -1,63 +1,88 @@ import passwords from 'passwords'; import auth from 'basic-auth'; +import models from '../../models'; import debugname from 'debug'; const debug = debugname('hostr-api:auth'); const badLoginMsg = '{"error": {"message": "Incorrect login details.", "code": 607}}'; export default function* (next) { - const Users = this.db.Users; - const Files = this.db.Files; - const Logins = this.db.Logins; let user = false; - + const remoteIp = this.req.headers['x-real-ip'] || this.req.connection.remoteAddress; + const login = yield models.login.create({ + ip: remoteIp, + successful: false, + }); if (this.req.headers.authorization && this.req.headers.authorization[0] === ':') { debug('Logging in with token'); const userToken = yield this.redis.get(this.req.headers.authorization.substr(1)); this.assert(userToken, 401, '{"error": {"message": "Invalid token.", "code": 606}}'); debug('Token found'); - user = yield Users.findOne({ _id: this.db.objectId(userToken) }); + user = yield models.user.findById(userToken); + if (!user) { + login.save(); + return; + } } else { const authUser = auth(this); this.assert(authUser, 401, badLoginMsg); - const remoteIp = this.req.headers['x-real-ip'] || this.req.connection.remoteAddress; - const count = yield Logins.count({ - ip: remoteIp, - successful: false, - at: { $gt: Math.ceil(Date.now() / 1000) - 600 }, + const count = yield models.login.count({ + where: { + ip: remoteIp, + successful: false, + createdAt: { + $gt: new Date(Math.ceil(Date.now()) - 600000), + }, + }, }); + this.assert(count < 25, 401, '{"error": {"message": "Too many incorrect logins.", "code": 608}}'); - yield Logins.insertOne({ ip: remoteIp, at: Math.ceil(Date.now() / 1000), successful: null }); - user = yield Users.findOne({ - email: authUser.name, - banned: { $exists: false }, - status: { $ne: 'deleted' }, + user = yield models.user.findOne({ + where: { + email: authUser.name, + activated: true, + }, }); - this.assert(user, 401, badLoginMsg); - const authenticated = yield passwords.match(authUser.pass, user.salted_password); - this.assert(authenticated, 401, badLoginMsg); + + if (!user || !(yield passwords.match(authUser.pass, user.password))) { + login.save(); + this.throw(401, badLoginMsg); + return; + } } debug('Checking user'); this.assert(user, 401, badLoginMsg); debug('Checking user is activated'); - this.assert(!user.activationCode, 401, + debug(user.activated); + this.assert(user.activated === true, 401, '{"error": {"message": "Account has not been activated.", "code": 603}}'); - const uploadedTotal = yield Files.count({ owner: user._id, status: { $ne: 'deleted' } }); - const uploadedToday = yield Files.count({ - owner: user._id, - time_added: { $gt: Math.ceil(Date.now() / 1000) - 86400 }, + login.successful = true; + yield login.save(); + + const uploadedTotal = yield models.file.count({ + where: { + userId: user.id, + }, + }); + const uploadedToday = yield models.file.count({ + where: { + userId: user.id, + createdAt: { + $gt: Math.ceil(Date.now() / 1000) - 86400, + }, + }, }); const normalisedUser = { - id: user._id, + id: user.id, email: user.email, - daily_upload_allowance: user.type === 'Pro' ? 'unlimited' : 15, + daily_upload_allowance: user.plan === 'Pro' ? 'unlimited' : 15, file_count: uploadedTotal, - max_filesize: user.type === 'Pro' ? 524288000 : 20971520, - plan: user.type || 'Free', + max_filesize: user.plan === 'Pro' ? 524288000 : 20971520, + plan: user.plan, uploads_today: uploadedToday, }; this.response.set('Daily-Uploads-Remaining', diff --git a/api/routes/file.js b/api/routes/file.js index 25e3f0d..299d11e 100644 --- a/api/routes/file.js +++ b/api/routes/file.js @@ -1,5 +1,6 @@ import redis from 'redis'; +import models from '../../models'; import { formatFile } from '../../lib/format'; import Uploader from '../../lib/uploader'; @@ -20,7 +21,6 @@ export function* post(next) { uploader.receive(); - yield uploader.save(); yield uploader.promise; uploader.processingEvent(); @@ -31,7 +31,7 @@ export function* post(next) { yield uploader.finalise(); this.status = 201; - this.body = uploader.toJSON(); + this.body = formatFile(uploader.file); uploader.completeEvent(); uploader.malwareScan(); @@ -39,48 +39,44 @@ export function* post(next) { export function* list() { - const Files = this.db.Files; - - let status = 'active'; - if (this.request.query.trashed) { - status = 'trashed'; - } else if (this.request.query.all) { - status = { $in: ['active', 'trashed'] }; - } - let limit = 20; if (this.request.query.perpage === '0') { - limit = false; + limit = 1000; } else if (this.request.query.perpage > 0) { limit = parseInt(this.request.query.perpage / 1, 10); } - let skip = 0; + let offset = 0; if (this.request.query.page) { - skip = parseInt(this.request.query.page - 1, 10) * limit; + offset = parseInt(this.request.query.page - 1, 10) * limit; } - const queryOptions = { - limit, skip, sort: [['time_added', 'desc']], - hint: { - owner: 1, status: 1, time_added: -1, + const files = yield models.file.findAll({ + where: { + userId: this.user.id, + status: 'active', }, - }; + order: '"createdAt" DESC', + offset, + limit, + }); - const userFiles = yield Files.find({ - owner: this.user.id, status }, queryOptions).toArray(); this.statsd.incr('file.list', 1); - this.body = userFiles.map(formatFile); + this.body = files.map(formatFile); } export function* get() { - const Files = this.db.Files; - const Users = this.db.Users; - const file = yield Files.findOne({ _id: this.params.id, - status: { $in: ['active', 'uploading'] } }); + const file = yield models.file.findOne({ + where: { + id: this.params.id, + status: { + $in: ['active', 'uploading'], + }, + }, + }); this.assert(file, 404, '{"error": {"message": "File not found", "code": 604}}'); - const user = yield Users.findOne({ _id: file.owner }); + const user = yield file.getUser(); this.assert(user && !user.banned, 404, '{"error": {"message": "File not found", "code": 604}}'); this.statsd.incr('file.get', 1); this.body = formatFile(file); @@ -89,17 +85,28 @@ export function* get() { export function* put() { if (this.request.body.trashed) { - const Files = this.db.Files; - const status = this.request.body.trashed ? 'trashed' : 'active'; - yield Files.updateOne({ _id: this.params.id, owner: this.user.id }, - { $set: { status } }, { w: 1 }); + const file = yield models.file.findOne({ + where: { + id: this.params.id, + userId: this.user.id, + }, + }); + file.status = this.request.body.trashed ? 'trashed' : 'active'; + yield file.save(); } } export function* del() { - yield this.db.Files.updateOne({ _id: this.params.id, owner: this.db.objectId(this.user.id) }, - { $set: { status: 'deleted' } }, { w: 1 }); + const file = yield models.file.findOne({ + where: { + id: this.params.id, + userId: this.user.id, + }, + }); + this.assert(file, 401, '{"error": {"message": "File not found", "code": 604}}'); + file.status = 'deleted'; + yield file.save(); const event = { type: 'file-deleted', data: { id: this.params.id } }; yield this.redis.publish(`/file/${this.params.id}`, JSON.stringify(event)); yield this.redis.publish(`/user/${this.user.id}`, JSON.stringify(event)); diff --git a/api/routes/user.js b/api/routes/user.js index c806551..c9b7637 100644 --- a/api/routes/user.js +++ b/api/routes/user.js @@ -2,6 +2,7 @@ import uuid from 'node-uuid'; import redis from 'redis'; import co from 'co'; import passwords from 'passwords'; +import models from '../../models'; import debugname from 'debug'; const debug = debugname('hostr-api:user'); @@ -19,17 +20,15 @@ export function* token() { } export function* transaction() { - const Transactions = this.db.Transactions; - const transactions = yield Transactions.find({ user_id: this.user.id }).toArray(); + const transactions = yield models.transaction.findAll({ userId: this.user.id }); - this.body = transactions.map((transaction) => { // eslint-disable-line no-shadow - const type = transaction.paypal ? 'paypal' : 'direct'; + this.body = transactions.map((item) => { return { - id: transaction._id, - amount: transaction.paypal ? transaction.amount : transaction.amount / 100, - date: transaction.date, - description: transaction.desc, - type, + id: item.id, + amount: item.amount / 100, + date: item.date, + description: item.description, + type: 'direct', }; }); } @@ -39,23 +38,18 @@ export function* settings() { '{"error": {"message": "Current Password required to update account.", "code": 612}}'); this.assert(this.request.body.current_password, 400, '{"error": {"message": "Current Password required to update account.", "code": 612}}'); - const Users = this.db.Users; - const user = yield Users.findOne({ _id: this.user.id }); - this.assert(yield passwords.match(this.request.body.current_password, user.salted_password), 400, + const user = yield models.user.findById(this.user.id); + this.assert(yield passwords.match(this.request.body.current_password, user.password), 400, '{"error": {"message": "Incorrect password", "code": 606}}'); - const data = {}; if (this.request.body.email && this.request.body.email !== user.email) { - data.email = this.request.body.email; - if (!user.activated_email) { - data.activated_email = user.email; // eslint-disable-line camelcase - } + user.email = this.request.body.email; } if (this.request.body.new_password) { this.assert(this.request.body.new_password.length >= 7, 400, '{"error": {"message": "Password must be 7 or more characters long.", "code": 606}}'); - data.salted_password = yield passwords.hash(this.request.body.new_password); + user.password = yield passwords.hash(this.request.body.new_password); } - Users.updateOne({ _id: user._id }, { $set: data }); + yield user.save(); this.body = {}; } diff --git a/app.js b/app.js index 4bee4cd..43b1d32 100644 --- a/app.js +++ b/app.js @@ -13,6 +13,8 @@ import * as redis from './lib/redis'; import api, { ws } from './api/app'; import web from './web/app'; +import models from './models'; + import debugname from 'debug'; const debug = debugname('hostr'); diff --git a/lib/format.js b/lib/format.js index 206921b..c02c16c 100644 --- a/lib/format.js +++ b/lib/format.js @@ -22,15 +22,15 @@ export function formatSize(size) { export function formatFile(file) { const formattedFile = { - added: moment.unix(file.time_added).format(), - readableAdded: formatDate(file.time_added), + added: moment.unix(file.createdAt).format(), + readableAdded: formatDate(file.createdAt), downloads: file.downloads !== undefined ? file.downloads : 0, - href: `${baseURL}/${file._id}`, - id: file._id, - name: file.file_name, - size: file.file_size, - readableSize: formatSize(file.file_size), - type: sniff(file.file_name), + href: `${baseURL}/${file.id}`, + id: file.id, + name: file.name, + size: file.size, + readableSize: formatSize(file.size), + type: sniff(file.name), trashed: (file.status === 'trashed'), status: file.status, }; @@ -38,10 +38,10 @@ export function formatFile(file) { if (file.width) { formattedFile.height = file.height; formattedFile.width = file.width; - const ext = (file.file_name.split('.').pop().toLowerCase() === 'psd' ? '.png' : ''); + const ext = (file.name.split('.').pop().toLowerCase() === 'psd' ? '.png' : ''); formattedFile.direct = { - '150x': `${baseURL}/file/150/${file._id}/${file.file_name}${ext}`, - '970x': `${baseURL}/file/970/${file._id}/${file.file_name}${ext}`, + '150x': `${baseURL}/file/150/${file.id}/${file.name}${ext}`, + '970x': `${baseURL}/file/970/${file.id}/${file.name}${ext}`, }; } return formattedFile; diff --git a/lib/hostr-id.js b/lib/hostr-id.js index 444d8dc..3a069da 100644 --- a/lib/hostr-id.js +++ b/lib/hostr-id.js @@ -1,3 +1,5 @@ +import models from '../models'; + const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; function randomID() { @@ -12,7 +14,7 @@ function* checkId(Files, fileId, attempts) { if (attempts > 10) { return false; } - const file = yield Files.findOne({ _id: fileId }); + const file = yield models.file.findById(fileId); if (file === null) { return fileId; } diff --git a/lib/malware.js b/lib/malware.js index 4144728..8c31510 100644 --- a/lib/malware.js +++ b/lib/malware.js @@ -71,7 +71,7 @@ export default function* (file) { } const result = yield virustotal.getFileReport(file.md5); return { - positive: result.positives >= 5, + positives: result.positives, result, }; } diff --git a/lib/resize.js b/lib/resize.js index 2e17456..740ce51 100644 --- a/lib/resize.js +++ b/lib/resize.js @@ -55,17 +55,17 @@ function scale(path, type, size) { }); } -export default function resize(path, type, currentSize, newSize) { +export default function resize(path, type, currentSize, dim) { debug('Resizing'); const ratio = 970 / currentSize.width; - debug(newSize.width, ratio); - if (newSize.width <= 150) { + debug(dim.width, ratio); + if (dim.width <= 150) { debug('Cover'); - return cover(path, type, newSize); - } else if (newSize.width >= 970 && ratio < 1) { + return cover(path, type, dim); + } else if (dim.width >= 970 && ratio < 1) { debug('Scale'); - newSize.height = currentSize.height * ratio; // eslint-disable-line no-param-reassign - return scale(path, type, newSize); + dim.height = currentSize.height * ratio; // eslint-disable-line no-param-reassign + return scale(path, type, dim); } debug('Copy'); return fs.readFile(path); diff --git a/lib/uploader.js b/lib/uploader.js index 8bb4402..e98e441 100644 --- a/lib/uploader.js +++ b/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'; @@ -22,7 +23,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; @@ -55,13 +55,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(); @@ -79,8 +89,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(); } @@ -90,6 +100,8 @@ export default class Uploader { }); this.upload.on('end', () => { + this.file.size = this.receivedSize; + this.file.md5 = this.md5sum.digest('hex'); this.localStream.end(); }); @@ -101,62 +113,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({ + userId: this.context.user.id, + createdAt: { + $gt: Math.ceil(Date.now() / 1000) - 86400, + }, }); + debug(count); const userLimit = this.context.user.daily_upload_allowance; const underLimit = (count < userLimit || userLimit === 'unlimited'); if (!underLimit) { @@ -172,22 +156,14 @@ 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'; + 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).then(() => { @@ -217,8 +193,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 }), @@ -236,9 +212,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); } } diff --git a/models/activation.js b/models/activation.js new file mode 100644 index 0000000..c959919 --- /dev/null +++ b/models/activation.js @@ -0,0 +1,15 @@ +export default function (sequelize, DataTypes) { + const Activation = sequelize.define('activation', { + id: { type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4, primaryKey: true }, + activated: false, + email: DataTypes.STRING, + }, { + classMethods: { + associate: (models) => { + Activation.belongsTo(models.user); + }, + }, + }); + + return Activation; +} diff --git a/models/file.js b/models/file.js new file mode 100644 index 0000000..8d81a76 --- /dev/null +++ b/models/file.js @@ -0,0 +1,40 @@ +export default function (sequelize, DataTypes) { + const File = sequelize.define('file', { + id: { type: DataTypes.STRING(12), primaryKey: true }, // eslint-disable-line new-cap + name: DataTypes.TEXT, + originalName: DataTypes.TEXT, + size: DataTypes.BIGINT, + downloads: DataTypes.BIGINT, + accessedAt: DataTypes.DATE, + status: DataTypes.ENUM('active', 'uploading', 'deleted'), // eslint-disable-line new-cap + type: DataTypes.ENUM( // eslint-disable-line new-cap + 'image', + 'audio', + 'video', + 'archive', + 'other' + ), + width: DataTypes.INTEGER, + height: DataTypes.INTEGER, + ip: 'inet', + legacyId: DataTypes.STRING(12), // eslint-disable-line new-cap + md5: DataTypes.STRING(32), // eslint-disable-line new-cap + malwarePositives: DataTypes.INTEGER, + }, { + classMethods: { + accessed: (id) => sequelize.query(` + UPDATE files + SET "downloads" = downloads + 1, "accessedAt" = NOW() + WHERE "id" = :id`, + { + replacements: { id }, + type: sequelize.QueryTypes.UPDATE, + }), + associate: (models) => { + File.belongsTo(models.user); + }, + }, + }); + + return File; +} diff --git a/models/index.js b/models/index.js new file mode 100644 index 0000000..312c669 --- /dev/null +++ b/models/index.js @@ -0,0 +1,34 @@ +import fs from 'fs'; +import path from 'path'; +import Sequelize from 'sequelize'; + +import debugname from 'debug'; +const debug = debugname('hostr:models'); + +const config = { + dialect: 'postgres', + protocol: 'postgres', + logging: debug, +}; + +const sequelize = new Sequelize(process.env.DATABASE_URL, config); +const db = {}; + +fs + .readdirSync(__dirname) + .filter((file) => (file.indexOf('.') !== 0) && (file !== 'index.js')) + .forEach((file) => { + const model = sequelize.import(path.join(__dirname, file)); + db[model.name] = model; + }); + +Object.keys(db).forEach((modelName) => { + if ('associate' in db[modelName]) { + db[modelName].associate(db); + } +}); + +db.sequelize = sequelize; +db.Sequelize = Sequelize; + +export default db; diff --git a/models/login.js b/models/login.js new file mode 100644 index 0000000..855ae63 --- /dev/null +++ b/models/login.js @@ -0,0 +1,15 @@ +export default function (sequelize, DataTypes) { + const Login = sequelize.define('login', { + id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true }, + successful: { type: DataTypes.BOOLEAN }, + ip: { type: 'inet' }, + }, { + classMethods: { + associate: (models) => { + Login.belongsTo(models.user); + }, + }, + }); + + return Login; +} diff --git a/models/malware.js b/models/malware.js new file mode 100644 index 0000000..a2d994b --- /dev/null +++ b/models/malware.js @@ -0,0 +1,15 @@ +export default function (sequelize, DataTypes) { + const Malware = sequelize.define('malware', { + fileId: { type: DataTypes.STRING(12), primaryKey: true }, // eslint-disable-line new-cap + positives: DataTypes.INTEGER, + virustotal: DataTypes.JSON, + }, { + classMethods: { + associate: (models) => { + Malware.belongsTo(models.file); + }, + }, + }); + + return Malware; +} diff --git a/models/remember.js b/models/remember.js new file mode 100644 index 0000000..2b34bac --- /dev/null +++ b/models/remember.js @@ -0,0 +1,13 @@ +export default function (sequelize, DataTypes) { + const Remember = sequelize.define('remember', { + id: { type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4, primaryKey: true }, + }, { + classMethods: { + associate: (models) => { + Remember.belongsTo(models.user); + }, + }, + }); + + return Remember; +} diff --git a/models/reset.js b/models/reset.js new file mode 100644 index 0000000..dada472 --- /dev/null +++ b/models/reset.js @@ -0,0 +1,13 @@ +export default function (sequelize, DataTypes) { + const Reset = sequelize.define('reset', { + id: { type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4, primaryKey: true }, + }, { + classMethods: { + associate: (models) => { + Reset.belongsTo(models.user); + }, + }, + }); + + return Reset; +} diff --git a/models/transaction.js b/models/transaction.js new file mode 100644 index 0000000..a846d66 --- /dev/null +++ b/models/transaction.js @@ -0,0 +1,17 @@ +export default function (sequelize, DataTypes) { + const Transaction = sequelize.define('transaction', { + uuid: { type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4 }, + amount: DataTypes.DECIMAL, + description: DataTypes.STRING, + type: DataTypes.ENUM('direct', 'paypal'), // eslint-disable-line new-cap + ip: 'inet', + }, { + classMethods: { + associate: (models) => { + Transaction.belongsTo(models.user); + }, + }, + }); + + return Transaction; +} diff --git a/models/user.js b/models/user.js new file mode 100644 index 0000000..0f64415 --- /dev/null +++ b/models/user.js @@ -0,0 +1,21 @@ +export default function (sequelize, DataTypes) { + const User = sequelize.define('user', { + id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true }, + email: DataTypes.STRING, + password: DataTypes.STRING, + plan: DataTypes.ENUM('Free', 'Pro'), // eslint-disable-line new-cap + ip: 'inet', + activated: DataTypes.BOOLEAN, + banned: DataTypes.BOOLEAN, + deleted: DataTypes.BOOLEAN, + }, { + classMethods: { + associate: (models) => { + User.hasMany(models.file); + User.hasOne(models.activation); + }, + }, + }); + + return User; +} diff --git a/package.json b/package.json index 3a43418..fe210a8 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "lint": "eslint .", "start": "node -r babel-register app.js", "test": "npm run test-seed && mocha -r babel-register test/**/*.spec.js", - "test-seed": "node test/fixtures/mongo-user.js && node test/fixtures/mongo-file.js", + "test-seed": "babel-node test/fixtures/user.js", "watch": "parallelshell \"npm run watch-js\" \"npm run watch-sass\" \"npm run watch-server\"", "watch-js": "babel -Dw -m system -d web/public/build web/public/src", "watch-server": "nodemon -r babel-register app.js", @@ -73,6 +73,8 @@ "raven": "^0.11.0", "redis": "^2.6.1", "sendgrid": "^2.0.0", + "sequelize": "^3.23.3", + "sequelize-classes": "^0.1.12", "ssh2": "^0.5.0", "statsy": "~0.2.0", "stripe": "^4.7.0", diff --git a/test/fixtures/mongo-file.js b/test/fixtures/mongo-file.js deleted file mode 100644 index 3d11f11..0000000 --- a/test/fixtures/mongo-file.js +++ /dev/null @@ -1,11 +0,0 @@ -const MongoClient = require('mongodb').MongoClient; - -MongoClient.connect(process.env.MONGO_URL, function connect(err, db) { - const collection = db.collection('files'); - collection.createIndex({ - 'owner': 1, - 'status': 1, - 'time_added': -1, - }); - db.close(); -}); diff --git a/test/fixtures/mongo-user.js b/test/fixtures/mongo-user.js deleted file mode 100644 index 14334e2..0000000 --- a/test/fixtures/mongo-user.js +++ /dev/null @@ -1,15 +0,0 @@ -const MongoClient = require('mongodb').MongoClient; - -MongoClient.connect(process.env.MONGO_URL, function connect(err, db) { - const collection = db.collection('users'); - collection.remove({ - 'email': 'test@hostr.co', - }); - collection.save({ - 'email': 'test@hostr.co', - 'salted_password': '$pbkdf2-256-1$2$kBhIDRqFwnF/1ms6ZHfME2o2$a48e8c350d26397fcc88bf0a7a2817b1cdcd1ffffe0521a5', - 'joined': Math.ceil(Date.now() / 1000), - 'signup_ip': '127.0.0.1', - }); - db.close(); -}); diff --git a/test/fixtures/user.js b/test/fixtures/user.js new file mode 100644 index 0000000..cc3a391 --- /dev/null +++ b/test/fixtures/user.js @@ -0,0 +1,27 @@ +import models from '../../models'; + +function createUser() { + models.user.create({ + 'email': 'test@hostr.co', + 'password': '$pbkdf2-256-1$2$kBhIDRqFwnF/1ms6ZHfME2o2$a48e8c350d26397fcc88bf0a7a2817b1cdcd1ffffe0521a5', + 'ip': '127.0.0.1', + 'plan': 'Free', + 'activated': true, + }).then((user) => { + user.save().then(() => { + models.sequelize.close(); + }); + }); +} + +models.user.findOne({ + where: { + email: 'test@hostr.co', + }, +}).then((user) => { + if (user) { + user.destroy().then(createUser); + } else { + createUser(); + } +}); diff --git a/web/lib/auth.js b/web/lib/auth.js index 3eb6c51..6e9fc64 100644 --- a/web/lib/auth.js +++ b/web/lib/auth.js @@ -1,8 +1,9 @@ import crypto from 'crypto'; +import { join } from 'path'; import passwords from 'passwords'; import uuid from 'node-uuid'; import views from 'co-views'; -import { join } from 'path'; +import models from '../../models'; const render = views(join(__dirname, '..', 'views'), { default: 'ejs' }); import debugname from 'debug'; const debug = debugname('hostr-web:auth'); @@ -13,45 +14,46 @@ const from = process.env.EMAIL_FROM; const fromname = process.env.EMAIL_NAME; export function* authenticate(email, password) { - const Users = this.db.Users; - const Logins = this.db.Logins; const remoteIp = this.headers['x-real-ip'] || this.ip; if (!password || password.length < 6) { debug('No password, or password too short'); return new Error('Invalid login details'); } - const count = yield Logins.count({ - ip: remoteIp, - successful: false, - at: { $gt: Math.ceil(Date.now() / 1000) - 600 }, + const count = yield models.login.count({ + where: { + ip: remoteIp, + successful: false, + createdAt: { + $gt: Math.ceil(Date.now() / 1000) - 600, + }, + }, }); + if (count > 25) { debug('Throttling brute force'); return new Error('Invalid login details'); } - const login = { ip: remoteIp, at: Math.ceil(Date.now() / 1000), successful: null }; - yield Logins.save(login); - const user = yield Users.findOne({ + const user = yield models.user.findOne({ email: email.toLowerCase(), - banned: { $exists: false }, status: { $ne: 'deleted' }, + activated: 'true', }); + const login = yield models.login.create({ + ip: remoteIp, + successful: false, + }); + if (user) { - const verified = yield passwords.verify(password, user.salted_password); - if (verified) { + if (yield passwords.verify(password, user.password)) { debug('Password verified'); login.successful = true; - yield Logins.updateOne({ _id: login._id }, login); + yield login.save(); return user; } debug('Password invalid'); - login.successful = false; - yield Logins.updateOne({ _id: login._id }, login); - } else { - debug('Email invalid'); - login.successful = false; - yield Logins.updateOne({ _id: login._id }, login); + login.userId = user.id; } + yield login.save(); return new Error('Invalid login details'); } @@ -59,18 +61,16 @@ export function* authenticate(email, password) { export function* setupSession(user) { debug('Setting up session'); const token = uuid.v4(); - yield this.redis.set(token, user._id, 'EX', 604800); + yield this.redis.set(token, user.id, 'EX', 604800); const sessionUser = { - id: user._id, + id: user.id, email: user.email, dailyUploadAllowance: 15, maxFileSize: 20971520, - joined: user.joined, - plan: user.type || 'Free', - uploadsToday: yield this.db.Files.count({ - owner: user._id, time_added: { $gt: Math.ceil(Date.now() / 1000) - 86400 }, - }), + joined: user.createdAt, + plan: user.plan, + uploadsToday: yield models.file.count({ userId: user.id }), md5: crypto.createHash('md5').update(user.email).digest('hex'), token, }; @@ -82,39 +82,45 @@ export function* setupSession(user) { this.session.user = sessionUser; if (this.request.body.remember && this.request.body.remember === 'on') { - const Remember = this.db.Remember; - const rememberToken = uuid(); - Remember.save({ _id: rememberToken, user_id: user.id, created: new Date().getTime() }); - this.cookies.set('r', rememberToken, { maxAge: 1209600000, httpOnly: true }); + const remember = yield models.remember.create({ + id: uuid(), + userId: user.id, + }); + this.cookies.set('r', remember.id, { maxAge: 1209600000, httpOnly: true }); } debug('Session set up'); } export function* signup(email, password, ip) { - const Users = this.db.Users; - const existingUser = yield Users.findOne({ email, status: { $ne: 'deleted' } }); + const existingUser = yield models.user.findOne({ where: { email, activated: true } }); if (existingUser) { debug('Email already in use.'); throw new Error('Email already in use.'); } const cryptedPassword = yield passwords.crypt(password); - const user = { + const user = yield models.user.create({ email, - salted_password: cryptedPassword, - joined: Math.round(new Date().getTime() / 1000), - signup_ip: ip, - activationCode: uuid(), - }; - Users.insertOne(user); + password: cryptedPassword, + created: Math.round(new Date().getTime() / 1000), + ip, + activation: { + id: uuid(), + email, + }, + }, { + include: [models.activation], + }); + + yield user.save(); const html = yield render('email/inlined/activate', { - activationUrl: `${process.env.WEB_BASE_URL}/activate/${user.activationCode}`, + activationUrl: `${process.env.WEB_BASE_URL}/activate/${user.activation.id}`, }); const text = `Thanks for signing up to Hostr! Please confirm your email address by clicking the link below. -${process.env.WEB_BASE_URL}/activate/${user.activationCode} +${process.env.WEB_BASE_URL}/activate/${user.activation.id} — Jonathan Cremin, Hostr Founder `; @@ -132,21 +138,17 @@ ${process.env.WEB_BASE_URL}/activate/${user.activationCode} export function* sendResetToken(email) { - const Users = this.db.Users; - const Reset = this.db.Reset; - const user = yield Users.findOne({ email }); + const user = yield models.user.findOne({ email }); if (user) { - const token = uuid.v4(); - Reset.save({ - _id: user._id, - created: Math.round(new Date().getTime() / 1000), - token, + const reset = yield models.reset.create({ + id: uuid.v4(), + userId: user.id, }); const html = yield render('email/inlined/forgot', { - forgotUrl: `${process.env.WEB_BASE_URL}/forgot/${token}`, + forgotUrl: `${process.env.WEB_BASE_URL}/forgot/${reset.id}`, }); const text = `It seems you've forgotten your password :( -Visit ${process.env.WEB_BASE_URL}/forgot/${token} to set a new one. +Visit ${process.env.WEB_BASE_URL}/forgot/${reset.id} to set a new one. `; const mail = new sendgrid.Email({ to: user.email, @@ -165,38 +167,43 @@ Visit ${process.env.WEB_BASE_URL}/forgot/${token} to set a new one. export function* fromToken(token) { - const Users = this.db.Users; - const reply = yield this.redis.get(token); - return yield Users.findOne({ _id: reply }); + const userId = yield this.redis.get(token); + return yield models.user.findbyId(userId); } -export function* fromCookie(cookie) { - const Remember = this.db.Remember; - const Users = this.db.Users; - const remember = yield Remember.findOne({ _id: cookie }); - return yield Users.findOne({ _id: remember.user_id }); +export function* fromCookie(rememberId) { + const userId = yield models.remember.findById(rememberId); + return yield models.user.findbyId(userId); } -export function* validateResetToken() { - const Reset = this.db.Reset; - return yield Reset.findOne({ token: this.params.token }); +export function* validateResetToken(resetId) { + return yield models.reset.findbyId(resetId); } export function* updatePassword(userId, password) { - const Users = this.db.Users; const cryptedPassword = yield passwords.crypt(password); - yield Users.updateOne({ _id: userId }, { $set: { salted_password: cryptedPassword } }); + const user = yield models.user.findById(userId); + user.password = cryptedPassword; + yield user.save(); } export function* activateUser(code) { - const Users = this.db.Users; - const user = yield Users.findOne({ activationCode: code }); - if (user) { - Users.updateOne({ _id: user._id }, { $unset: { activationCode: '' } }); + debug(code); + const activation = yield models.activation.findOne({ + where: { + id: code, + }, + }); + if (activation.updatedAt.getTime() === activation.createdAt.getTime()) { + activation.activated = true; + yield activation.save(); + const user = yield activation.getUser(); + user.activated = true; + yield user.save(); yield setupSession.call(this, user); return true; } diff --git a/web/routes/file.js b/web/routes/file.js index 3091b84..b53a352 100644 --- a/web/routes/file.js +++ b/web/routes/file.js @@ -1,5 +1,6 @@ import { join } from 'path'; import mime from 'mime-types'; +import models from '../../models'; import hostrFileStream from '../../lib/hostr-file-stream'; import { formatFile } from '../../lib/format'; @@ -32,36 +33,38 @@ export function* get() { return; } - const file = yield this.db.Files.findOne({ - _id: this.params.id, - file_name: this.params.name, - status: 'active', + const file = yield models.file.findOne({ + where: { + id: this.params.id, + name: this.params.name, + status: 'active', + }, }); this.assert(file, 404); if (!hotlinkCheck(file, this.headers['user-agent'], this.headers.referer)) { - this.redirect(`/${file._id}`); + this.redirect(`/${file.id}`); return; } if (!file.width && this.request.query.warning !== 'on') { - this.redirect(`/${file._id}`); + this.redirect(`/${file.id}`); return; } if (file.malware) { const alert = this.request.query.alert; if (!alert || !alert.match(/i want to download malware/i)) { - this.redirect(`/${file._id}`); + this.redirect(`/${file.id}`); return; } } - let localPath = join(storePath, file._id[0], `${file._id}_${file.file_name}`); - let remotePath = join(file._id[0], `${file._id}_${file.file_name}`); + let localPath = join(storePath, file.id[0], `${file.id}_${file.name}`); + let remotePath = join(file.id[0], `${file.id}_${file.name}`); if (this.params.size > 0) { - localPath = join(storePath, file._id[0], this.params.size, `${file._id}_${file.file_name}`); - remotePath = join(file._id[0], this.params.size, `${file._id}_${file.file_name}`); + localPath = join(storePath, file.id[0], this.params.size, `${file.id}_${file.name}`); + remotePath = join(file.id[0], this.params.size, `${file.id}_${file.name}`); } if (file.malware) { @@ -73,13 +76,13 @@ export function* get() { if (this.params.size) { this.statsd.incr('file.view', 1); } - type = mime.lookup(file.file_name); + type = mime.lookup(file.name); } else { this.statsd.incr('file.download', 1); } if (userAgentCheck(this.headers['user-agent'])) { - this.set('Content-Disposition', `attachment; filename=${file.file_name}`); + this.set('Content-Disposition', `attachment; filename=${file.name}`); } this.set('Content-type', type); @@ -87,10 +90,7 @@ export function* get() { this.set('Cache-control', 'max-age=2592000'); if (!this.params.size || (this.params.size && this.params.size > 150)) { - this.db.Files.updateOne( - { _id: file._id }, - { $set: { last_accessed: Math.ceil(Date.now() / 1000) }, $inc: { downloads: 1 } }, - { w: 0 }); + models.file.accessed(file.id); } this.body = yield hostrFileStream(localPath, remotePath); @@ -101,10 +101,15 @@ export function* resized() { } export function* landing() { - const file = yield this.db.Files.findOne({ _id: this.params.id, status: 'active' }); + const file = yield models.file.findOne({ + where: { + id: this.params.id, + status: 'active', + }, + }); this.assert(file, 404); if (userAgentCheck(this.headers['user-agent'])) { - this.params.name = file.file_name; + this.params.name = file.name; yield get.call(this); return; } diff --git a/web/routes/user.js b/web/routes/user.js index 86e24f8..ac414dc 100644 --- a/web/routes/user.js +++ b/web/routes/user.js @@ -2,6 +2,7 @@ import { authenticate, setupSession, signup as signupUser, activateUser, sendResetToken, validateResetToken, updatePassword, } from '../lib/auth'; +import models from '../../models'; import debugname from 'debug'; const debug = debugname('hostr-web:user'); @@ -69,8 +70,6 @@ export function* signup() { export function* forgot() { - const Reset = this.db.Reset; - const Users = this.db.Users; const token = this.params.token; if (this.request.body.password) { @@ -83,16 +82,14 @@ export function* forgot() { return; } this.assertCSRF(this.request.body); - const tokenUser = yield validateResetToken.call(this, token); - const userId = tokenUser._id; - yield updatePassword.call(this, userId, this.request.body.password); - yield Reset.deleteOne({ _id: userId }); - const user = yield Users.findOne({ _id: userId }); - yield setupSession.call(this, user); + const user = yield validateResetToken(token); + yield updatePassword(user.id, this.request.body.password); + yield models.reset.deleteById(token); + yield setupSession(this, user); this.statsd.incr('auth.reset.success', 1); this.redirect('/'); } else if (token) { - const tokenUser = yield validateResetToken.call(this, token); + const tokenUser = yield validateResetToken(token); if (!tokenUser) { this.statsd.incr('auth.reset.fail', 1); yield this.render('forgot', {