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

closes #6311

Browse Source
v1.18.x
Barış Soner Uşaklı 7 years ago
parent a224c557c0
commit 15e9bbac92
11 changed files with 89 additions and 49 deletions
Show Stats Download Patch File Download Diff File

1
install/package.json
Unescape Escape View File

@ -25,6 +25,7 @@
"body-parser": "^1.18.2",
"bootstrap": "^3.3.7",
"chart.js": "^2.7.1",
"clipboard": "1.7.1",
"colors": "^1.1.2",
"compression": "^1.7.1",
"commander": "^2.12.2",

3
public/language/en-GB/admin/manage/ip-blacklist.json
Unescape Escape View File

@ -14,5 +14,6 @@
"alerts.applied-success": "Blacklist Applied",
"analytics.blacklist-hourly": "<strong>Figure 1</strong> &ndash; Blacklist hits per hour",
"analytics.blacklist-daily": "<strong>Figure 2</strong> &ndash; Blacklist hits per day"
"analytics.blacklist-daily": "<strong>Figure 2</strong> &ndash; Blacklist hits per day",
"ip-banned": "IP banned"
}

2
public/language/en-GB/topic.json
Unescape Escape View File

@ -33,6 +33,8 @@
"locked": "Locked",
"pinned": "Pinned",
"moved": "Moved",
"copy-ip": "Copy IP",
"ban-ip": "Ban IP",
"bookmark_instructions" : "Click here to return to the last read post in this thread.",

22
public/src/client/topic/postTools.js
Unescape Escape View File

