From: Darren <darren@darrenwhitlen.com>
Date: Wed, 17 Jul 2013 15:30:55 +0000 (+0100)
Subject: Improve Identd server to actually process data it receives
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4ebee99c265c483e600961fec745862f69443f0b;p=KiwiIRC.git

Improve Identd server to actually process data it receives
---

diff --git a/server/identd.js b/server/identd.js
index 2a8bfa5..7ad72fb 100644
--- a/server/identd.js
+++ b/server/identd.js
@@ -1,6 +1,8 @@
 var net = require('net');
 
-function IdentdServer(opts) {
+var IdentdServer = module.exports = function(opts) {
+
+    var that = this;
 
     // Option defaults
     opts = opts || {};
@@ -11,21 +13,26 @@ function IdentdServer(opts) {
 
 
     var server = net.createServer(function(socket) {
-        var user, system;
+        var buffer = '';
 
-        if (typeof opts.user_id === 'function') {
-            user = opts.user_id(socket).toString();
-        } else {
-            user = opts.user_id.toString();
-        }
+        socket.on('data', function(data){
+            var data_line, response;
 
-        if (typeof opts.system_id === 'function') {
-            system = opts.system_id(socket).toString();
-        } else {
-            system = opts.system_id.toString();
-        }
+            buffer += data.toString();
+
+            // Wait until we have a full line of data before processing it
+            if (buffer.indexOf('\n') === -1)
+                return;
+
+            // Get the first line of data and process it for a rsponse
+            data_line = buffer.split('\n')[0];
+            response = that.processLine(data_line);
+
+            // Close down the socket while sending the response
+            socket.removeAllListeners();
+            socket.end(response);
+        });
 
-        socket.end('25,25 : USERID : ' + system + ' : ' + user);
     });
 
     server.on('listening', function() {
@@ -40,7 +47,42 @@ function IdentdServer(opts) {
     this.stop = function(callback) {
         server.close(callback);
     };
-}
 
 
-module.exports = IdentdServer;
\ No newline at end of file
+    /**
+     * Process a line of data for an Identd response
+     * 
+     * @param {String} The line of data to process
+     * @return {String} Data to send back to the Identd client
+     */
+    this.processLine = function(line) {
+        var ports = line.split(','),
+            port_here = 0,
+            port_there = 0;
+
+        // We need 2 port number to make this work
+        if (ports.length < 2)
+            return;
+
+        port_here = parseInt(ports[0], 10);
+        port_there = parseInt(ports[1], 10);
+
+        // Make sure we have both ports to work with
+        if (!port_here || !port_there)
+            return;
+
+        if (typeof opts.user_id === 'function') {
+            user = opts.user_id(port_here, port_there).toString();
+        } else {
+            user = opts.user_id.toString();
+        }
+
+        if (typeof opts.system_id === 'function') {
+            system = opts.system_id(port_here, port_there).toString();
+        } else {
+            system = opts.system_id.toString();
+        }
+
+        return port_here.toString() + ' , ' + port_there.toString() + ' : USERID : ' + system + ' : ' + user;
+    };
+};