From 7d8220d838f82f7ad1ffedbcbd3b955aef6d71a2 Mon Sep 17 00:00:00 2001
From: marzavec <admin@marzavec.com>
Date: Sat, 10 Mar 2018 22:41:17 -0800
Subject: stabilized modules and server cmd field

---
 server/src/commands/mod/ban.js   | 11 ++++++++---
 server/src/commands/mod/kick.js  |  6 +++++-
 server/src/commands/mod/unban.js | 12 ++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'server/src/commands/mod')

diff --git a/server/src/commands/mod/ban.js b/server/src/commands/mod/ban.js
index fde1ad8..1880ef3 100644
--- a/server/src/commands/mod/ban.js
+++ b/server/src/commands/mod/ban.js
@@ -10,7 +10,11 @@ exports.run = async (core, server, socket, data) => {
     return;
   }
 
-  let targetNick = String(data.nick);
+  if (typeof data.nick !== 'string') {
+    return;
+  }
+
+  let targetNick = data.nick;
   let badClient = null;
   for (let client of server.clients) {
     // Find badClient's socket
@@ -38,11 +42,12 @@ exports.run = async (core, server, socket, data) => {
     return;
   }
 
-  // TODO: ratelimiting here
   // TODO: add reference to banned users nick or unban by nick cmd
-  //POLICE.arrest(getAddress(badClient))
+  server._police.arrest(badClient.remoteAddress);
   // TODO: add event to log?
+
   console.log(`${socket.nick} [${socket.trip}] banned ${targetNick} in ${socket.channel}`);
+
   server.broadcast({
     cmd: 'info',
     text: `Banned ${targetNick}`
diff --git a/server/src/commands/mod/kick.js b/server/src/commands/mod/kick.js
index 5cd524d..a730caf 100644
--- a/server/src/commands/mod/kick.js
+++ b/server/src/commands/mod/kick.js
@@ -10,7 +10,11 @@ exports.run = async (core, server, socket, data) => {
     return;
   }
 
-  let targetNick = String(data.nick);
+  if (typeof data.nick !== 'string') {
+    return;
+  }
+
+  let targetNick = data.nick;
   let badClient = null;
   for (let client of server.clients) {
     // Find badClient's socket
diff --git a/server/src/commands/mod/unban.js b/server/src/commands/mod/unban.js
index cc1016a..193b614 100644
--- a/server/src/commands/mod/unban.js
+++ b/server/src/commands/mod/unban.js
@@ -10,11 +10,15 @@ exports.run = async (core, server, socket, data) => {
     return;
   }
 
-  let ip = String(data.ip);
-  let nick = String(data.nick); // for future upgrade
+  if (typeof data.ip !== 'string') {
+    return;
+  }
+
+  let ip = data.ip;
+  let nick = data.nick; // for future upgrade
 
-  // TODO: remove ip from ratelimiter
-  // POLICE.pardon(ip)
+  // TODO: support remove by nick future upgrade
+  server._police.pardon(badClient.remoteAddress);
   console.log(`${socket.nick} [${socket.trip}] unbanned ${/*nick || */ip} in ${socket.channel}`);
 
   server.reply({
-- 
cgit v1.2.1