jenkins-bot has submitted this change and it was merged.
Change subject: Updating whitelist to check for cloak/nick
......................................................................
Updating whitelist to check for cloak/nick
This is more secure since even if a spammer try's to take a users identity
they have to know the password to the users account to get the cloak.
Also whitelist twentyafterfour and thcipriani nicks since they don't use cloaks.
Change-Id: I204ba64a03d74114508c1820f06d6ab4a34405a7
---
M src/relay.js
1 file changed, 36 insertions(+), 10 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Zppix: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/relay.js b/src/relay.js
index 0cdb053..a7f89e2 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -157,21 +157,47 @@
}
}
ircClient.addListener('join', waitForChannelJoins);
-//To do see Whitelist.js //
-var whitelist = [ "paladox", "mutante", "Zppix", "legoktm", "Krenair",
"hashar", "ostriches", "greg-g", "twentyafterfour", "apergos", "robh",
"marktraceur" ];
ircClient.addListener('message', function (from, to, text) {
+ var whitelist_cloaks = [
+ "mediawiki/paladox",
+ "wikimedia/mutante",
+ "wikipedia/Zppix",
+ "wikimedia/legoktm",
+ "wikimedia/Krenair",
+ "mediawiki/hashar",
+ "mediawiki/ostriches",
+ "wikimedia/greg-g",
+ "wiktionary/apergos",
+ "wikimedia/robh",
+ "fsf/member/marktraceur",
+ "wikimedia/GLavagetto-WMF",
+ "wikimedia/pdpc.active.reedy",
+ "mediawiki/yuvipanda",
+ "wikimedia/BDavis-WMF"
+ ];
+ var whitelist_nicks = [
+ "twentyafterfour",
+ "thcipriani"
+ ];
- if (text.indexOf('grrrit-wm: restart') === 0 && whitelist.indexOf(from) >=
0) {
- console.log(from + ' => ' + to + ' ' + text);
- logging.info('Connecting to gerrit..');
+ ircClient.whois(from, function(info){
- ircClient.say(to, "re-connecting to gerrit");
+ if (
+ text.indexOf('grrrit-wm: restart') === 0 &&
(whitelist_cloaks.indexOf(info.host) >= 0 ||
+ whitelist_nicks.indexOf(from) >= 0)
+ ) {
+ console.log(from + ' => ' + to + ' ' + text);
+ logging.info('Connecting to gerrit..');
- if (sshConn) {
- sshConn.end();
+ ircClient.say(to, "re-connecting to gerrit");
+
+ if (sshConn) {
+ sshConn.end();
+ }
+
+ ircClient.say(to, "reconnected to gerrit");
}
- ircClient.say(to, "reconnected to gerrit");
- }
+ });
});
--
To view, visit https://gerrit.wikimedia.org/r/319983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I204ba64a03d74114508c1820f06d6ab4a34405a7
Gerrit-PatchSet: 10
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Luke081515 <luke081...@web.de>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: Zppix <megadev44s.m...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
