Oktober 2013 - ngIRCd GIT Updates

Alexander Barton : Don't forward KILL commands for unknown clients
by alex＠arthur.barton.de 01 Okt '13

01 Okt '13

Module: ngircd.git Branch: master Commit: 02182143c30288b54cf84325c796ec9b7a7b2d34 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=02182143… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 26 02:58:01 2013 +0200 Don't forward KILL commands for unknown clients --- src/ngircd/irc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 74b8a01..ee7972c 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -346,18 +346,18 @@ IRC_KillClient(CLIENT *Client, CLIENT *From, const char *Nick, const char *Reaso CONN_ID my_conn, conn; CLIENT *c; - /* Inform other servers */ - IRC_WriteStrServersPrefix(From ? Client : NULL, - From ? From : Client_ThisServer(), - "KILL %s :%s", Nick, Reason); - - /* Do we know such a client? */ + /* Do we know such a client in the network? */ c = Client_Search(Nick); if (!c) { - LogDebug("Client with nick \"%s\" is unknown here.", Nick); + LogDebug("Client with nick \"%s\" is unknown, not forwaring.", Nick); return CONNECTED; } + /* Inform other servers */ + IRC_WriteStrServersPrefix(From ? Client : NULL, + From ? From : Client_ThisServer(), + "KILL %s :%s", Nick, Reason); + if (Client_Type(c) != CLIENT_USER && Client_Type(c) != CLIENT_GOTNICK) { /* Target of this KILL is not a regular user, this is * invalid! So we ignore this case if we received a

1 0

Alexander Barton : New function IRC_KillClient() to kill clients
by alex＠arthur.barton.de 01 Okt '13

01 Okt '13

Module: ngircd.git Branch: master Commit: b5faf3055b61afaef73ac49a448cac1a5b063127 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b5faf305… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 1 12:13:17 2013 +0200 New function IRC_KillClient() to kill clients The old local function Kill_Nick() in irc.c has been an ugly hack. This patch implements a generic function for killing clients. Adjust all callers of Kill_Nick() and respect the return code! --- src/ngircd/irc-login.c | 66 ++++++++--------------- src/ngircd/irc.c | 135 ++++++++++++++++++++++++++++-------------------- src/ngircd/irc.h | 5 +- 3 files changed, 105 insertions(+), 101 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=b5fa…

1 0

Alexander Barton : Adjust log messages for invalid and spoofed prefixes
by alex＠arthur.barton.de 01 Okt '13

01 Okt '13

Module: ngircd.git Branch: master Commit: cccd8fc957e893e250324b65146df8fca4680f11 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cccd8fc9… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 26 02:26:24 2013 +0200 Adjust log messages for invalid and spoofed prefixes Now invalid prefixes aren't logged no more when originating from an other server (besides in debug mode), and spoofed prefixes are correctly logged using LOG_WARNING (from an other server) or LOG_ERR (from a client) levels. In addition, the log message texts have been adjusted to better reflect what will happen: commands with invalid prefixes are ignored and logged, commands with spoofed prefixes will result in the client being disconncted (regular users) or the command being ignored (other servers). This cleans up logging of commands related to already KILL'ed clients. --- src/ngircd/parse.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index bc01e09..5006d2f 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -325,15 +325,20 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) } /* check if client in prefix is known */ - c = Client_Search( Req->prefix ); + c = Client_Search(Req->prefix); if (!c) { - Log(LOG_ERR, - "Invalid prefix \"%s\", client not known (connection %d, command \"%s\")!?", - Req->prefix, Idx, Req->command); - if (!Conn_WriteStr(Idx, - "ERROR :Invalid prefix \"%s\", client not known", - Req->prefix)) - *Closed = true; + if (Client_Type(client) != CLIENT_SERVER) { + Log(LOG_ERR, + "Ignoring command with invalid prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!", + Req->prefix, Client_ID(client), Idx, Req->command); + if (!Conn_WriteStr(Idx, + "ERROR :Invalid prefix \"%s\"", + Req->prefix)) + *Closed = true; + IRC_SetPenalty(client, 2); + } else + LogDebug("Ignoring command with invalid prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!", + Req->prefix, Client_ID(client), Idx, Req->command); return false; } @@ -342,19 +347,16 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) if (Client_NextHop(c) != client) { if (Client_Type(c) != CLIENT_SERVER) { Log(LOG_ERR, - "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!", - Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx, - Req->command); + "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\"), closing connection!", + Req->prefix, Client_ID(client), Idx, Req->command); Conn_Close(Idx, NULL, "Spoofed prefix", true); *Closed = true; } else { - Log(LOG_INFO, - "Ignoring spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\").", - Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx, - Req->command); + Log(LOG_WARNING, + "Ignoring command with spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!", + Req->prefix, Client_ID(client), Idx, Req->command); } return false; - } return true;

1 0