@ -8,8 +8,7 @@ define('forum/topic/postTools', [
'translator',
'forum/topic/votes',
'forum/topic/move-post',
'benchpress',
], function (share, navigator, components, translator, votes, movePost, Benchpress) {
], function (share, navigator, components, translator, votes, movePost) {
var PostTools = {};
var staleReplyAnyway = false;
@ -45,11 +44,12 @@ define('forum/topic/postTools', [
}
data.posts.display_move_tools = data.posts.display_move_tools && index !== 0;
Benchpress.parse('partials/topic/post-menu-list', data, function (html) {
translator.translate(html, function (html) {
dropdownMenu.html(html);
$(window).trigger('action:post.tools.load');
app.parseAndTranslate('partials/topic/post-menu-list', data, function (html) {
dropdownMenu.html(html);
require(['clipboard'], function (clipboard) {
new clipboard('[data-clipboard-text]');
});
$(window).trigger('action:post.tools.load');
});
});
});
@ -192,6 +192,16 @@ define('forum/topic/postTools', [
movePost.openMovePostModal($(this));
});
postContainer.on('click', '[component="post/ban-ip"]', function () {
var ip = $(this).attr('data-ip');
socket.emit('blacklist.addRule', ip, function (err) {
if (err) {
return app.alertError(err.message);
}
app.alertSuccess('[[admin/manage/blacklist:ban-ip]]');
});
});
postContainer.on('click', '[component="post/chat"]', function () {
openChat($(this));
});

1
src/controllers/admin/blacklist.js
Unescape Escape View File

@ -7,7 +7,6 @@ var analytics = require('../../analytics');
var blacklistController = module.exports;
blacklistController.get = function (req, res, next) {
// Analytics.getBlacklistAnalytics
async.parallel({
rules: async.apply(meta.blacklist.get),
analytics: async.apply(analytics.getBlacklistAnalytics),

25
src/meta/blacklist.js
Unescape Escape View File

@ -9,9 +9,8 @@ var pubsub = require('../pubsub');
var plugins = require('../plugins');
var analytics = require('../analytics');
var Blacklist = {
_rules: [],
};
var Blacklist = module.exports;
Blacklist._rules = [];
Blacklist.load = function (callback) {
callback = callback || function () {};
@ -182,4 +181,22 @@ Blacklist.validate = function (rules, callback) {
});
};
module.exports = Blacklist;
Blacklist.addRule = function (rule, callback) {
var valid;
async.waterfall([
function (next) {
Blacklist.validate(rule, next);
},
function (result, next) {
valid = result.valid;
if (!valid.length) {
return next(new Error('[[error:invalid-rule]]'));
}
Blacklist.get(next);
},
function (rules, next) {
rules = rules + '\n' + valid[0];
Blacklist.save(rules, next);
},
], callback);
};

1
src/meta/js.js
Unescape Escape View File

@ -98,6 +98,7 @@ JS.scripts = {
'jqueryui.js': 'public/vendor/jquery/js/jquery-ui.js',
'zxcvbn.js': 'node_modules/zxcvbn/dist/zxcvbn.js',
ace: 'node_modules/ace-builds/src-min',
'clipboard.js': 'node_modules/clipboard/dist/clipboard.min.js',
},
};

31
src/plugins/hooks.js
Unescape Escape View File

@ -82,23 +82,20 @@ module.exports = function (Plugins) {
var hookList = Plugins.loadedHooks[hook];
var hookType = hook.split(':')[0];
try {
switch (hookType) {
case 'filter':
fireFilterHook(hook, hookList, params, callback);
break;
case 'action':
fireActionHook(hook, hookList, params, callback);
break;
case 'static':
fireStaticHook(hook, hookList, params, callback);
break;
default:
winston.warn('[plugins] Unknown hookType: ' + hookType + ', hook : ' + hook);
break;
}
} catch (err) {
callback(err);
switch (hookType) {
case 'filter':
fireFilterHook(hook, hookList, params, callback);
break;
case 'action':
fireActionHook(hook, hookList, params, callback);
break;
case 'static':
fireStaticHook(hook, hookList, params, callback);
break;
default:
winston.warn('[plugins] Unknown hookType: ' + hookType + ', hook : ' + hook);
callback();
break;
}
};

15
src/socket.io/blacklist.js
Unescape Escape View File

@ -26,3 +26,18 @@ SocketBlacklist.save = function (socket, rules, callback) {
},
], callback);
};
SocketBlacklist.addRule = function (socket, rule, callback) {
async.waterfall([
function (next) {
user.isAdminOrGlobalMod(socket.uid, next);
},
function (isAdminOrGlobalMod, next) {
if (!isAdminOrGlobalMod) {
return callback(new Error('[[error:no-privileges]]'));
}
meta.blacklist.addRule(rule, next);
},
], callback);
};

21
src/socket.io/posts/tools.js
Unescape Escape View File

@ -10,6 +10,8 @@ var socketTopics = require('../topics');
var privileges = require('../../privileges');
var plugins = require('../../plugins');
var social = require('../../social');
var user = require('../../user');
module.exports = function (SocketPosts) {
SocketPosts.loadPostTools = function (socket, data, callback) {
@ -20,10 +22,16 @@ module.exports = function (SocketPosts) {
function (next) {
async.parallel({
posts: function (next) {
posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid'], next);
posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid', 'ip'], next);
},
isAdmin: function (next) {
user.isAdministrator(socket.uid, next);
},
isGlobalMod: function (next) {
user.isGlobalModerator(socket.uid, next);
},
isAdminOrMod: function (next) {
privileges.categories.isAdminOrMod(data.cid, socket.uid, next);
isModerator: function (next) {
user.isModerator(socket.uid, data.cid, next);
},
canEdit: function (next) {
privileges.posts.canEdit(data.pid, socket.uid, next);
@ -54,7 +62,12 @@ module.exports = function (SocketPosts) {
results.posts.display_delete_tools = results.canDelete.flag;
results.posts.display_flag_tools = socket.uid && !results.posts.selfPost && results.canFlag.flag;
results.posts.display_moderator_tools = results.posts.display_edit_tools || results.posts.display_delete_tools;
results.posts.display_move_tools = results.isAdminOrMod;
results.posts.display_move_tools = results.isAdmin || results.isModerator;
results.posts.display_ip_ban = (results.isAdmin || results.isGlobalMod) && !results.posts.selfPost;
if (!results.isAdmin && !results.isGlobalMod && !results.isModerator) {
results.posts.ip = undefined;
}
next(null, results);
},
], callback);

16
test/plugins.js
Unescape Escape View File

@ -70,22 +70,6 @@ describe('Plugins', function () {
});
});
it('should not crash if there is an exception in a hook', function (done) {
function filterMethod(data, callback) {
var crash;
crash.a = 5;
callback(null, data);
}
plugins.registerHook('test-plugin-crash', { hook: 'filter:test.crashHook', method: filterMethod });
plugins.fireHook('filter:test.crashHook', { foo: 1 }, function (err, data) {
assert(err);
assert.equal(err.message, 'Cannot set property \'a\' of undefined');
done();
});
});
it('should get plugin data from nbbpm', function (done) {
plugins.get('nodebb-plugin-markdown', function (err, data) {
assert.ifError(err);

Write Preview
Loading…
Cancel
Save