Pad Description
\ - Here you can put anything you want in HTML!\ - ', -}; - -config.apis = { - YT: { - key: '', // Required api key in order for YouTube search to work. - restrictSearchToMusic: false, - }, - SC: { - key: '', - }, - reCaptcha: { - key: '', - secret: '', - }, - musiqpad: { - key: '', // This is required in order for your socket to update the musiqpad lounge. Request an API Key here: https://musiqpad.com/lounge - sendLobbyStats: true, - }, -}; - -// The amount of time users stay logged in for before having to login again in days. -// 0 = login every time; -config.loginExpire = 7; - -// Database config -config.db = { - dbType: 'level', // Values "level" for LevelDB, "mysql" for MySQL and "mongo" for MongoDB - dbDir: './socketserver/db', // Only used for LevelDB. Directory to save databases. Default is ./socketserver/db - mysqlUser: '', // Only used for MySQL. Database username - mysqlPassword: '', // Only used for MySQL. Database password - mysqlHost: '', // Only used for MySQL. Host address - mysqlDatabase: '', // Only used for MySQL. Database being used - mongoUser: '', // Only used for MongoDB. Database username - mongoPassword: '', // Only used for MongoDB. Database password - mongoHost: '', // Only used for MongoDB. Host address - mongoDatabase: '' // Only used for MongoDB. Database being used -}; - -/* - 'djqueue.join': Ability to join queue - 'djqueue.joinlocked': Ability to join locked queue - 'djqueue.leave': Ability to leave queue - 'djqueue.skip.self': Ability to skip self - 'djqueue.skip.other': Ability to skip others - 'djqueue.lock': Ability to lock/unlock queue - 'djqueue.limit': Ability to change waitlist limit - 'djqueue.cycle': Ability to enable/disable queue cycle - 'djqueue.move': Ability to move, swap, add and remove people in the queue - 'djqueue.playLiveVideos': Ability to play live videos with undefined duration - 'djqueue.lock.bypass': Bypass locked queue - 'djqueue.limit.bypass': Bypass queue limit - 'chat.send': Abilty to send chat messages - 'chat.delete': Ability to delete others' chat messages - 'chat.specialMention': Ability to use @everyone, @guest and @djs as mention - 'chat.broadcast': Ability to send a highlighted broadcast message - 'chat.private': Ability to send PMs - 'chat.staff': Ability to send and receive special staff chat - 'playlist.create': Ability to create playlists - 'playlist.delete': Ability to delete playlists - 'playlist.rename': Ability to rename playlists - 'playlist.import': Ability to import playlists - 'playlist.shuffle': Ability to shuffle playlists - 'room.grantroles': Ability to change user roles (requires canGrantPerms property) - 'room.restrict.ban': Ability to ban and unban users - 'room.restrict.mute': Ability to mute and unmute users - 'room.restrict.mute_silent': Ability to shadow mute and unmute users - 'room.ratelimit.bypass': Will bypass ratelimit - 'room.whois': Possibility to request additional information about a user - 'room.whois.iphistory': Possibility to request all IP addresses that the user logged from since account creation - - NOTE: Changing the PROPERTY NAME will break role assignments. Title can be changed - without breaking things, but property name must stay the same. -*/ - -// Defines the order that roles will appear on the user list -// PROPERTY names. NOT title. (case-sensitive) -config.roleOrder = ['dev', 'owner', 'coowner', 'supervisor', 'bot', 'regular', 'default']; - - -// Defines which roles are 'staff' members -// PROPERTY names. NOT title. (case-sensitive) -config.staffRoles = ['dev', 'owner', 'coowner', 'supervisor', 'bot']; - - -/* - -Role Options: - -rolename:{ - title: '', // This is the title that gets displayed on the frontend. - showtitle: true/false, // This is whether or not to display the title on the frontend. - badge: '', // This can be any icon from the mdi package. A list of the icons is available here: https://materialdesignicons.com - style: {}, // This can be used to set specific styles to the Username of a user with this role. - permissions: [], // A list of permissions a user with this role is allowed to use. - canGrantRoles: [], // A list of the roles that a user with this role can grant. I.e. an owner should be able to grant manager. - mention: '' // A custom mention. I.e. 'owner' would mention this group when someone typed @owner. -} - -Below are a list of roles we suggest using. - -*/ - -// Defines roles and permissions -config.roles = { - owner: { // REQUIRED ROLE - title: 'Owner', - showtitle: true, - style: { - 'color': '#F46B40' - }, - permissions: [ - 'djqueue.join', - 'djqueue.joinlocked', - 'djqueue.leave', - 'djqueue.skip.self', - 'djqueue.skip.other', - 'djqueue.lock', - 'djqueue.cycle', - 'djqueue.limit', - 'djqueue.move', - 'djqueue.playLiveVideos', - 'djqueue.limit.bypass', - 'djqueue.lock.bypass', - 'chat.send', - 'chat.private', - 'chat.broadcast', - 'chat.delete', - 'chat.specialMention', - 'chat.staff', - 'playlist.create', - 'playlist.delete', - 'playlist.rename', - 'playlist.import', - 'playlist.shuffle', - 'room.grantroles', - 'room.restrict.ban', - 'room.restrict.mute', - 'room.restrict.mute_silent', - 'room.ratelimit.bypass', - 'room.whois', - 'room.whois.iphistory', - 'server.checkForUpdates', - ], - canGrantRoles: [ - 'dev', - 'coowner', - 'supervisor', - 'bot', - 'regular', - 'default', - ], - }, - dev: { // OPTIONAL ROLE - FOR MUSIQPAD DEVELOPERS - title: 'Dev', - showtitle: true, - style: { - 'color': '#A77DC2' - }, - permissions: [ - 'djqueue.join', - 'djqueue.joinlocked', - 'djqueue.leave', - 'djqueue.skip.self', - 'djqueue.skip.other', - 'djqueue.lock', - 'djqueue.cycle', - 'djqueue.limit', - 'djqueue.move', - 'djqueue.playLiveVideos', - 'djqueue.limit.bypass', - 'djqueue.lock.bypass', - 'chat.send', - 'chat.private', - 'chat.broadcast', - 'chat.delete', - 'chat.specialMention', - 'chat.staff', - 'playlist.create', - 'playlist.delete', - 'playlist.rename', - 'playlist.import', - 'playlist.shuffle', - 'room.grantroles', - 'room.restrict.ban', - 'room.restrict.mute', - 'room.restrict.mute_silent', - 'room.ratelimit.bypass', - 'room.whois', - ], - canGrantRoles: [ - 'dev', - 'coowner', - 'supervisor', - 'bot', - 'regular', - 'default' - ], - mention: 'devs', - }, - coowner: { - title: 'Co-owner', - showtitle: true, - style: { - 'color': '#89BE6C' - }, - permissions: [ - 'djqueue.join', - 'djqueue.joinlocked', - 'djqueue.leave', - 'djqueue.skip.self', - 'djqueue.skip.other', - 'djqueue.lock', - 'djqueue.cycle', - 'djqueue.limit', - 'djqueue.move', - 'djqueue.playLiveVideos', - 'djqueue.limit.bypass', - 'djqueue.lock.bypass', - 'chat.send', - 'chat.private', - 'chat.delete', - 'chat.specialMention', - 'chat.broadcast', - 'chat.staff', - 'playlist.create', - 'playlist.delete', - 'playlist.rename', - 'playlist.import', - 'playlist.shuffle', - 'room.grantroles', - 'room.restrict.ban', - 'room.restrict.mute', - 'room.restrict.mute_silent', - 'room.ratelimit.bypass', - 'room.whois', - 'room.whois.iphistory', - ], - canGrantRoles: [ - 'supervisor', - 'bot', - 'regular', - 'default', - ], - }, - supervisor: { - title: 'Supervisor', - showtitle: true, - style: { - 'color': '#009CDD' - }, - permissions: [ - 'djqueue.join', - 'djqueue.joinlocked', - 'djqueue.leave', - 'djqueue.skip.self', - 'djqueue.skip.other', - 'djqueue.lock', - 'djqueue.cycle', - 'djqueue.move', - 'djqueue.playLiveVideos', - 'djqueue.limit.bypass', - 'djqueue.lock.bypass', - 'chat.send', - 'chat.private', - 'chat.delete', - 'chat.specialMention', - 'chat.staff', - 'playlist.create', - 'playlist.delete', - 'playlist.rename', - 'playlist.import', - 'playlist.shuffle', - 'room.grantroles', - 'room.restrict.ban', - 'room.restrict.mute', - 'room.restrict.mute_silent', - 'room.ratelimit.bypass', - 'room.whois', - ], - canGrantRoles: [ - 'regular', - 'default' - ], - }, - bot: { - title: 'Bot', - showtitle: true, - badge: 'android', - style: { - 'color': '#964B74' - }, - permissions: [ - 'djqueue.skip.other', - 'djqueue.lock', - 'djqueue.cycle', - 'djqueue.move', - 'chat.send', - 'chat.delete', - 'chat.specialMention', - 'room.restrict.ban', - 'room.restrict.mute', - 'room.restrict.mute_silent', - 'room.ratelimit.bypass', - ], - canGrantRoles: [], - }, - regular: { - title: 'Regular', - showtitle: false, - style: { - 'color': '#925AFF' - }, - permissions: [ - 'djqueue.join', - 'djqueue.joinlocked', - 'djqueue.leave', - 'chat.send', - 'chat.private', - 'djqueue.skip.self', - 'playlist.create', - 'playlist.delete', - 'playlist.rename', - 'playlist.import', - ], - canGrantRoles: [], - }, - default: { // REQUIRED ROLE - title: 'Default', - showtitle: false, - style: { - 'color': '#ffffff' - }, - permissions: [ - 'djqueue.join', - 'djqueue.leave', - 'chat.send', - 'chat.private', - 'djqueue.skip.self', - 'playlist.create', - 'playlist.delete', - 'playlist.rename', - 'playlist.import' - ], - canGrantRoles: [], - } -}; - -module.exports = config; diff --git a/socketserver/SC.js b/socketserver/SC.js index 3dce6ea..ee1bd96 100644 --- a/socketserver/SC.js +++ b/socketserver/SC.js @@ -1,11 +1,11 @@ // API reference: https://developers.soundcloud.com/docs/api/reference#track -var https = require('https'); -var util = require('util'); -var log = new (require('basic-logger'))({showTimestamp: true, prefix: "SC"}); -var querystring = require('querystring'); -var config = require('../serverconfig'); -var key = config.apis.SC.key; +const https = require('https'); +const util = require('util'); +const log = new (require('basic-logger'))({showTimestamp: true, prefix: "SC"}); +const querystring = require('querystring'); +const nconf = require('nconf'); +const key = nconf.get('apis:SC:key'); var SC = function(){ }; diff --git a/socketserver/YT.js b/socketserver/YT.js index 89cfb0e..06ae7a9 100644 --- a/socketserver/YT.js +++ b/socketserver/YT.js @@ -1,10 +1,10 @@ -var https = require('https'); -var util = require('util'); -var log = new (require('basic-logger'))({showTimestamp: true, prefix: "YT"}); -var querystring = require('querystring'); -var Duration = require("durationjs"); -var config = require('../serverconfig'); -var key = key = config.apis.YT.key; +const https = require('https'); +const util = require('util'); +const log = new (require('basic-logger'))({showTimestamp: true, prefix: "YT"}); +const querystring = require('querystring'); +const Duration = require("durationjs"); +const nconf = require('nconf'); +const key = nconf.get('apis:YT:key'); https.globalAgent.keepAlive = true; https.globalAgent.keepAliveMsecs = 60e3; @@ -146,7 +146,7 @@ YT.prototype.search = function(query, callback){ key: key }; - if (config.apis.YT.restrictSearchToMusic) + if (nconf.get('apis:YT:restrictSearchToMusic')) inObj.videoCategoryId = 10; // This is restricting the search to things categorized as music var url = "https://www.googleapis.com/youtube/v3/search?" + querystring.stringify(inObj); diff --git a/socketserver/database.js b/socketserver/database.js index 9f2cfc0..da5932f 100644 --- a/socketserver/database.js +++ b/socketserver/database.js @@ -1,16 +1,100 @@ -var config = require('../serverconfig'); +'use strict'; +const nconf = require('nconf'); +const LevelDB = require('./db_level'); +const MySQL = require('./db_mysql'); +const MongoDB = require('./db_mongo'); +const utils = require('./utils'); +let Database; -function Database(){ - config.db.dbType = config.db.dbType.toLowerCase() || 'level'; +var util = require('util'); - switch(config.db.dbType){ - case 'level': - return require('./db_level'); - case 'mysql': - return require('./db_mysql'); - case 'mongo': - return require('./db_mongo'); - } +switch (nconf.get('db:dbType')) { + case 'level': + Database = LevelDB; + break; + case 'mysql': + Database = MySQL; + break; + case 'mongo': + Database = MongoDB; + break; + default: + Database = LevelDB; } -module.exports = new Database(); \ No newline at end of file +function loginCallback(callback) { + return function (err, user, email) { + if (email) { + callback(null, user, utils.token.createToken({ email }, nconf.get('tokenSecret'), nconf.get('loginExpire'))); + return; + } + callback(err); + }; +} + +class DB extends Database { + loginUser(obj, callback) { + if (obj.token) { + try { + obj.email = utils.token.verify(obj.token, nconf.get('tokenSecret')).email; + } catch (e) { + if (e) { + callback('InvalidToken'); + return; + } + } + } + + this.getUser(obj.email, (err, user) => { + if ((err && err.notFound) || user == null) { + callback('UserNotFound'); + return; + } + + if (err) { + callback(err); + return; + } + // If the user has an old md5 password saved in the db + if (typeof user.data.pw === 'string' && utils.hash.isMD5(user.data.pw) && !obj.token) { + // And if that md5 password matches with the supplied pw + if (utils.db.makePassMD5(obj.pw, user.data.salt) !== user.data.pw) { + callback('IncorrectPassword'); + return; + } + // Update the pw to a new bcrypt password + user.pw = obj.pw; + super.loginUser(obj.email, loginCallback(callback)); + // If user has an md5 password and only supplied a token + } else if (utils.hash.isMD5(user.data.pw) && obj.token) { + // Say token is invalid so we get the password instead of the token next time + callback('InvalidToken'); + } else if (obj.token) { + // Check if the token is correct + utils.token.verify(obj.token, nconf.get('tokenSecret'), (err, decoded) => { + if (err) { + callback('InvalidToken'); + return; + } + const email = decoded.email; + super.loginUser(email, loginCallback(callback)); + }); + } else if (obj.pw && utils.hash.compareBcrypt(obj.pw, user.data.pw)) { + super.loginUser(obj.email, loginCallback(callback)); + } else { + callback('IncorrectPassword'); + } + }); + } + createUser(obj, callback) { + if (obj.pw) { + obj.pw = utils.hash.bcrypt(obj.pw); + super.createUser(obj, loginCallback(callback)); + } else { + callback('InvalidPassword'); + } + } +} + +const db = new DB(); +module.exports = db; diff --git a/socketserver/database_util.js b/socketserver/database_util.js deleted file mode 100644 index 04ad32d..0000000 --- a/socketserver/database_util.js +++ /dev/null @@ -1,17 +0,0 @@ -var Hash = require('./hash'); - -function DBUtils(){} - -DBUtils.prototype.makePass = function(inPass, salt) { - return Hash.md5(('' + inPass) + (salt || '')).toString(); -}; - -DBUtils.prototype.validateEmail = function(email) { - return /^.+@.+\..+$/.test(email); -}; - -DBUtils.prototype.validateUsername = function(un) { - return /^[a-z0-9_-]{3,20}$/i.test(un); -}; - -module.exports = new DBUtils(); \ No newline at end of file diff --git a/socketserver/db_level.js b/socketserver/db_level.js index cb8bc1a..c808e02 100644 --- a/socketserver/db_level.js +++ b/socketserver/db_level.js @@ -1,101 +1,112 @@ -//Modules -var levelup = require('levelup'); -var path = require('path'); -var util = require('util'); -var fs = require('fs'); -var log = new(require('basic-logger'))({ +'use strict'; +// Modules +const levelup = require('levelup'); +const path = require('path'); +const util = require('util'); +const fs = require('fs'); +const log = new(require('basic-logger'))({ showTimestamp: true, - prefix: "LevelDB" + prefix: 'LevelDB' }); +const nconf = require('nconf'); + +// Files +const Mailer = require('./mail/mailer'); +const DBUtils = require('./utils').db; +const User = require('./user'); + +// Variables +let currentPID = 0; +let currentUID = 0; +let currentCID = 0; +const expires = 1000 * 60 * 60 * 24 * nconf.get('loginExpire'); +let usernames = []; + +function setupDB(dir, setup, callback) { + setup = setup || function () {}; + callback = callback || function () {}; + + return levelup(dir, null, (err, newdb) => { + if (err) { + log.error('Could not open db'); + callback(err); + return; + } -//Files -var config = require('../serverconfig.js'); -var Mailer = require('./mailer'); -var DBUtils = require('./database_util'); - -//Variables -var currentPID = 0; -var currentUID = 0; -var currentCID = 0; -var expires = 1000 * 60 * 60 * 24 * config.loginExpire; -var usernames = []; + newdb.get('setup', (err) => { + if (err && err.notFound) { + newdb.put('setup', 1); + setup(newdb); + callback(null, newdb); + } else { + callback(null, newdb); + } + }); + }); +} function LevelDB(callback) { - var dbdir = path.resolve(config.db.dbDir || './socketserver/db'); + const dbdir = path.resolve(nconf.get('db:dbDir') || './socketserver/db'); try { fs.statSync(dbdir); - } catch(e) { + } catch (e) { fs.mkdirSync(dbdir); } - //PlaylistDB - if(!this.PlaylistDB) - this.PlaylistDB = setupDB(dbdir + '/playlists', - - //If new DB is created - function(newdb) { - currentPID = 1; - log.debug('PIDCOUNTER set to 1'); - newdb.put('PIDCOUNTER', 1); - }, - - //Callback - function(err, db) { - if (err) log.error('Could not open PlaylistDB: ' + err); - - if (currentPID != 0) return; - - db.get('PIDCOUNTER', function(err, val) { - if (err) { - throw new Error('Cannot get PIDCOUNTER from UserDB. Might be corrupt'); - } - currentPID = parseInt(val); - }); - }); - - //RoomDB - if(!this.RoomDB) - this.RoomDB = setupDB(dbdir + '/room', - - //If new DB is created - function(newdb) {}, - - //Callback - function(err, db) { - if (err) throw new Error('Could not open RoomDB: ' + err); - if (callback) callback(null, db); - }); - - //TokenDB - if(!this.TokenDB) - this.TokenDB = setupDB(dbdir + '/tokens', - - //If new DB is created - function(newdb) {}, - - //Callback - function(err, db) { - if (err) log.error('Could not open TokenDB: ' + err); - }); + // PlaylistDB + if (!this.PlaylistDB) { + this.PlaylistDB = setupDB(`${dbdir}/playlists`, + // If new DB is created + (newdb) => { + currentPID = 1; + log.debug('PIDCOUNTER set to 1'); + newdb.put('PIDCOUNTER', 1); + }, + + // Callback + (err, db) => { + if (err) log.error(`Could not open PlaylistDB: ${err}`); + if (currentPID !== 0) return; + db.get('PIDCOUNTER', (err, val) => { + if (err) { + throw new Error('Cannot get PIDCOUNTER from UserDB. Might be corrupt'); + } + currentPID = parseInt(val, 10); + }); + }); + } - //UserDB - if(!this.UserDB) - this.UserDB = setupDB(dbdir + '/users', + // RoomDB + if (!this.RoomDB) { + this.RoomDB = setupDB(`${dbdir}/room`, + // If new DB is created + () => {}, + + // Callback + (err, db) => { + if (err) throw new Error(`Could not open RoomDB: ${err}`); + if (callback) callback(null, db); + }); + } + + // UserDB + if (!this.UserDB) + this.UserDB = setupDB(`${dbdir}/users`, - //If new DB is created - function(newdb) { + // If new DB is created + function (newdb) { currentUID = 1; log.debug('UIDCOUNTER set to 1'); newdb.put('UIDCOUNTER', 1); }, - //Callback - function(err, newdb) { + // Callback + function (err, newdb) { if (err) { throw new Error('Could not open UserDB: ' + err); } if (currentUID != 0) return; - newdb.get('UIDCOUNTER', function(err, val) { + newdb.get('UIDCOUNTER', function (err, val) { if (err) { throw new Error('Cannot get UIDCOUNTER from UserDB. Might be corrupt'); } @@ -103,7 +114,7 @@ function LevelDB(callback) { }); newdb.createReadStream() - .on('data', function(data) { + .on('data', function (data) { if (data.key.indexOf('@') == -1) return; try { var user = JSON.parse(data.value); @@ -115,88 +126,65 @@ function LevelDB(callback) { user.lastdj = false; newdb.put(data.key, JSON.stringify(user)); }) - .on('end', function() { + .on('end', function () { return false; }); }); - - //ChatDB - if(!this.ChatDB) + + // ChatDB + if (!this.ChatDB) this.ChatDB = setupDB(dbdir + '/chat', - //If new DB is created - function(newdb) { + // If new DB is created + function (newdb) { currentCID = 1; log.debug('CIDCOUNTER set to 1'); newdb.put('CIDCOUNTER', 1); }, - //Callback - function(err, newdb) { + // Callback + function (err, newdb) { if (err) { throw new Error('Could not open ChatDB: ' + err); } if (currentCID != 0) return; - newdb.get('CIDCOUNTER', function(err, val) { + newdb.get('CIDCOUNTER', function (err, val) { if (err) { throw new Error('Cannot get CIDCOUNTER from PmDB. Might be corrupt'); } currentCID = parseInt(val); }); }); - - //PmDB - if(!this.PmDB) + // PmDB + if (!this.PmDB) this.PmDB = setupDB(dbdir + '/pm', - //If new DB is created - function(newdb) {}, + // If new DB is created + function (newdb) {}, - //Callback - function(err, newdb) { + // Callback + function (err, newdb) { if (err) { throw new Error('Could not open PmDB: ' + err); } }); - - //IpDB - if(!this.IpDB) + + // IpDB + if (!this.IpDB) this.IpDB = setupDB(dbdir + '/ip', - //If new DB is created - function(newdb) {}, + // If new DB is created + function (newdb) {}, - //Callback - function(err, newdb) { + // Callback + function (err, newdb) { if (err) { throw new Error('Could not open IpDB: ' + err); } }); } -function setupDB(dir, setup, callback){ - setup = setup || function(){}; - callback = callback || function(){}; - - return levelup(dir, null, function(err, newdb){ - if (err){ - log.error('Could not open db'); - callback(err); - return; - } - - newdb.get("setup", function( err, val ){ - if (err && err.notFound){ - newdb.put('setup', 1); - setup(newdb); - callback(null, newdb); - }else{ - callback(null, newdb); - } - }); - }); -} /** * getJSON() gives the callback function a parsed JSON object @@ -206,15 +194,15 @@ function setupDB(dir, setup, callback){ * @param {Function} callback * @return {Object} this */ -LevelDB.prototype.getJSON = function(db, key, callback) { - callback = callback || function() {}; +LevelDB.prototype.getJSON = function (db, key, callback) { + callback = callback || function () {}; - db.get(key, function(err, val) { + db.get(key, function (err, val) { if (val) { try { val = JSON.parse(val); } catch (e) { - console.log('Database key "' + key + '" returned malformed JSON object'); + console.log('Database key ' + key + ' returned malformed JSON object'); val = null; } } @@ -231,17 +219,17 @@ LevelDB.prototype.getJSON = function(db, key, callback) { * @param {Function} callback * @return {Object} this */ -LevelDB.prototype.putJSON = function(db, key, val, callback) { - callback = callback || function() {}; +LevelDB.prototype.putJSON = function (db, key, val, callback) { + callback = callback || function () {}; db.put(key, JSON.stringify(val), callback); return this; }; -//PlaylistDB -LevelDB.prototype.getPlaylist = function(pid, callback) { +// PlaylistDB +LevelDB.prototype.getPlaylist = function (pid, callback) { var Playlist = require('./playlist'); - this.getJSON(this.PlaylistDB, pid, function(err, data) { + this.getJSON(this.PlaylistDB, pid, function (err, data) { if (err) { callback('PlaylistNotFound'); return; @@ -257,7 +245,7 @@ LevelDB.prototype.getPlaylist = function(pid, callback) { return this; }; -LevelDB.prototype.createPlaylist = function(owner, name, callback) { +LevelDB.prototype.createPlaylist = function (owner, name, callback) { var Playlist = require('./playlist'); var pl = new Playlist(); @@ -271,60 +259,26 @@ LevelDB.prototype.createPlaylist = function(owner, name, callback) { callback(null, pl); }; -LevelDB.prototype.deletePlaylist = function(pid, callback) { +LevelDB.prototype.deletePlaylist = function (pid, callback) { this.PlaylistDB.del(pid.toString(), callback); }; -LevelDB.prototype.putPlaylist = function(pid, data, callback) { +LevelDB.prototype.putPlaylist = function (pid, data, callback) { this.putJSON(this.PlaylistDB, pid, data, callback); }; -//RoomDB -LevelDB.prototype.getRoom = function(slug, callback) { +// RoomDB +LevelDB.prototype.getRoom = function (slug, callback) { this.getJSON(this.RoomDB, slug, callback); return this; }; -LevelDB.prototype.setRoom = function(slug, val, callback) { +LevelDB.prototype.setRoom = function (slug, val, callback) { this.putJSON(this.RoomDB, slug, val, callback); return this; }; -//TokenDB -LevelDB.prototype.deleteToken = function(tok) { - this.TokenDB.del(tok); -}; - -LevelDB.prototype.createToken = function(email) { - var tok = DBUtils.makePass(email, Date.now()); - - this.putJSON(this.TokenDB, tok, { - email: email, - time: Date.now(), - }); - - return tok; -}; - -LevelDB.prototype.isTokenValid = function(tok, callback) { - var that = this; - - this.getJSON(this.TokenDB, tok, function(err, data) { - if (err || data == null) { - callback('InvalidToken'); - return; - } - - if (config.loginExpire && (Date.now() - data.time) < expires) { - callback(null, data.email); - } else { - that.deleteToken(data.token); - callback('InvalidToken'); - } - }); -}; - -//UserDB +// UserDB function addUsername(un) { usernames.push(un.toLowerCase()); } @@ -341,8 +295,7 @@ function usernameExists(un) { return ((ind = usernames.indexOf(un)) != -1 ? ind : false); } -LevelDB.prototype.createUser = function(obj, callback) { - var User = require('./user'); +LevelDB.prototype.createUser = function (obj, callback) { var that = this; var defaultCreateObj = { @@ -355,7 +308,7 @@ LevelDB.prototype.createUser = function(obj, callback) { var inData = defaultCreateObj; inData.email = inData.email.toLowerCase(); - //Validation + // Validation if (!inData.email || !DBUtils.validateEmail(inData.email)) { callback('InvalidEmail'); return; @@ -368,159 +321,98 @@ LevelDB.prototype.createUser = function(obj, callback) { callback('UsernameExists'); return; } - if (!inData.pw || inData.pw == 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855') { - callback('PasswordBlank'); - return; - } - //Check for existing account - this.userEmailExists(inData.email, function(err, res) { + // Check for existing account + this.userEmailExists(inData.email, function (err, res) { if (!err) { if (callback) callback('AccountExists'); return; } var user = new User(); - + user.data.uid = currentUID++; that.UserDB.put('UIDCOUNTER', currentUID); user.data.un = inData.un; - user.data.salt = DBUtils.makePass(Date.now()).slice(0, 10); - user.data.pw = DBUtils.makePass(inData.pw, user.data.salt); + user.data.pw = inData.pw; user.data.created = Date.now(); - if (config.room.email.confirmation) user.data.confirmation = DBUtils.makePass(Date.now()); + if (nconf.get('room:mail:confirmation')) user.data.confirmation = DBUtils.randomBytes(18, 'base64'); var updatedUserObj = user.makeDbObj(); - var tok = that.createToken(inData.email); - - that.putJSON(that.UserDB, inData.email, updatedUserObj, function(err) { + that.putJSON(that.UserDB, inData.email, updatedUserObj, function (err) { if (err) { callback(err); return; } - //Send confirmation email - if (config.room.email.confirmation) { + // Send confirmation email + if (nconf.get('room:mail:confirmation')) { Mailer.sendEmail('signup', { code: user.data.confirmation, user: inData.un, - }, inData.email, function(data) { + }, inData.email, function (data) { console.log(data); }); } - //Do other ~messy~ stuff + // Do other ~messy~ stuff addUsername(inData.un); user.login(inData.email); - callback(null, user, tok); + callback(null, user, inData.email); }); }); }; -LevelDB.prototype.loginUser = function(obj, callback) { - var User = require('./user'); - var that = this; - - var defaultLoginObj = { - email: null, - pw: null, - token: null, - }; - util._extend(defaultLoginObj, obj); - - var inData = defaultLoginObj; - - if (inData.email && inData.pw) { - inData.email = inData.email.toLowerCase(); - - this.getJSON(this.UserDB, inData.email, function(err, data) { - if ((err && err.notFound) || data == null) { - callback('UserNotFound'); - return; - } - - if (err) { - callback(err); - return; - } - - if (DBUtils.makePass(inData.pw, data.salt) != data.pw) { - callback('IncorrectPassword'); - return; - } - - var tok = that.createToken(inData.email); - var user = new User(); - - user.login(inData.email, data, function() { - - callback(null, user, tok); - }); - }); - } else if (inData.token) { - that.isTokenValid(inData.token, function(err, email) { - if (err) { - callback(err); - return; - } - - that.getJSON(that.UserDB, email, function(err, data) { - if ((err && err.notFound) || data == null) { - callback('UserNotFound'); - return; - } - - if (err) { - callback(err); - return; - } - - var user = new User(); - user.login(email, data, function() { - - callback(null, user); - }); - }); - }); - } else { - callback('InvalidArgs'); - } +LevelDB.prototype.loginUser = function (email, callback) { + if (email) { + email = email.toLowerCase(); + this.getJSON(this.UserDB, email, (err, data) => { + if ((err && err.notFound) || data == null) { + callback('UserNotFound'); + return; + } + if (err) { + callback(err); + return; + } + const user = new User(); + user.login(email, data, () => { + callback(null, user, email); + }); + }); + } }; -LevelDB.prototype.putUser = function(email, data, callback) { +LevelDB.prototype.putUser = function (email, data, callback) { this.putJSON(this.UserDB, email, data, callback); }; -LevelDB.prototype.getUser = function(email, callback){ - var User = require('./user'); +LevelDB.prototype.getUser = function (email, callback) { + this.getJSON(this.UserDB, email, function (err, data) { + if ((err && err.notFound) || data == null) { callback('UserNotFound'); return; } - this.getJSON(this.UserDB, email, function(err, data){ - if ((err && err.notFound) || data == null) {callback('UserNotFound'); return; } - - if (err) {callback(err); return; } + if (err) { callback(err); return; } var user = new User(); - - user.login(email, data, function(){ + user.login(email, data, function () { callback(null, user); }); }); }; -LevelDB.prototype.deleteUser = function(email, callback){ +LevelDB.prototype.deleteUser = function (email, callback) { var that = this; - - this.getUser(email, function(err, user){ - if (err){ if (callback) callback(err); return; } - + + this.getUser(email, function (err, user) { + if (err) { if (callback) callback(err); return; } + that.UserDB.del(email); - + callback(null, true); }); }; -LevelDB.prototype.getUserByUid = function(uid, opts, callback) { - var User = require('./user'); +LevelDB.prototype.getUserByUid = function (uid, opts, callback) { var done = false; if (typeof opts === 'function') { @@ -542,7 +434,7 @@ LevelDB.prototype.getUserByUid = function(uid, opts, callback) { var len = 0; var stream = this.UserDB.createReadStream() - .on('data', function(data) { + .on('data', function (data) { var obj = {}; try { @@ -555,7 +447,7 @@ LevelDB.prototype.getUserByUid = function(uid, opts, callback) { if (uid.indexOf(obj.uid) > -1) { var user = new User(); - user.login(data.key, obj, opts, function() { + user.login(data.key, obj, opts, function () { out[obj.uid] = user; len++; @@ -572,13 +464,13 @@ LevelDB.prototype.getUserByUid = function(uid, opts, callback) { stream.destroy(); var user = new User(); - user.login(data.key, obj, opts, function() { + user.login(data.key, obj, opts, function () { callback(null, user); }); } } }) - .on('end', function() { + .on('end', function () { if (!done) { if (typeof uid === 'number') { callback('UserNotFound'); @@ -590,8 +482,7 @@ LevelDB.prototype.getUserByUid = function(uid, opts, callback) { }); }; -LevelDB.prototype.getUserByName = function(name, opts, callback) { - var User = require('./user'); +LevelDB.prototype.getUserByName = function (name, opts, callback) { var done = false; if (typeof opts === 'function') { @@ -600,7 +491,7 @@ LevelDB.prototype.getUserByName = function(name, opts, callback) { } var stream = this.UserDB.createReadStream() - .on('data', function(data) { + .on('data', function (data) { var obj = {}; try { @@ -615,20 +506,19 @@ LevelDB.prototype.getUserByName = function(name, opts, callback) { stream.destroy(); var user = new User(); - user.login(data.key, obj, opts, function() { + user.login(data.key, obj, opts, function () { if (callback) callback(null, user); }); } }) - .on('end', function() { + .on('end', function () { if (!done && callback) callback('UserNotFound'); }); }; -LevelDB.prototype.userEmailExists = function(key, callback) { - this.getJSON(this.UserDB, key, function(err, data) { - +LevelDB.prototype.userEmailExists = function (key, callback) { + this.getJSON(this.UserDB, key, function (err, data) { if (err && err.notFound) { if (callback) callback(err, false); return; @@ -638,38 +528,38 @@ LevelDB.prototype.userEmailExists = function(key, callback) { }); }; -//ChatDB -LevelDB.prototype.logChat = function(uid, msg, special, callback) { - this.putJSON(this.ChatDB, currentCID, { uid: uid, msg: msg, special: special }); +// ChatDB +LevelDB.prototype.logChat = function (uid, msg, special, callback) { + this.putJSON(this.ChatDB, currentCID, { uid, msg, special }); callback(null, currentCID++); }; -//PmDB -LevelDB.prototype.logPM = function(from, to, msg, callback) { +// PmDB +LevelDB.prototype.logPM = function (from, to, msg, callback) { var that = this; - var key = Math.min(from, to) + ":" + Math.max(from, to); - - this.getJSON(this.PmDB, key, function(err, res){ + var key = Math.min(from, to) + ':' + Math.max(from, to); + + this.getJSON(this.PmDB, key, function (err, res) { var out = []; - - if(!err) out = res; - + + if (!err) out = res; + out.push({ message: msg, time: new Date(), - from: from, + from, unread: true, }); - + that.putJSON(that.PmDB, key, out); }); }; -LevelDB.prototype.getConversation = function(from, to, callback) { - var key = Math.min(from, to) + ":" + Math.max(from, to); - - this.getJSON(this.PmDB, key, function(err, res){ - if(err){ +LevelDB.prototype.getConversation = function (from, to, callback) { + var key = Math.min(from, to) + ':' + Math.max(from, to); + + this.getJSON(this.PmDB, key, function (err, res) { + if (err) { callback(null, []); } else { callback(null, res); @@ -677,15 +567,15 @@ LevelDB.prototype.getConversation = function(from, to, callback) { }); }; -LevelDB.prototype.getConversations = function(uid, callback) { +LevelDB.prototype.getConversations = function (uid, callback) { var that = this; - + var out = {}; var uids; uid = uid.toString(); - + this.PmDB.createReadStream() - .on('data', function(data) { + .on('data', function (data) { if (data.key.indexOf(':') == -1 || (uids = data.key.split(':')).indexOf(uid) == -1) return; try { @@ -693,10 +583,10 @@ LevelDB.prototype.getConversations = function(uid, callback) { } catch (e) { return; } - + var unread = 0; - convo.map(function(e){ - if(e.unread && e.from != uid) unread++; + convo.map(function (e) { + if (e.unread && e.from != uid) unread++; return { messages: e.messages, time: e.time, @@ -706,15 +596,15 @@ LevelDB.prototype.getConversations = function(uid, callback) { out[uids[(uids.indexOf(uid) + 1) % 2]] = { user: null, - messages: [ convo.pop() ], - unread: unread, + messages: [convo.pop()], + unread, }; }) - .on('end', function() { - var uids = Object.keys(out).map(function(e){ return parseInt(e); }); - + .on('end', function () { + var uids = Object.keys(out).map(function (e) { return parseInt(e); }); + if (uids.length > 0) { - that.getUserByUid(uids, function(err, result){ + that.getUserByUid(uids, function (err, result) { if (err) { callback(err); } else { @@ -731,45 +621,47 @@ LevelDB.prototype.getConversations = function(uid, callback) { }); }; -LevelDB.prototype.markConversationRead = function(uid, uid2, time) { +LevelDB.prototype.markConversationRead = function (uid, uid2, time) { var that = this; - var key = Math.min(uid, uid2) + ":" + Math.max(uid, uid2); - - this.getJSON(this.PmDB, key, function(err, res) { - if(err) return; - - res.map(function(e){ - if(e.from == uid2 && new Date(e.time) < new Date(time)) e.unread = false; + var key = Math.min(uid, uid2) + ':' + Math.max(uid, uid2); + + this.getJSON(this.PmDB, key, function (err, res) { + if (err) return; + + res.map(function (e) { + if (e.from == uid2 && new Date(e.time) < new Date(time)) e.unread = false; return e; }); - + that.putJSON(that.PmDB, key, res); }); }; -//IpDB -LevelDB.prototype.logIp = function(address, uid) { - var that = this; +// IpDB +LevelDB.prototype.logIp = function (address, uid) { + let that = this; + + this.getJSON(this.IpDB, uid, function (err, res) { + let out = res || []; - this.getJSON(this.IpDB, uid, function(err, res){ - var out = res || []; - out.push({ - address: address, + address, time: new Date(), }); - + that.putJSON(that.IpDB, uid, out); }); }; -LevelDB.prototype.getIpHistory = function(uid, callback) { - this.getJSON(this.IpDB, uid, function(err, data) { - if(err) - callback(err) - else - callback(null, data.sort(function(a, b){ return a.address > b.address; }).reverse().filter(function(e, i, a){ return i == 0 || a[i - 1].address != e.address; }).sort(function(a, b){ return a.time < b.time; })); +LevelDB.prototype.getIpHistory = function (uid, callback) { + this.getJSON(this.IpDB, uid, (err, data) => { + if (err) { + callback(err); + } + else { + callback(null, data.sort(function (a, b) { return a.address > b.address; }).reverse().filter(function (e, i, a) { return i == 0 || a[i - 1].address != e.address; }).sort(function (a, b) { return a.time < b.time; })); + } }); }; -module.exports = new LevelDB(); \ No newline at end of file +module.exports = LevelDB; diff --git a/socketserver/db_mongo.js b/socketserver/db_mongo.js index edac477..011022e 100644 --- a/socketserver/db_mongo.js +++ b/socketserver/db_mongo.js @@ -1,40 +1,41 @@ -//Modules -var mongodb = require('mongodb').MongoClient; -var util = require('util'); -var log = new(require('basic-logger'))({ - showTimestamp: true, - prefix: "MongoDB" +'use strict'; +// Modules +const mongodb = require('mongodb').MongoClient; +const util = require('util'); +const log = new(require('basic-logger'))({ + showTimestamp: true, + prefix: 'MongoDB' }); -//Files -var config = require('../serverconfig.js'); -var Mailer = require('./mailer'); -var DBUtils = require('./database_util'); - -//Variables -var expires = 1000 * 60 * 60 * 24 * config.loginExpire; -var usernames = []; -var db = null; -var poolqueue = []; -var ready = false; - -var playlistscol = null; -var roomcol = null; -var tokenscol = null; -var userscol = null; -var chatcol = null; -var pmscol = null; -var ipcol = null; +// Files +const nconf = require('nconf'); +const Mailer = require('./mail/mailer'); +const DBUtils = require('./utils').db; +const User = require('./user'); + +// Variables +const expires = 1000 * 60 * 60 * 24 * nconf.get('loginExpire'); +let usernames = []; +let db = null; +let poolqueue = []; +let ready = false; + +let playlistscol = null; +let roomcol = null; +let userscol = null; +let chatcol = null; +let pmscol = null; +let ipcol = null; function dbQueue(callback) { if (callback === true) { while (poolqueue.length > 0) (poolqueue.shift())(); - + ready = true; return; } - + if (!ready) { return poolqueue.push(callback); } @@ -44,111 +45,104 @@ function dbQueue(callback) { function createCollectionsIfNoExist(callback) { var step = 0; - var total = 7; - - db.collection('playlists', {strict:true}, function(err, col) { + var total = 6; + + db.collection('playlists', { + strict: true + }, function (err, col) { if (err) { - db.createCollection('playlists', function(errc, result) { - if (errc) - throw new Error('Failed to create the playlists collection'); - - playlistscol = result; - if (++step == total) callback(); - }); + db.createCollection('playlists', function (errc, result) { + if (errc) + throw new Error('Failed to create the playlists collection'); + + playlistscol = result; + if (++step == total) callback(); + }); } else { playlistscol = col; if (++step == total) callback(); } - }); - - db.collection('room', {strict:true}, function(err, col) { + + db.collection('room', { + strict: true + }, function (err, col) { if (err) { - db.createCollection('room', function(errc, result) { - if (errc) - throw new Error('Failed to create the room collection'); - - roomcol = result; - if (++step == total) callback(); - }); + db.createCollection('room', function (errc, result) { + if (errc) + throw new Error('Failed to create the room collection'); + + roomcol = result; + if (++step == total) callback(); + }); } else { roomcol = col; if (++step == total) callback(); } - }); - - db.collection('tokens', {strict:true}, function(err, col) { - if (err) { - db.createCollection('tokens', function(errc, result) { - if (errc) - throw new Error('Failed to create the tokens collection'); - - tokenscol = result; - if (++step == total) callback(); - }); - } else { - tokenscol = col; - if (++step == total) callback(); - } - - }); - - db.collection('users', {strict:true}, function(err, col) { + + db.collection('users', { + strict: true + }, function (err, col) { if (err) { - db.createCollection('users', function(errc, result) { - if (errc) - throw new Error('Failed to create the users collection'); - - userscol = result; - if (++step == total) callback(); - }); + db.createCollection('users', function (errc, result) { + if (errc) + throw new Error('Failed to create the users collection'); + + userscol = result; + if (++step == total) callback(); + }); } else { userscol = col; if (++step == total) callback(); } - }); - - db.collection('chat', {strict:true}, function(err, col) { + + db.collection('chat', { + strict: true + }, function (err, col) { if (err) { - db.createCollection('chat', function(errc, result) { - if (errc) - throw new Error('Failed to create the chat collection'); - - chatcol = result; - if (++step == total) callback(); - }); + db.createCollection('chat', function (errc, result) { + if (errc) + throw new Error('Failed to create the chat collection'); + + chatcol = result; + if (++step == total) callback(); + }); } else { chatcol = col; if (++step == total) callback(); } }); - - db.collection('pms', {strict:true}, function(err, col) { + + db.collection('pms', { + strict: true + }, function (err, col) { if (err) { - db.createCollection('pms', function(errc, result) { - if (errc) - throw new Error('Failed to create the pms collection'); - - pmscol = result; - if (++step == total) callback(); - }); + db.createCollection('pms', function (errc, result) { + if (errc) + throw new Error('Failed to create the pms collection'); + + pmscol = result; + if (++step == total) callback(); + }); } else { pmscol = col; if (++step == total) callback(); } }); - - db.collection('ip', {strict:true}, function(err, col) { + + db.collection('ip', { + strict: true + }, function (err, col) { if (err) { - db.createCollection('ip', function(errc, result) { - if (errc) - throw new Error('Failed to create the ip collection'); - - ipcol = result; - if (++step == total) callback(); - }); + db.createCollection('ip', function (errc, result) { + if (errc) + throw new Error('Failed to create the ip collection'); + + ipcol = result; + if (++step == total) callback(); + }); } else { ipcol = col; if (++step == total) callback(); @@ -159,232 +153,237 @@ function createCollectionsIfNoExist(callback) { function initCollections(callback) { var step = 0; var total = 4; - - //Playlists - playlistscol.findOne({_id: 'PIDCOUNTER'}, function(err, pidobj) { - if (err) { - throw new Error('Cannot get PIDCOUNTER from playlists'); - } - - if (!pidobj) { - playlistscol.insert({_id: "PIDCOUNTER", seq: 1}, function(error, data) { - if (error) { - throw new Error('Cannot set PIDCOUNTER to playlists'); - } - if (++step == total) callback(); - }); - } else { - if (++step == total) callback(); - } - }); - - //Users - userscol.findOne({_id: 'UIDCOUNTER'}, function(err, pidobj) { - if (err) { - throw new Error('Cannot get UIDCOUNTER from users'); - } - - if (!pidobj) { - userscol.insert({_id: "UIDCOUNTER", seq: 1}, function(error, data) { - if (error) { - throw new Error('Cannot set UIDCOUNTER to users'); - } - if (++step == total) callback(); - }); - } else { - if (++step == total) callback(); - } - }); - - //Chat - chatcol.findOne({_id: 'CIDCOUNTER'}, function(err, pidobj) { - if (err) { - throw new Error('Cannot get CIDCOUNTER from chat'); - } - if (!pidobj) { - chatcol.insert({_id: "CIDCOUNTER", seq: 1}, function(error, data) { - if (error) { - throw new Error('Cannot set CIDCOUNTER to chat'); - } - if (++step == total) callback(); - }); - } else { - if (++step == total) callback(); - } - }); - - //PMs - pmscol.findOne({_id: 'PMIDCOUNTER'}, function(err, pidobj) { - if (err) { - throw new Error('Cannot get PMIDCOUNTER from pms'); - } - if (!pidobj) { - pmscol.insert({_id: "PMIDCOUNTER", seq: 1}, function(error, data) { - if (error) { - throw new Error('Cannot set PMIDCOUNTER to pms'); - } - if (++step == total) callback(); - }); - } else { - if (++step == total) callback(); - } - }); + + // Playlists + playlistscol.findOne({ + _id: 'PIDCOUNTER' + }, function (err, pidobj) { + if (err) { + throw new Error('Cannot get PIDCOUNTER from playlists'); + } + + if (!pidobj) { + playlistscol.insert({ + _id: 'PIDCOUNTER', + seq: 1 + }, function (error, data) { + if (error) { + throw new Error('Cannot set PIDCOUNTER to playlists'); + } + if (++step == total) callback(); + }); + } else { + if (++step == total) callback(); + } + }); + + // Users + userscol.findOne({ + _id: 'UIDCOUNTER' + }, function (err, pidobj) { + if (err) { + throw new Error('Cannot get UIDCOUNTER from users'); + } + + if (!pidobj) { + userscol.insert({ + _id: 'UIDCOUNTER', + seq: 1 + }, function (error, data) { + if (error) { + throw new Error('Cannot set UIDCOUNTER to users'); + } + if (++step == total) callback(); + }); + } else { + if (++step == total) callback(); + } + }); + + // Chat + chatcol.findOne({ + _id: 'CIDCOUNTER' + }, function (err, pidobj) { + if (err) { + throw new Error('Cannot get CIDCOUNTER from chat'); + } + if (!pidobj) { + chatcol.insert({ + _id: 'CIDCOUNTER', + seq: 1 + }, function (error, data) { + if (error) { + throw new Error('Cannot set CIDCOUNTER to chat'); + } + if (++step == total) callback(); + }); + } else { + if (++step == total) callback(); + } + }); + + // PMs + pmscol.findOne({ + _id: 'PMIDCOUNTER' + }, function (err, pidobj) { + if (err) { + throw new Error('Cannot get PMIDCOUNTER from pms'); + } + if (!pidobj) { + pmscol.insert({ + _id: 'PMIDCOUNTER', + seq: 1 + }, function (error, data) { + if (error) { + throw new Error('Cannot set PMIDCOUNTER to pms'); + } + if (++step == total) callback(); + }); + } else { + if (++step == total) callback(); + } + }); } function MongoDB(cb) { - var dburl = 'mongodb://' + config.db.mongoUser + ':' + config.db.mongoPassword + '@' + config.db.mongoHost + ':27017/' + config.db.mongoDatabase; - - mongodb.connect(dburl, function(err, database) { - if (err) { - throw new Error('Could not connect to database: ' + err); - } - - db = database; - - createCollectionsIfNoExist(function() { - initCollections(function() { - dbQueue(true); - }); - }); - }); -} + const dburl = `mongodb://${nconf.get('db:mongoUser')}:${nconf.get('db:mongoPassword')}@${nconf.get('db:mongoHost')}:27017/${nconf.get('db:mongoDatabase')}`; -function getNextSequence(collection, id, callback) { - dbQueue(function(){ - db.collection(collection).findOneAndUpdate({_id: id}, { $inc: { seq: 1 } }, function(err, r) { - if (err) throw new Error('Cannot update index counter'); - callback(r.value.seq); + mongodb.connect(dburl, function (err, database) { + if (err) { + throw new Error(`Could not connect to database: ${err}`); + } + + db = database; + + createCollectionsIfNoExist(() => { + initCollections(() => { + dbQueue(true); + }); }); }); } -//PlaylistDB -MongoDB.prototype.getPlaylist = function(pid, callback) { +function getNextSequence(collection, id, callback) { + dbQueue(() => { + db.collection(collection).findOneAndUpdate({ + _id: id + }, { + $inc: { + seq: 1 + } + }, (err, r) => { + if (err) throw new Error('Cannot update index counter'); + callback(r.value.seq); + }); + }); +} + +// PlaylistDB +MongoDB.prototype.getPlaylist = function (pid, callback) { var Playlist = require('./playlist'); - - dbQueue(function(){ - playlistscol.findOne({_id: pid}, {_id: 0}, function(err, data) { + + dbQueue(function () { + playlistscol.findOne({ + _id: pid + }, { + _id: 0 + }, function (err, data) { if (err || !data) { - callback('PlaylistNotFound'); - return; + callback('PlaylistNotFound'); + return; } - + var pl = new Playlist(); pl.id = pid; util._extend(pl.data, data); - + callback(err, pl); - }); + }); }); - + return this; }; -MongoDB.prototype.createPlaylist = function(owner, name, callback) { +MongoDB.prototype.createPlaylist = function (owner, name, callback) { var Playlist = require('./playlist'); - dbQueue(function(){ - getNextSequence('playlists', 'PIDCOUNTER', function(currentPID) { - var pl = new Playlist(); - - pl.id = currentPID; - pl.data.created = Date.now(); - pl.data.owner = owner; - pl.data.name = name.substr(0, 100); - - var updatedPlObj = pl.makeDbObj(); - updatedPlObj._id = currentPID; - - playlistscol.insert(updatedPlObj, function(error, data) { - callback(error, pl); - }); + dbQueue(function () { + getNextSequence('playlists', 'PIDCOUNTER', function (currentPID) { + var pl = new Playlist(); + + pl.id = currentPID; + pl.data.created = Date.now(); + pl.data.owner = owner; + pl.data.name = name.substr(0, 100); + + var updatedPlObj = pl.makeDbObj(); + updatedPlObj._id = currentPID; + + playlistscol.insert(updatedPlObj, function (error, data) { + callback(error, pl); + }); }); }); }; -MongoDB.prototype.deletePlaylist = function(pid, callback) { - dbQueue(function(){ - playlistscol.remove({_id: pid}, callback); - }); +MongoDB.prototype.deletePlaylist = function (pid, callback) { + dbQueue(function () { + playlistscol.remove({ + _id: pid + }, callback); + }); }; -MongoDB.prototype.putPlaylist = function(pid, data, callback) { +MongoDB.prototype.putPlaylist = function (pid, data, callback) { var newData = {}; util._extend(newData, data); - + newData._id = pid; - - dbQueue(function(){ - playlistscol.updateOne({_id: pid}, newData, {upsert:true, w: 1}, function(error, res) { - callback(data); + + dbQueue(function () { + playlistscol.updateOne({ + _id: pid + }, newData, { + upsert: true, + w: 1 + }, function (error, res) { + callback(data); }); }); }; -//RoomDB -MongoDB.prototype.getRoom = function(slug, callback) { - dbQueue(function(){ - roomcol.findOne({slug: slug}, {_id: 0}, callback); +// RoomDB +MongoDB.prototype.getRoom = function (slug, callback) { + dbQueue(function () { + roomcol.findOne({ + slug + }, { + _id: 0 + }, callback); }); return this; }; -MongoDB.prototype.setRoom = function(slug, val, callback) { - dbQueue(function(){ +MongoDB.prototype.setRoom = function (slug, val, callback) { + dbQueue(function () { var newData = {}; util._extend(newData, val); - + newData.slug = slug; - roomcol.updateOne({slug: slug}, newData, {upsert:true, w: 1}, function(error, data) { - if (callback) callback(error, data); + roomcol.updateOne({ + slug + }, newData, { + upsert: true, + w: 1 + }, function (error, data) { + if (callback) callback(error, data); }); }); return this; }; -//TokenDB -MongoDB.prototype.deleteToken = function(tok) { - dbQueue(function(){ - tokenscol.remove({tok: tok}, function(){}); - }); -}; - -MongoDB.prototype.createToken = function(email) { - var tok = DBUtils.makePass(email, Date.now()); - - dbQueue(function(){ - tokenscol.insert({ - tok: tok, - email: email, - time: Date.now(), - }, function() {}); - }); - - return tok; -}; - -MongoDB.prototype.isTokenValid = function(tok, callback) { - var that = this; - - dbQueue(function(){ - tokenscol.findOne({tok: tok}, function(err, data) { - if (err || data == null) { - callback('InvalidToken'); - return; - } - - if (config.loginExpire && (Date.now() - data.time) < expires) { - callback(null, data.email); - } else { - that.deleteToken(data.token); - callback('InvalidToken'); - } - }); - }); -}; - -//UserDB +// UserDB function addUsername(un) { usernames.push(un.toLowerCase()); } @@ -396,8 +395,7 @@ function usernameExists(un) { return ((ind = usernames.indexOf(un)) != -1 ? ind : false); } -MongoDB.prototype.createUser = function(obj, callback) { - var User = require('./user'); +MongoDB.prototype.createUser = function (obj, callback) { var that = this; var defaultCreateObj = { @@ -410,7 +408,7 @@ MongoDB.prototype.createUser = function(obj, callback) { var inData = defaultCreateObj; inData.email = inData.email.toLowerCase(); - //Validation + // Validation if (!inData.email || !DBUtils.validateEmail(inData.email)) { callback('InvalidEmail'); return; @@ -423,186 +421,140 @@ MongoDB.prototype.createUser = function(obj, callback) { callback('UsernameExists'); return; } - if (!inData.pw || inData.pw == 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855') { - callback('PasswordBlank'); - return; - } - dbQueue(function(){ - //Check for existing account - that.userEmailExists(inData.email, function(err, res) { + dbQueue(function () { + // Check for existing account + that.userEmailExists(inData.email, function (err, res) { if (err) { if (callback) callback('AccountExists'); return; } - - getNextSequence('users', 'UIDCOUNTER', function(currentUID) { + + getNextSequence('users', 'UIDCOUNTER', function (currentUID) { var user = new User(); - + user.data.uid = currentUID; user.data.un = inData.un; - user.data.salt = DBUtils.makePass(Date.now()).slice(0, 10); - user.data.pw = DBUtils.makePass(inData.pw, user.data.salt); + user.data.pw = inData.pw; user.data.created = Date.now(); - if (config.room.email.confirmation) user.data.confirmation = DBUtils.makePass(Date.now()); + if (nconf.get('room:mail:confirmation')) user.data.confirmation = DBUtils.randomBytes(18, 'base64'); + var updatedUserObj = user.makeDbObj(); updatedUserObj._id = currentUID; updatedUserObj.email = inData.email; - - var tok = that.createToken(inData.email); - - userscol.insert(updatedUserObj, function(error, data) { - if (error) { + + userscol.insert(updatedUserObj, function (error, data) { + if (error) { callback(error); return; } - - //Send confirmation email - if (config.room.email.confirmation) { + + // Send confirmation email + if (nconf.get('room:mail:confirmation')) { Mailer.sendEmail('signup', { code: user.data.confirmation, user: inData.un, - }, inData.email, function(data) { + }, inData.email, function (data) { console.log(data); }); } - - //Do other ~messy~ stuff + + // Do other ~messy~ stuff addUsername(inData.un); user.login(inData.email); - callback(null, user, tok); - }); + callback(null, user, inData.email); + }); }); - }); }); }; -MongoDB.prototype.loginUser = function(obj, callback) { - var User = require('./user'); - var that = this; - - var defaultLoginObj = { - email: null, - pw: null, - token: null, - }; - util._extend(defaultLoginObj, obj); - - var inData = defaultLoginObj; - - dbQueue(function(){ - if (inData.email && inData.pw) { - inData.email = inData.email.toLowerCase(); - - userscol.findOne({email: inData.email}, {_id: 0}, function(err, data) { - if (err) { - callback(err); - return; - } - - if (!data) { - callback('UserNotFound'); - return; - } - - if (DBUtils.makePass(inData.pw, data.salt) != data.pw) { - callback('IncorrectPassword'); - return; - } - - var tok = that.createToken(inData.email); - var user = new User(); - - user.login(inData.email, data, function() { - callback(null, user, tok); - }); - }); - } else if (inData.token) { - that.isTokenValid(inData.token, function(err, email) { - if (err) { - callback(err); - return; - } - - userscol.findOne({email: email}, {_id: 0}, function(err, data) { - if (err) { - callback(err); - return; - } - - if (!data) { - callback('UserNotFound'); - return; - } - - var user = new User(); - user.login(email, data, function() { - - callback(null, user); - }); - }); - }); - } else { - callback('InvalidArgs'); - } - }); +MongoDB.prototype.loginUser = function (email, callback) { + if (email) { + email = email.toLowerCase(); + dbQueue(() => { + userscol.findOne({ email }, { _id: 0 }, (err, data) => { + if (err) { + callback(err); + return; + } + if (!data) { + callback('UserNotFound'); + return; + } + + const user = new User(); + user.login(email, data, () => { + callback(null, user, email); + }); + }); + }); + } }; -MongoDB.prototype.putUser = function(email, data, callback) { +MongoDB.prototype.putUser = function (email, data, callback) { var newData = {}; util._extend(newData, data); - + newData._id = data.uid; newData.email = email; - - dbQueue(function(){ - userscol.updateOne({email: email}, newData, {upsert: true, w: 1}, callback); + + dbQueue(function () { + userscol.updateOne({ + email + }, newData, { + upsert: true, + w: 1 + }, callback); }); }; -MongoDB.prototype.getUser = function(email, callback){ - var User = require('./user'); - - dbQueue(function(){ - userscol.findOne({email: email}, {_id: 0}, function(err, data) { - if (err) { +MongoDB.prototype.getUser = function (email, callback) { + dbQueue(function () { + userscol.findOne({ + email + }, { + _id: 0 + }, function (err, data) { + if (err) { callback(err); return; } - + if (!data) { callback('UserNotFound'); return; } - - var user = new User(); - - user.login(email, data, function(){ - - callback(null, user); - }); - }); + + var user = new User(); + + user.login(email, data, function () { + callback(null, user); + }); + }); }); }; -MongoDB.prototype.deleteUser = function(email, callback) { +MongoDB.prototype.deleteUser = function (email, callback) { var that = this; - - dbQueue(function(){ - that.getUser(email, function(err, user){ - if (err){ if (callback) callback(err); return; } - - userscol.remove({email: email}, function(error, data){ - callback(error || null, error ? false : true); - }); - }); + + dbQueue(function () { + that.getUser(email, function (err, user) { + if (err) { + if (callback) callback(err); + return; + } + + userscol.remove({ + email + }, function (error, data) { + callback(error || null, error ? false : true); + }); + }); }); }; -MongoDB.prototype.getUserByUid = function(uid, opts, callback) { - var User = require('./user'); - +MongoDB.prototype.getUserByUid = function (uid, opts, callback) { if (typeof opts === 'function') { callback = opts; opts = {}; @@ -618,32 +570,38 @@ MongoDB.prototype.getUserByUid = function(uid, opts, callback) { } var isArray = Array.isArray(uid); - + if (!Array.isArray(uid)) uid = [uid]; - + var out = {}; var len = 0; - dbQueue(function(){ - userscol.find({_id: { $in: uid}}, {_id: 0}).toArray(function(err, data) { - if(err || !data || data.length == 0){ + dbQueue(function () { + userscol.find({ + _id: { + $in: uid + } + }, { + _id: 0 + }).toArray(function (err, data) { + if (err || !data || data.length == 0) { callback('SomeUsersNotFound', out); return; } - - data.forEach(function(userobj) { + + data.forEach(function (userobj) { var user = new User(); - - user.login(userobj.email, userobj, opts, function(){ + + user.login(userobj.email, userobj, opts, function () { if (isArray) out[userobj.uid] = user; else out = user; - - console.log("Initialized user " + user.email); - if(++len == data.length){ - if(uid.length == data.length) callback(null, out); + + console.log('Initialized user ' + user.email); + if (++len == data.length) { + if (uid.length == data.length) callback(null, out); else callback('SomeUsersNotFound', out); } }); @@ -652,70 +610,102 @@ MongoDB.prototype.getUserByUid = function(uid, opts, callback) { }); }; -MongoDB.prototype.getUserByName = function(name, opts, callback) { - var User = require('./user'); - +MongoDB.prototype.getUserByName = function (name, opts, callback) { if (typeof opts === 'function') { callback = opts; opts = {}; } - - dbQueue(function(){ - userscol.findOne({un: name}, {_id: 0}, function(err, userobj) { - if(err || !userobj){ + + dbQueue(function () { + userscol.findOne({ + un: name + }, { + _id: 0 + }, function (err, userobj) { + if (err || !userobj) { if (callback) callback('UserNotFound'); return; } - + var user = new User(); - - user.login(userobj.email, userobj, opts, function() { + + user.login(userobj.email, userobj, opts, function () { if (callback) callback(null, user); }); }); }); }; -MongoDB.prototype.userEmailExists = function(key, callback) { - dbQueue(function(){ - userscol.findOne({email: key}, {_id: 0}, function(err, data) { +MongoDB.prototype.userEmailExists = function (key, callback) { + dbQueue(function () { + userscol.findOne({ + email: key + }, { + _id: 0 + }, function (err, data) { if (callback) callback(err, data ? true : false); }); }); }; -//ChatDB -MongoDB.prototype.logChat = function(uid, msg, special, callback) { - dbQueue(function(){ - getNextSequence('chat', 'CIDCOUNTER', function(currentCID) { - chatcol.insert({_id: currentCID, uid: uid, msg: msg, special: special}, function(error, data) { - if (callback) callback(error, currentCID); - }); +// ChatDB +MongoDB.prototype.logChat = function (uid, msg, special, callback) { + dbQueue(function () { + getNextSequence('chat', 'CIDCOUNTER', function (currentCID) { + chatcol.insert({ + _id: currentCID, + uid, + msg, + special + }, function (error, data) { + if (callback) callback(error, currentCID); + }); }); }); }; -//PmDB -MongoDB.prototype.logPM = function(from, to, msg, callback) { - dbQueue(function(){ - getNextSequence('pms', 'PMIDCOUNTER', function(currentCID) { - pmscol.insert({_id: currentCID, msg: msg, from: from, to: to, time: new Date(), unread: true }, function(error, data) { - if (error) log.error("Error logging chat message"); - if (callback) callback(error, currentCID); - }); +// PmDB +MongoDB.prototype.logPM = function (from, to, msg, callback) { + dbQueue(function () { + getNextSequence('pms', 'PMIDCOUNTER', function (currentCID) { + pmscol.insert({ + _id: currentCID, + msg, + from, + to, + time: new Date(), + unread: true + }, function (error, data) { + if (error) log.error('Error logging chat message'); + if (callback) callback(error, currentCID); + }); }); }); }; -MongoDB.prototype.getConversation = function(from, to, callback) { - dbQueue(function(){ - pmscol.find({ $or: [ {from: from, to: to}, {from: to, to: from}] }, {_id: 0}).toArray(function(err, data) { - if(err){ +MongoDB.prototype.getConversation = function (from, to, callback) { + dbQueue(function () { + pmscol.find({ + $or: [{ + from, + to + }, { + from: to, + to: from + }] + }, { + _id: 0 + }).toArray(function (err, data) { + if (err) { callback(err); } else { var out = []; - for(var key in data){ - out.push({message:data[key].msg,time:data[key].time,from:data[key].from}); + for (var key in data) { + out.push({ + message: data[key].msg, + time: data[key].time, + from: data[key].from + }); } callback(null, out); } @@ -723,19 +713,27 @@ MongoDB.prototype.getConversation = function(from, to, callback) { }); }; -MongoDB.prototype.getConversations = function(uid, callback) { +MongoDB.prototype.getConversations = function (uid, callback) { var that = this; - - dbQueue(function(){ - pmscol.find({ $or: [ {from: uid}, {to: uid}] }, {_id: 0}).toArray(function(err, data) { - if(err){ + + dbQueue(function () { + pmscol.find({ + $or: [{ + from: uid + }, { + to: uid + }] + }, { + _id: 0 + }).toArray(function (err, data) { + if (err) { callback(err); } else { var out = {}; var uids = []; for (var key in data) { var otherUid = data[key].to == uid ? data[key].from : data[key].to; - + if (out[otherUid] === undefined) { uids.push(otherUid); out[otherUid] = { @@ -744,14 +742,18 @@ MongoDB.prototype.getConversations = function(uid, callback) { unread: 0 }; } - out[otherUid].messages.push({ message: data[key].msg, time: data[key].time, from: data[key].from }); - + out[otherUid].messages.push({ + message: data[key].msg, + time: data[key].time, + from: data[key].from + }); + if (data[key].unread && data[key].from != uid) out[otherUid].unread++; } - + if (uids.length > 0) { - that.getUserByUid(uids, function(err, result){ + that.getUserByUid(uids, function (err, result) { if (err) { callback(err); } else { @@ -763,8 +765,7 @@ MongoDB.prototype.getConversations = function(uid, callback) { callback(null, out); } }); - } - else { + } else { callback(null, out); } } @@ -772,32 +773,53 @@ MongoDB.prototype.getConversations = function(uid, callback) { }); }; -MongoDB.prototype.markConversationRead = function(uid, uid2, time) { - dbQueue(function(){ - pmscol.updateMany({to: uid, from: uid2, time: {$lt: new Date(time)}}, {$set: {unread: false}}, function(){}); +MongoDB.prototype.markConversationRead = function (uid, uid2, time) { + dbQueue(function () { + pmscol.updateMany({ + to: uid, + from: uid2, + time: { + $lt: new Date(time) + } + }, { + $set: { + unread: false + } + }, function () {}); }); }; -//IpDB -MongoDB.prototype.logIp = function(address, uid) { - dbQueue(function(){ +// IpDB +MongoDB.prototype.logIp = function (address, uid) { + dbQueue(function () { ipcol.insert({ - uid: uid, - address: address, + uid, + address, time: new Date() }); }); }; -MongoDB.prototype.getIpHistory = function(uid, callback) { - dbQueue(function(){ - ipcol.find({uid: uid}, {_id: 0, uid: 0}).toArray(function(err, data) { - if(err) +MongoDB.prototype.getIpHistory = function (uid, callback) { + dbQueue(function () { + ipcol.find({ + uid + }, { + _id: 0, + uid: 0 + }).toArray(function (err, data) { + if (err) callback(err); else - callback(null, data.sort(function(a, b){ return a.address > b.address; }).reverse().filter(function(e, i, a){ return i == 0 || a[i - 1].address != e.address; }).sort(function(a, b){ return a.time < b.time; })); + callback(null, data.sort(function (a, b) { + return a.address > b.address; + }).reverse().filter(function (e, i, a) { + return i == 0 || a[i - 1].address != e.address; + }).sort(function (a, b) { + return a.time < b.time; + })); }); }); }; -module.exports = new MongoDB(); +module.exports = MongoDB; \ No newline at end of file diff --git a/socketserver/db_mysql.js b/socketserver/db_mysql.js index 244d095..bc43f7c 100644 --- a/socketserver/db_mysql.js +++ b/socketserver/db_mysql.js @@ -1,30 +1,31 @@ +'use strict'; //Modules -var mysql = require('mysql'); -var util = require('util'); -var _ = require('underscore'); -var log = new(require('basic-logger'))({ +const mysql = require('mysql'); +const util = require('util'); +const log = new(require('basic-logger'))({ showTimestamp: true, prefix: "MysqlDB" }); +const nconf = require('nconf'); //Files -var config = require('../serverconfig.js'); -var Hash = require('./hash'); -var Mailer = require('./mailer'); -var DBUtils = require('./database_util'); -var Roles = require('./role.js'); - -var db = null; -var pool = null; - -var MysqlDB = function(){ - var that = this; - - var mysqlConfig = { - host: config.db.mysqlHost, - user: config.db.mysqlUser, - password: config.db.mysqlPassword, - database: config.db.mysqlDatabase, +const Mailer = require('./mail/mailer'); +const DBUtils = require('./utils').db; +const Roles = require('./role.js'); +const User = require('./user'); +const _ = require('lodash'); + +let db = null; +let pool = null; + +const MysqlDB = function(){ + const that = this; + + const mysqlConfig = { + host: nconf.get('db:mysqlHost'), + user: nconf.get('db:mysqlUser'), + password: nconf.get('db:mysqlPassword'), + database: nconf.get('db:mysqlDatabase'), charset: "UTF8_GENERAL_CI", multipleStatements: true, connectionLimit: 1, @@ -43,7 +44,7 @@ var MysqlDB = function(){ `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,\ `email` VARCHAR(254) UNIQUE NOT NULL DEFAULT 'NULL',\ `un` VARCHAR(20) UNIQUE NOT NULL DEFAULT 'NULL',\ - `pw` VARCHAR(32) NOT NULL DEFAULT 'NULL',\ + `pw` VARCHAR(60) NOT NULL DEFAULT 'NULL',\ `salt` VARCHAR(10),\ `activepl` INTEGER UNSIGNED NULL DEFAULT NULL,\ `created` DATETIME NULL,\ @@ -56,6 +57,7 @@ var MysqlDB = function(){ `lastdj` TINYINT(1) NOT NULL DEFAULT 0,\ PRIMARY KEY (`id`)\ );\ + ALTER TABLE `users` MODIFY `pw` VARCHAR(60);\ \ CREATE TABLE IF NOT EXISTS `playlists` (\ `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,\ @@ -429,36 +431,9 @@ MysqlDB.prototype.setRoom = function(slug, val, callback) { return that; }; -//TokenDB -MysqlDB.prototype.deleteToken = function(tok) { - this.execute("DELETE FROM `tokens` WHERE ?;", { token: tok, }); -}; - -MysqlDB.prototype.createToken = function(email) { - var tok = DBUtils.makePass(email, Date.now()); - - this.execute("DELETE FROM `tokens` WHERE ?; INSERT INTO `tokens` SET ?;", [ { email: email, }, { token: tok, email: email, created: new Date() } ]); - - return tok; -}; - -MysqlDB.prototype.isTokenValid = function(tok, callback) { - this.execute("SELECT `token`, `email` FROM `tokens` WHERE ? AND DATEDIFF(NOW(), `created`) < ?;", [{ token: tok, }, config.loginExpire || 365], function(err, res) { - if (err || res.length == 0) { - callback('InvalidToken'); - return; - } - - callback(null, res[0].email); - }); -}; - //UserDB MysqlDB.prototype.getUserNoLogin = function(uid, callback){ var that = this; - - var User = require('./user'); - this.execute("SELECT `salt`, `lastdj`, `uptime`, `recovery`, UNIX_TIMESTAMP(`recovery_timeout`) as `recovery_timeout`, `confirmation`, `badge_top`, `badge_bottom`, `created`, `activepl`, `pw`, `un`, `id` FROM `users` WHERE ?", { id: uid, }, function(err, res){ if (err || res.length == 0) { callback('UserNotFound'); return; } @@ -506,7 +481,6 @@ MysqlDB.prototype.usernameExists = function(name, callback){ }; MysqlDB.prototype.createUser = function(obj, callback) { - var User = require('./user'); var that = this; var defaultCreateObj = { @@ -547,14 +521,11 @@ MysqlDB.prototype.createUser = function(obj, callback) { var user = new User(); user.data.un = inData.un; - user.data.salt = DBUtils.makePass(Date.now()).slice(0, 10); - user.data.pw = DBUtils.makePass(inData.pw, user.data.salt); + user.data.pw = inData.pw; user.data.created = Date.now(); - if (config.room.email.confirmation) user.data.confirmation = DBUtils.makePass(Date.now()); + if (nconf.get('room:mail:confirmation')) user.data.confirmation = DBUtils.randomBytes(18, 'base64'); var updatedUserObj = user.makeDbObj(); - var tok = that.createToken(inData.email); - delete updatedUserObj.uid; that.putUser(inData.email, updatedUserObj, function(err, id) { @@ -564,7 +535,7 @@ MysqlDB.prototype.createUser = function(obj, callback) { } //Send confirmation email - if (config.room.email.confirmation) { + if (nconf.get('room:mail:confirmation')) { Mailer.sendEmail('signup', { code: user.data.confirmation, user: inData.un, @@ -576,71 +547,30 @@ MysqlDB.prototype.createUser = function(obj, callback) { //Login user user.data.uid = id; user.login(inData.email); - callback(null, user, tok); + callback(null, user, inData.email); }); }); } }); }; -MysqlDB.prototype.loginUser = function(obj, callback) { - var User = require('./user'); - var that = this; - - var defaultLoginObj = { - email: null, - pw: null, - token: null, - }; - util._extend(defaultLoginObj, obj); - var inData = defaultLoginObj; - - if (inData.email && inData.pw) { - inData.email = inData.email.toLowerCase(); - that.execute("SELECT `id` FROM `users` WHERE ?;", { email: inData.email, }, function(err, res) { - if(err || res.length == 0) callback("UserNotFound"); - else { - that.getUserNoLogin(res[0].id, function(err, data) { - if (DBUtils.makePass(inData.pw, data.salt) != data.pw) { - callback('IncorrectPassword'); - return; - } - - var tok = that.createToken(inData.email); - - var user = new User(); - - user.login(inData.email, data, function() { - - callback(null, user, tok); - }); - }); - } - }); - } else if (inData.token) { - that.isTokenValid(inData.token, function(err, email) { - if (err) { - callback(err); - return; - } - - that.execute("SELECT `id` FROM `users` WHERE ?;", { email: email, }, function(err, res) { - if(err || res.length == 0) callback("UserNotFound"); - else { - that.getUserNoLogin(res[0].id, function(err, data) { - var user = new User(); - - user.login(email, data, function() { - - callback(null, user); - }); - }); - } - }); - }); - } else { - callback('InvalidArgs'); - } +MysqlDB.prototype.loginUser = function (email, callback) { + const that = this; + if (email) { + email = email.toLowerCase(); + that.execute('SELECT `id` FROM `users` WHERE ?;', { email }, (err, res) => { + if (err || res.length === 0) { + callback('UserNotFound'); + } else { + that.getUserNoLogin(res[0].id, (err, data) => { + const user = new User(); + user.login(email, data, () => { + callback(null, user, email); + }); + }); + } + }); + } }; MysqlDB.prototype.putUser = function(email, data, callback) { @@ -679,9 +609,6 @@ MysqlDB.prototype.putUser = function(email, data, callback) { MysqlDB.prototype.getUser = function(email, callback){ var that = this; - - var User = require('./user'); - this.execute("SELECT `id` FROM `users` WHERE ?;", { email: email, }, function(err, res) { if(err || res.length == 0){ callback('UserNotFound'); @@ -722,9 +649,6 @@ MysqlDB.prototype.getUserByUid = function(uid, opts, callback) { return; } } - - var User = require('./user'); - if(Array.isArray(uid)){ var out = {}; var initialized = 0; @@ -764,9 +688,6 @@ MysqlDB.prototype.getUserByUid = function(uid, opts, callback) { MysqlDB.prototype.getUserByName = function(name, opts, callback) { var that = this; - - var User = require('./user'); - if (typeof opts === 'function') { callback = opts; opts = {}; @@ -889,4 +810,4 @@ MysqlDB.prototype.getIpHistory = function(uid, callback) { }); }; -module.exports = new MysqlDB; +module.exports = MysqlDB; diff --git a/socketserver/djqueue.js b/socketserver/djqueue.js index 97182f2..3c18973 100644 --- a/socketserver/djqueue.js +++ b/socketserver/djqueue.js @@ -1,5 +1,5 @@ var Roles = require('./role'); -var config = require('../serverconfig'); +const nconf = require('nconf'); var defaultVoteObj = function(){ return { @@ -30,9 +30,9 @@ function djqueue(room){ this.currentsong = null; this.songstart = null; this.lasttimer = null; - this.limit = config.room.queue.limit; - this.cycle = config.room.queue.cycle; - this.lock = config.room.queue.lock; + this.limit = nconf.get('room:queue:limit'); + this.cycle = nconf.get('room:queue:cycle'); + this.lock = nconf.get('room:queue:lock'); this.votes = new defaultVoteObj; } diff --git a/socketserver/hash.js b/socketserver/hash.js deleted file mode 100644 index ac2489b..0000000 --- a/socketserver/hash.js +++ /dev/null @@ -1,9 +0,0 @@ -function md5(str){ - var crypto = require('crypto'); - - var hash = crypto.createHash('md5'); - hash.update(str); - return hash.digest('hex'); -} - -module.exports.md5 = md5; \ No newline at end of file diff --git a/socketserver/mail/mailer.js b/socketserver/mail/mailer.js new file mode 100644 index 0000000..e397714 --- /dev/null +++ b/socketserver/mail/mailer.js @@ -0,0 +1,76 @@ +'use strict'; +const nodemailer = require('nodemailer'); +const xoauth2 = require('xoauth2'); +const fs = require('fs-extra'); +const nconf = require('nconf'); +const ejs = require('ejs'); + +class Mailer { + constructor() { + const options = nconf.get('room:mail:options'); + const self = this; + + if (nconf.get('room:allowrecovery') || nconf.get('room:mail:confirmation')) { + switch (nconf.get('room:mail:transport')) { + case 'smtp': { + self.transporter = nodemailer.createTransport(options); + break; + } + case 'xoauth': { + const xoauth = xoauth2.createXOAuth2Generator({ + user: options.auth.xoauth.user, + clientId: options.auth.xoauth.clientId, + clientSecret: options.auth.xoauth.clientSecret, + refreshToken: options.auth.xoauth.refreshToken, + accessToken: options.auth.xoauth.accessToken + }); + options.auth.xoauth = xoauth; + self.transporter = nodemailer.createTransport(options); + break; + } + case 'direct': { + const domain = nconf.get('room:mail:sender').split('@')[1]; + options.name = domain; + self.transporter = nodemailer.createTransport(options); + break; + } + default: { + break; + } + } + } + } + + sendEmail(type, opts, receiver, callback) { + const html = ejs.render(fs.readFileSync(`socketserver/mail/templates/${type}.html`, 'utf8'), { + opts, + room: nconf.get('room'), + }); + + let subject; + switch (type) { + case 'signup': + subject = 'Welcome to musiqpad!'; + break; + case 'recovery': + subject = 'Password recovery'; + break; + default: + break; + } + + const emailObj = { + from: nconf.get('room:mail:sender'), + to: receiver, + subject, + html, + }; + + this.transporter.sendMail(emailObj, (error, response) => { + if (error) callback(error); + else callback(null, response); + }); + } +} + +module.exports = new Mailer(); diff --git a/socketserver/mail/templates/recovery.html b/socketserver/mail/templates/recovery.html new file mode 100644 index 0000000..e04d60e --- /dev/null +++ b/socketserver/mail/templates/recovery.html @@ -0,0 +1,182 @@ + + + + + +
+
|
+
+
|
+
-If you did not request this, plese ignore this email
-To reset your password, go to musiqpad, open the login / signup dialog, click "Forgot password" button and fill in the following:
-E-mail: %%EMAIL%%
-Recovery Code: %%CODE%%
-New Password: <your new password>
-The recovery code will be valid until %%TIMEOUT%% \ No newline at end of file diff --git a/socketserver/templates/signup.html b/socketserver/templates/signup.html deleted file mode 100644 index 65c028c..0000000 --- a/socketserver/templates/signup.html +++ /dev/null @@ -1,4 +0,0 @@ -Thanks you for registering on musiqpad, %%USER%%!
-Before you are able to do anything, you are required to confirm your email address.
-To do so, type the following line in chat
-