hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta.configs tests

Browse Source
v1.18.x
barisusakli 8 years ago
parent 975141bc9b
commit 009da723c5
4 changed files with 180 additions and 109 deletions
Show Stats Download Patch File Download Diff File

133
src/meta/configs.js
Unescape Escape View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
var winston = require('winston'); var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var db = require('../database'); var db = require('../database');
@ -16,17 +16,17 @@ module.exports = function (Meta) {
Meta.configs.init = function (callback) { Meta.configs.init = function (callback) {
delete Meta.config; delete Meta.config;
Meta.configs.list(function (err, config) { async.waterfall([
if (err) { function (next) {
winston.error(err.stack); Meta.configs.list(next);
return callback(err); },
} function (config, next) {
config['cache-buster'] = utils.generateUUID();
config['cache-buster'] = utils.generateUUID();
Meta.config = config; Meta.config = config;
callback(); setImmediate(next);
}); }
], callback);
}; };
Meta.configs.list = function (callback) { Meta.configs.list = function (callback) {
@ -49,57 +49,50 @@ module.exports = function (Meta) {
Meta.configs.set = function (field, value, callback) { Meta.configs.set = function (field, value, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (!field) { if (!field) {
return callback(new Error('invalid config field')); return callback(new Error('[[error:invalid-data]]'));
} }
db.setObjectField('config', field, value, function (err) { var data = {};
if (err) { data[field] = value;
return callback(err); Meta.configs.setMultiple(data, callback);
}
var data = {};
data[field] = value;
updateConfig(data);
callback();
});
}; };
Meta.configs.setMultiple = function (data, callback) {
processConfig(data, function (err) {
if (err) {
return callback(err);
}
db.setObject('config', data, function (err) {
if (err) {
return callback(err);
}
Meta.configs.setMultiple = function (data, callback) {
async.waterfall([
function (next) {
processConfig(data, next);
},
function (next) {
db.setObject('config', data, next);
},
function (next) {
updateConfig(data); updateConfig(data);
callback(); setImmediate(next);
}); }
}); ], callback);
}; };
function processConfig(data, callback) { function processConfig(data, callback) {
if (data.customCSS) { if (data.customCSS) {
saveRenderedCss(data, callback); return saveRenderedCss(data, callback);
return;
} }
callback(); setImmediate(callback);
} }
function saveRenderedCss(data, callback) { function saveRenderedCss(data, callback) {
var less = require('less'); var less = require('less');
less.render(data.customCSS, { async.waterfall([
compress: true function (next) {
}, function (err, lessObject) { less.render(data.customCSS, {
if (err) { compress: true
winston.error('[less] Could not convert custom LESS to CSS! Please check your syntax.'); }, next);
return callback(null, ''); },
function (lessObject, next) {
data.renderedCustomCSS = lessObject.css;
setImmediate(next);
} }
data.renderedCustomCSS = lessObject.css; ], callback);
callback();
});
} }
function updateConfig(config) { function updateConfig(config) {
@ -107,39 +100,39 @@ module.exports = function (Meta) {
} }
pubsub.on('config:update', function onConfigReceived(config) { pubsub.on('config:update', function onConfigReceived(config) {
if (typeof config !== 'object' || !Meta.config) { if (typeof config === 'object' && Meta.config) {
return; for (var field in config) {
} if (config.hasOwnProperty(field)) {
Meta.config[field] = config[field];
for(var field in config) { }
if(config.hasOwnProperty(field)) {
Meta.config[field] = config[field];
} }
} }
}); });
Meta.configs.setOnEmpty = function (values, callback) { Meta.configs.setOnEmpty = function (values, callback) {
db.getObject('config', function (err, data) { async.waterfall([
if (err) { function (next) {
return callback(err); db.getObject('config', next);
} },
data = data || {}; function (data, next) {
var empty = {}; data = data || {};
Object.keys(values).forEach(function (key) { var empty = {};
if (!data.hasOwnProperty(key)) { Object.keys(values).forEach(function (key) {
empty[key] = values[key]; if (!data.hasOwnProperty(key)) {
empty[key] = values[key];
}
});
if (Object.keys(empty).length) {
db.setObject('config', empty, next);
} else {
setImmediate(next);
} }
});
if (Object.keys(empty).length) {
db.setObject('config', empty, callback);
} else {
callback();
} }
}); ], callback);
}; };
Meta.configs.remove = function (field) { Meta.configs.remove = function (field, callback) {
db.deleteObjectField('config', field); db.deleteObjectField('config', field, callback);
}; };
}; };

60
src/socket.io/admin.js
Unescape Escape View File

@ -37,16 +37,12 @@ var SocketAdmin = {
}; };
SocketAdmin.before = function (socket, method, data, next) { SocketAdmin.before = function (socket, method, data, next) {
if (!socket.uid) {
return;
}
user.isAdministrator(socket.uid, function (err, isAdmin) { user.isAdministrator(socket.uid, function (err, isAdmin) {
if (err || isAdmin) { if (err || isAdmin) {
return next(err); return next(err);
} }
winston.warn('[socket.io] Call to admin method ( ' + method + ' ) blocked (accessed by uid ' + socket.uid + ')'); winston.warn('[socket.io] Call to admin method ( ' + method + ' ) blocked (accessed by uid ' + socket.uid + ')');
next(new Error('[[error:no-privileges]]'));
}); });
}; };
@ -150,21 +146,9 @@ SocketAdmin.config.set = function (socket, data, callback) {
if (!data) { if (!data) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
var _data = {};
meta.configs.set(data.key, data.value, function (err) { _data[data.key] = data.value;
if (err) { SocketAdmin.config.setMultiple(socket, data, callback);
return callback(err);
}
callback();
plugins.fireHook('action:config.set', {
key: data.key,
value: data.value
});
logger.monitorConfig({io: index.server}, data);
});
}; };
SocketAdmin.config.setMultiple = function (socket, data, callback) { SocketAdmin.config.setMultiple = function (socket, data, callback) {
@ -172,29 +156,29 @@ SocketAdmin.config.setMultiple = function (socket, data, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
meta.configs.setMultiple(data, function (err) { async.waterfall([
if(err) { function (next) {
return callback(err); meta.configs.setMultiple(data, next);
} },
function (next) {
callback(); var setting;
var setting; for (var field in data) {
for(var field in data) { if (data.hasOwnProperty(field)) {
if (data.hasOwnProperty(field)) { setting = {
setting = { key: field,
key: field, value: data[field]
value: data[field] };
}; plugins.fireHook('action:config.set', setting);
plugins.fireHook('action:config.set', setting); logger.monitorConfig({io: index.server}, setting);
logger.monitorConfig({io: index.server}, setting); }
} }
setImmediate(next);
} }
}); ], callback);
}; };
SocketAdmin.config.remove = function (socket, key, callback) { SocketAdmin.config.remove = function (socket, key, callback) {
meta.configs.remove(key); meta.configs.remove(key, callback);
callback();
}; };
SocketAdmin.settings.get = function (socket, data, callback) { SocketAdmin.settings.get = function (socket, data, callback) {

88
test/meta.js
Unescape Escape View File

@ -8,7 +8,7 @@ var meta = require('../src/meta');
var User = require('../src/user'); var User = require('../src/user');
var Groups = require('../src/groups'); var Groups = require('../src/groups');
describe('Messaging Library', function () { describe('meta', function () {
var fooUid; var fooUid;
var bazUid; var bazUid;
var herpUid; var herpUid;
@ -95,6 +95,92 @@ describe('Messaging Library', function () {
}); });
describe('config', function () {
var socketAdmin = require('../src/socket.io/admin');
before(function (done) {
db.setObject('config', {minimumTagLength: 3, maximumTagLength: 15}, done);
});
it('should get config fields', function (done) {
meta.configs.getFields(['minimumTagLength', 'maximumTagLength'], function (err, data) {
assert.ifError(err);
assert.equal(data.minimumTagLength, 3);
assert.equal(data.maximumTagLength, 15);
done();
});
});
it('should fail if field is invalid', function (done) {
meta.configs.set('', 'someValue', function (err) {
assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
it('should fail if data is invalid', function (done) {
socketAdmin.config.set({uid: fooUid}, null, function (err) {
assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
it('should set config value', function (done) {
meta.configs.set('someField', 'someValue', function (err) {
assert.ifError(err);
meta.configs.getFields(['someField'], function (err, data) {
assert.ifError(err);
assert.equal(data.someField, 'someValue');
done();
});
});
});
it('should fail if data is invalid', function (done) {
socketAdmin.config.setMultiple({uid: fooUid}, null, function (err) {
assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
it('should set multiple values', function (done ) {
socketAdmin.config.setMultiple({uid: fooUid}, {
someField1: 'someValue1',
someField2: 'someValue2',
customCSS: '.derp{color:#00ff00;}'
}, function (err) {
assert.ifError(err);
meta.configs.getFields(['someField1', 'someField2'], function (err, data) {
assert.ifError(err);
assert.equal(data.someField1, 'someValue1');
assert.equal(data.someField2, 'someValue2');
done();
});
});
});
it('should not set config if not empty', function (done) {
meta.configs.setOnEmpty({someField1: 'foo'}, function (err) {
assert.ifError(err);
db.getObjectField('config', 'someField1', function (err, value) {
assert.ifError(err);
assert.equal(value, 'someValue1');
done();
});
});
});
it('should remove config field', function (done) {
socketAdmin.config.remove({uid: fooUid}, 'someField1', function (err) {
assert.ifError(err);
db.isObjectField('config', 'someField1', function (err, isObjectField) {
assert.ifError(err);
assert(!isObjectField);
done();
});
});
});
});

8
test/socket.io.js
Unescape Escape View File

@ -372,6 +372,14 @@ describe('socket.io', function () {
}); });
}); });
it('should return error', function (done) {
var socketAdmin = require('../src/socket.io/admin');
socketAdmin.before({uid: 10}, 'someMethod', {}, function (err) {
assert.equal(err.message, '[[error:no-privileges]]');
done();
});
});
after(function (done) { after(function (done) {
db.emptydb(done); db.emptydb(done);
}); });

Write Preview
Loading…
Cancel
Save