Set up identd and make it work on connection 😎

This commit is contained in:
David White 2014-10-11 11:09:27 +01:00
parent 924bc39a95
commit ea0e66afd0
3 changed files with 55 additions and 29 deletions

View File

@ -125,7 +125,26 @@ Client.prototype.connect = function(args) {
rejectUnauthorized: false rejectUnauthorized: false
}; };
var stream = args.tls ? tls.connect(server) : net.connect(server); var identdItem = null;
var cb = function() {
identdItem = {
"remoteIp": stream.remoteAddress,
"remotePort": stream.remotePort,
"localPort": stream.localPort,
"username": username
};
identd.addConnection(identdItem);
};
var stream;
if (args.tls) {
stream = tls.connect(server);
stream.socket.on('connect', cb);
} else {
stream = net.connect(server, cb);
}
stream.on("error", function(e) { stream.on("error", function(e) {
console.log("Client#connect():\n" + e); console.log("Client#connect():\n" + e);
stream.end(); stream.end();
@ -137,26 +156,13 @@ Client.prototype.connect = function(args) {
msg: msg msg: msg
}); });
}); });
stream.on("close", function() {
identd.removeConnection(identdItem);
});
var nick = args.nick || "shout-user"; var nick = args.nick || "shout-user";
var username = args.username || nick; var username = args.username || nick;
var realname = args.realname || "Shout User"; var realname = args.realname || "Shout User";
var identdItem = null;
stream.on("connect", function() {
identdItem = {
"remoteIp": stream.remoteAddress,
"remotePort": stream.remotePort,
"localPort": stream.localPort,
"username": username
};
identd.addConnection(identdItem);
});
stream.on("close", function() {
identd.removeConnection(identdItem);
});
var irc = slate(stream); var irc = slate(stream);

View File

@ -7,7 +7,7 @@ function Identd() {
this.connections = []; this.connections = [];
this.server = null; this.server = null;
this.config = { this.config = {
enabled: false, enable: false,
port: 30113, port: 30113,
default: "shout" default: "shout"
}; };
@ -16,7 +16,12 @@ function Identd() {
Identd.prototype.respond = function(remoteIp, localPort, remotePort) { Identd.prototype.respond = function(remoteIp, localPort, remotePort) {
// Build the first part (always the same) // Build the first part (always the same)
var response = localPort + ", " + remotePort + " : "; var response = localPort + ", " + remotePort + " : ";
var connection = _.where(this.connections, {"remoteIp": remoteIp, "remotePort": remotePort, "localPort": localPort}); var params = {"remoteIp": remoteIp, "remotePort": remotePort, "localPort": localPort};
var connection = _.where(this.connections, params);
if (connection.length == 0) {
params["localPort"] = undefined;
connection = _.where(this.connections, params);
}
if (connection.length > 0) { if (connection.length > 0) {
// We have some connections, but we only want the first // We have some connections, but we only want the first
@ -25,7 +30,14 @@ Identd.prototype.respond = function(remoteIp, localPort, remotePort) {
// We're done with that connection. Remove it // We're done with that connection. Remove it
this.removeConnection(connection); this.removeConnection(connection);
} else { } else {
if (this.config.default == null) {
response += " ERROR : NOUSER"; response += " ERROR : NOUSER";
} else {
var ident = this.config.default.replace(/\?/g, function(a) {
return Math.floor(Math.random() * 10);
});
response += " USERID : UNIX : " + ident;
}
} }
// responses must end with CR+LF // responses must end with CR+LF
return response + "\r\n"; return response + "\r\n";
@ -33,7 +45,7 @@ Identd.prototype.respond = function(remoteIp, localPort, remotePort) {
Identd.prototype.parse = function(request) { Identd.prototype.parse = function(request) {
// myPort, theirPort\r\n // myPort, theirPort\r\n
request = request.split(/,\s*/); request = request.toString().split(/,\s*/);
if (request.length == 2) { if (request.length == 2) {
var localPort = parseInt(request[0]), var localPort = parseInt(request[0]),
remotePort = parseInt(request[1]); remotePort = parseInt(request[1]);
@ -44,20 +56,20 @@ Identd.prototype.parse = function(request) {
Identd.prototype.start = function(config) { Identd.prototype.start = function(config) {
_.merge(this.config, config.identd); _.merge(this.config, config.identd);
if (this.config.enabled) { if (this.config.enable) {
var self = this; var self = this;
// create the server // create the server
this.server = net.createServer(function(socket) { this.server = net.createServer(function(socket) {
socket.on('data', function(data) { socket.on('data', function(data) {
var parsed = this.parse(data); var parsed = self.parse(data);
// parse and generate a response // parse and generate a response
var response = this.respond(socket.remoteAddress, parsed[0], parsed[1]); var response = self.respond(socket.remoteAddress, parsed[0], parsed[1]);
socket.write(response); socket.write(response);
socket.end(); socket.end();
}); });
}); });
console.log("Starting identd on " + this.config.port); log("Starting identd on " + this.config.port);
this.server.listen(this.config.port); this.server.listen(this.config.port);
} }
@ -65,13 +77,17 @@ Identd.prototype.start = function(config) {
}; };
Identd.prototype.addConnection = function(connection) { Identd.prototype.addConnection = function(connection) {
if (this.config.enabled) if (this.config.enable) {
this.connections.push(connection); this.connections.push(connection);
log("Identd: adding:", connection);
}
}; };
Identd.prototype.removeConnection = function(connection) { Identd.prototype.removeConnection = function(connection) {
if (this.config.enabled) if (this.config.enable) {
this.connections = _.without(this.connections, connection); this.connections = _.without(this.connections, connection);
log("Identd: removing:", connection);
}
}; };
module.exports = new Identd().start(Helper.getConfig()); module.exports = new Identd();

View File

@ -36,6 +36,10 @@ module.exports = function(port, host, isPublic) {
}, app).listen(port, host) }, app).listen(port, host)
} }
if (config.identd && config.identd.enable) {
require("./identd").start(config);
}
sockets = io(server); sockets = io(server);
sockets.on("connect", function(socket) { sockets.on("connect", function(socket) {
if (config.public) { if (config.public) {