netplaySniff – Diff between revs 11 and 12

Subversion Repositories:

?pathlinks?

Rev 11 – Go to most recent revision – Details – Blame – Last modification – View Log

 const mqtt = require('mqtt')
 const YAML = require('yamljs')
 const Cap = require('cap').Cap
 const decoders = require('cap').decoders
 const PROTOCOL = decoders.PROTOCOL
-const shortHash = require('short-hash')
+const crypto = require('crypto')
 const { exec } = require("child_process")
 const Inotify = require('inotify-remastered').Inotify
 const inotify = new Inotify()
 const sqlite = require('sqlite3')
 const { Command } = require('commander')
-const net = require('net')
 // set up logger
 const logger = createLogger({
     format: format.combine(
         const cap = new Cap()
         const filter = `tcp and dst port ${config.netplay.port}`
         const bufSize = 10 * 1024 * 1024
         const buffer = Buffer.alloc(65535)
-        var device = Cap.findDevice(config.host);
+        var device = Cap.findDevice(config.listen);
         const linkType = cap.open(device, filter, bufSize, buffer)
         cap.setMinBytes && cap.setMinBytes(0)
         cap.on('packet', () => {
             let netplay = {}
             if (ret.info.type !== PROTOCOL.ETHERNET.IPV4) {
                 return
+            }
             ret = decoders.IPV4(buffer, ret.offset)
-            netplay.ip = ret.info.srcaddr
+            netplay.src = ret.info.srcaddr
-            netplay.to = ret.info.dstaddr
+            netplay.dst = ret.info.dstaddr
             if (ret.info.protocol !== PROTOCOL.IP.TCP) {
                 return
+            }
                 return
+            }
             // remove NULL and NETPLAY_CMD_NICK
+            netplay.nick = payload.toString().replace(/[\u0000\u0020]+/gi, '')
-            netplay.nick = payload.toString().replace(/[\u0000\u0020]+/gi, '')
+            var shasum = crypto.createHash('sha1')
+            shasum.update(`${netplay.nick}${netplay.src}`)
-            netplay.hash = shortHash(`${netplay.nick}${netplay.ip}`)
+            netplay.hash = shasum.digest('hex')
             netplay.time = new Date().toISOString()
-            logger.info(`Player ${netplay.nick} joined via IP ${netplay.ip}`);
+            logger.info(`Player ${netplay.nick} joined via IP ${netplay.src}`);
             const db = new sqlite.Database(config.db.file, sqlite.OPEN_CREATE | sqlite.OPEN_READWRITE | sqlite.OPEN_FULLMUTEX, (error) => {
                 if (error) {
                     logger.error(`failed to open database: ${config.db.file}`)
                     return
+                }
-                db.run(`CREATE TABLE IF NOT EXISTS "players" ("nick" TEXT(15) NOT NULL, "ip" TEXT NOT NULL)`, (error, result) => {
+                db.run(`CREATE TABLE IF NOT EXISTS "players" ("hash" TEXT(40) NOT NULL PRIMARY KEY, "nick" TEXT(15) NOT NULL, "ip" TEXT NOT NULL)`, (error, result) => {
                     if (error) {
                         logger.error(`could not create database table: ${error}`);
                         return
+                    }
-                    db.run(`INSERT INTO "players" ("nick", "ip") VALUES ($nick, $ip)`, { $nick: netplay.nick, $ip: netplay.ip }, (error) => {
+                    db.run(`REPLACE INTO "players" ("hash", "nick", "ip") VALUES ($hash, $nick, $ip)`, { $hash: netplay.hash, $nick: netplay.nick, $ip: netplay.src }, (error) => {
                 })
             })
             // send data to MQTT server
             const data = JSON.stringify(netplay, null, 4)
-            mqttClient.publish(`${config.mqtt.topic}`, data, (error, packet) => {
+            mqttClient.publish(config.mqtt.topic, data, (error, packet) => {
                 logger.info(`player data sent to MQTT broker`)
             })
             // ban by nick.
             let nickBanSet = new Set(config.bans.nicknames)
             if (nickBanSet.has(netplay.nick)) {
                 logger.info(`nick found to be banned: ${netplay.nick}`)
-                exec(`iptables -t mangle -A PREROUTING -p tcp --src ${netplay.ip} --dport ${config.netplay.port} -j DROP`, (error, stdout, stderr) => {
+                exec(`iptables -t mangle -A PREROUTING -p tcp --src ${netplay.src} --dport ${config.netplay.port} -j DROP`, (error, stdout, stderr) => {
                     if (error) {
                         logger.error(`Error returned while banning connecting client ${error.message}`)
                         return