- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : ngIRCd release 15~rc1
by alex＠arthur.barton.de 15 Okt '09

15 Okt '09

Module: ngircd.git Branch: master Commit: bc1ac7fbc57bb6341b0b553c29d2da82464fc866 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bc1ac7fb… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 15 10:04:34 2009 +0200 ngIRCd release 15~rc1 --- ChangeLog | 1 + NEWS | 1 + configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab0d330..8bb7508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ ngIRCd Release 15 + ngIRCd 15~rc1 (2009-10-15) - Do not add default listening port (6667) if SSL ports were specified, so ngIRCd can be configured to only accept SSL-encrypted connections now. - Enable IRC operators to use the IRC command SQUIT (insted of the already diff --git a/NEWS b/NEWS index 247afb1..76d57b5 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ ngIRCd Release 15 + ngIRCd 15~rc1 (2009-10-15) - Do not add default listening port (6667) if SSL ports were specified, so ngIRCd can be configured to only accept SSL-encrypted connections now. - Enable IRC operators to use the IRC command SQUIT (insted of the already diff --git a/configure.in b/configure.in index bfa800b..9e8685d 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 14.1) +AC_INIT(ngircd, 15~rc1) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index abfad7f..61d0af2 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (15~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 15. + + -- Alexander Barton <alex(a)barton.de> Thu, 15 Oct 2009 10:01:08 +0200 + ngircd (14.1-0ab1) unstable; urgency=high * New "upstream" release ngIRCd 14.1, fixing a security-related bug. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 1e72f30..e860326 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 14.1 +%define version 15~rc1 %define release 1 %define prefix %{_prefix}

1 0

Tag rel-15-rc1: Alexander Barton : ngIRCd release 15~rc1
by alex＠arthur.barton.de 15 Okt '09

15 Okt '09

Module: ngircd.git Branch: refs/tags/rel-15-rc1 Tag: 2c6b6c1b51ac735007eeb508e8b04461875a0bc5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=2c6b6c1b51a… Tagger: Alexander Barton <alex(a)barton.de> Date: Thu Oct 15 10:05:03 2009 +0200 ngIRCd release 15~rc1

1 0

Alexander Barton : Updated NEWS and ChangeLog files
by alex＠arthur.barton.de 03 Okt '09

03 Okt '09

Module: ngircd.git Branch: master Commit: 37e950a40ceef1e28fde92dd3b2c3bcd03800295 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=37e950a4… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 3 16:45:09 2009 +0200 Updated NEWS and ChangeLog files --- ChangeLog | 13 ++++++++++++- NEWS | 11 +++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2300d1a..ab0d330 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,8 +10,19 @@ -- ChangeLog -- -ngIRCd Release 14.2 - +ngIRCd Release 15 + + - Do not add default listening port (6667) if SSL ports were specified, so + ngIRCd can be configured to only accept SSL-encrypted connections now. + - Enable IRC operators to use the IRC command SQUIT (insted of the already + implemented but non-standard DISCONNECT command). + - New configuration option "AllowRemoteOper" (disabled by default) that + enables remote IRC operators to use the IRC commands SQUIT and CONNECT + on the local server. + - Mac OS X: fix test for packagemaker(1) tool in Makefile and use gcc 4.0 + for Mac OS X 10.4 compatibility in the Xcode project file. + - Fix --with-{openssl|gnutls} to accept path names. + - Fix LSB header of Debian init script. - Updated doc/Platforms.txt and include new script contrib/platformtest.sh to ease generating platform reports. - Fix connection information for already registered connections. diff --git a/NEWS b/NEWS index d386de2..247afb1 100644 --- a/NEWS +++ b/NEWS @@ -10,8 +10,15 @@ -- NEWS -- -ngIRCd Release 14.2 - +ngIRCd Release 15 + + - Do not add default listening port (6667) if SSL ports were specified, so + ngIRCd can be configured to only accept SSL-encrypted connections now. + - Enable IRC operators to use the IRC command SQUIT (insted of the already + implemented but non-standard DISCONNECT command). + - New configuration option "AllowRemoteOper" (disabled by default) that + enables remote IRC operators to use the IRC commands SQUIT and CONNECT + on the local server. - Enforce upper limit on maximum number of handled commands. This implements a throttling scheme: an IRC client can send up to 3 commands or 256 bytes per second before a one second pause is enforced.

1 0

Alexander Barton : New "module" op.c/op. h for IRC operator related functions
by alex＠arthur.barton.de 30 Sep '09

30 Sep '09

Module: ngircd.git Branch: master Commit: e46cf64cc1e3bf21060df1d1125502277d035170 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e46cf64c… Author: Alexander Barton <alex(a)barton.de> Date: Wed Apr 22 23:17:25 2009 +0200 New "module" op.c/op.h for IRC operator related functions The new "module" op.c is used to implement functions related to IRC Ops. At the moment, these two functions are available: - Op_Check() to check for a valid IRC Op, and - Op_NoPrivileges() to generate "permission denied" messages. --- src/ngircd/Makefile.am | 4 +- src/ngircd/op.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ src/ngircd/op.h | 22 +++++++++++++ 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am index fca531d..f94f8d9 100644 --- a/src/ngircd/Makefile.am +++ b/src/ngircd/Makefile.am @@ -23,7 +23,7 @@ sbin_PROGRAMS = ngircd ngircd_SOURCES = ngircd.c array.c channel.c client.c conf.c conn.c conn-func.c \ conn-ssl.c conn-zip.c hash.c io.c irc.c irc-channel.c irc-info.c irc-login.c \ irc-mode.c irc-op.c irc-oper.c irc-server.c irc-write.c lists.c log.c \ - match.c numeric.c parse.c rendezvous.c resolve.c + match.c op.c numeric.c parse.c rendezvous.c resolve.c ngircd_LDFLAGS = -L../portab -L../tool -L../ipaddr @@ -32,7 +32,7 @@ ngircd_LDADD = -lngportab -lngtool -lngipaddr noinst_HEADERS = ngircd.h array.h channel.h client.h conf.h conf-ssl.h conn.h \ conn-func.h conn-ssl.h conn-zip.h hash.h io.h irc.h irc-channel.h \ irc-info.h irc-login.h irc-mode.h irc-op.h irc-oper.h irc-server.h \ - irc-write.h lists.h log.h match.h numeric.h parse.h rendezvous.h \ + irc-write.h lists.h log.h match.h numeric.h op.h parse.h rendezvous.h \ resolve.h defines.h messages.h clean-local: diff --git a/src/ngircd/op.c b/src/ngircd/op.c new file mode 100644 index 0000000..031bc28 --- /dev/null +++ b/src/ngircd/op.c @@ -0,0 +1,82 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + * + * IRC operator functions + */ + + +#include "portab.h" + +#include "imp.h" +#include <assert.h> +#include <string.h> + +#include "conn.h" +#include "client.h" +#include "channel.h" +#include "conf.h" +#include "log.h" +#include "parse.h" +#include "messages.h" +#include "irc-write.h" + +#include <exp.h> +#include "op.h" + +/** + * Return and log a "no privileges" message. + */ +GLOBAL bool +Op_NoPrivileges(CLIENT * Client, REQUEST * Req) +{ + CLIENT *from = NULL; + + if (Req->prefix) + from = Client_Search(Req->prefix); + + if (from) { + Log(LOG_NOTICE, "No privileges: client \"%s\" (%s), command \"%s\"", + Req->prefix, Client_Mask(Client), Req->command); + return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG, + Client_ID(from)); + } else { + Log(LOG_NOTICE, "No privileges: client \"%s\", command \"%s\"", + Client_Mask(Client), Req->command); + return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, + Client_ID(Client)); + } +} /* Op_NoPrivileges */ + + +/** + * Check that the client is an IRC operator allowed to administer this server. + */ +GLOBAL bool +Op_Check(CLIENT * Client, REQUEST * Req) +{ + CLIENT *c; + + assert(Client != NULL); + assert(Req != NULL); + + if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) + c = Client_Search(Req->prefix); + else + c = Client; + if (!c) + return false; + if (!Client_HasMode(c, 'o')) + return false; + if (!Client_OperByMe(c) && !Conf_AllowRemoteOper) + return false; + /* The client is an local IRC operator, or this server is configured + * to trust remote operators. */ + return true; +} /* Op_Check */ diff --git a/src/ngircd/op.h b/src/ngircd/op.h new file mode 100644 index 0000000..544be25 --- /dev/null +++ b/src/ngircd/op.h @@ -0,0 +1,22 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + * + * Operator management (header) + */ + +#ifndef __oper_h__ +#define __oper_h__ + +GLOBAL bool Op_NoPrivileges PARAMS((CLIENT * Client, REQUEST * Req)); +GLOBAL bool Op_Check PARAMS((CLIENT * Client, REQUEST * Req)); + +#endif + +/* -eof- */

1 0

Alexander Barton : Use functions provided by op.c "module"
by alex＠arthur.barton.de 30 Sep '09

30 Sep '09

Module: ngircd.git Branch: master Commit: 9918dfc1d595a680573910d12beb337cf4a58b14 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9918dfc1… Author: Alexander Barton <alex(a)barton.de> Date: Wed Apr 22 23:24:15 2009 +0200 Use functions provided by op.c "module" Local functions Check_Oper() and No_Privileges() have been replaced by global functions in op.c "module": Op_Check() and Op_NoPrivileges(). --- src/ngircd/irc-oper.c | 73 +++++++----------------------------------------- 1 files changed, 11 insertions(+), 62 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index f67e947..68b5eb6 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -31,6 +31,7 @@ #include "match.h" #include "messages.h" #include "parse.h" +#include "op.h" #include <exp.h> #include "irc-oper.h" @@ -51,58 +52,6 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) } /* Bad_OperPass */ -/** - * Check that the client is an IRC operator allowed to administer this server. - */ -static bool -Check_Oper(CLIENT * Client, REQUEST * Req) -{ - CLIENT *c; - - assert(Client != NULL); - assert(Req != NULL); - - if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) - c = Client_Search(Req->prefix); - else - c = Client; - if (!c) - return false; - if (!Client_HasMode(c, 'o')) - return false; - if (!Client_OperByMe(c) && !Conf_AllowRemoteOper) - return false; - /* The client is an local IRC operator, or this server is configured - * to trust remote operators. */ - return true; -} /* CheckOper */ - - -/** - * Return and log a "no privileges" message. - */ -static bool -No_Privileges(CLIENT * Client, REQUEST * Req) -{ - CLIENT *from = NULL; - - if (Req->prefix) - from = Client_Search(Req->prefix); - - if (from) { - Log(LOG_NOTICE, "No privileges: client \"%s\" (%s), command \"%s\"", - Req->prefix, Client_Mask(Client), Req->command); - return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG, - Client_ID(from)); - } else { - Log(LOG_NOTICE, "No privileges: client \"%s\", command \"%s\"", - Client_Mask(Client), Req->command); - return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, - Client_ID(Client)); - } -} /* PermissionDenied */ - - GLOBAL bool IRC_OPER( CLIENT *Client, REQUEST *Req ) { @@ -151,8 +100,8 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ #ifdef STRICT_RFC @@ -191,8 +140,8 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -212,8 +161,8 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -235,8 +184,8 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 && @@ -329,8 +278,8 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ if (Req->argc != 1)

1 0

Alexander Barton : Xcode: added new op.{c|h} to project file
by alex＠arthur.barton.de 30 Sep '09

30 Sep '09

Module: ngircd.git Branch: master Commit: 03b70229eb95e218f56ab22ce30fa6279b3ae91f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=03b70229… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 25 00:37:27 2009 +0200 Xcode: added new op.{c|h} to project file --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 3f55ed3..a7cc74f 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -35,6 +35,7 @@ FA322DBE0CEF7766001761B3 /* tool.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D330CEF74B1001761B3 /* tool.c */; }; FA322DC10CEF77CB001761B3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA322DC00CEF77CB001761B3 /* libz.dylib */; }; FA407F2E0DB159F400271AF1 /* ng_ipaddr.c in Sources */ = {isa = PBXBuildFile; fileRef = FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */; }; + FA85178C0FA061EC006A1F5A /* op.c in Sources */ = {isa = PBXBuildFile; fileRef = FA85178B0FA061EC006A1F5A /* op.c */; }; FAA3D27B0F139CDC00B2447E /* conn-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA3D2790F139CDC00B2447E /* conn-ssl.c */; }; FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */ = {isa = PBXBuildFile; fileRef = FAE5CC2D0CF2308A007D69B6 /* numeric.c */; }; /* End PBXBuildFile section */ @@ -193,6 +194,8 @@ FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = ng_ipaddr.c; path = ipaddr/ng_ipaddr.c; sourceTree = "<group>"; }; FA407F2D0DB159F400271AF1 /* ng_ipaddr.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = ng_ipaddr.h; path = ipaddr/ng_ipaddr.h; sourceTree = "<group>"; }; FA407F380DB15AC700271AF1 /* GIT.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = GIT.txt; sourceTree = "<group>"; }; + FA85178A0FA061EC006A1F5A /* op.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = op.h; sourceTree = "<group>"; }; + FA85178B0FA061EC006A1F5A /* op.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = op.c; sourceTree = "<group>"; }; FAA3D2700F139CB300B2447E /* invite-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "invite-test.e"; sourceTree = "<group>"; }; FAA3D2710F139CB300B2447E /* join-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "join-test.e"; sourceTree = "<group>"; }; FAA3D2720F139CB300B2447E /* kick-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "kick-test.e"; sourceTree = "<group>"; }; @@ -332,6 +335,8 @@ FA322D070CEF74B1001761B3 /* ngircd.h */, FAE5CC2D0CF2308A007D69B6 /* numeric.c */, FAE5CC2C0CF2308A007D69B6 /* numeric.h */, + FA85178A0FA061EC006A1F5A /* op.h */, + FA85178B0FA061EC006A1F5A /* op.c */, FA322D080CEF74B1001761B3 /* parse.c */, FA322D090CEF74B1001761B3 /* parse.h */, FA322D0A0CEF74B1001761B3 /* rendezvous.c */, @@ -676,6 +681,7 @@ FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */, FA407F2E0DB159F400271AF1 /* ng_ipaddr.c in Sources */, FAA3D27B0F139CDC00B2447E /* conn-ssl.c in Sources */, + FA85178C0FA061EC006A1F5A /* op.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };

1 0

Alexander Barton : Enable SQUIT command for IRC Operators
by alex＠arthur.barton.de 30 Sep '09

30 Sep '09

Module: ngircd.git Branch: master Commit: 294320ed62bdb7dac546cea43fac3b4c916788a4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=294320ed… Author: Alexander Barton <alex(a)barton.de> Date: Tue May 19 22:41:45 2009 +0200 Enable SQUIT command for IRC Operators This patch enables IRC Operators to use the SQUIT command as specified in RFC 2812, section 3.1.8 "Squit". When forwarding SQUIT commands, the server connected to the target will drop the connection (not the target server itself!). Please note: - the configuration option "AllowRemoteOper" mus be enabled on the server disconnecting the target to allow forwarding of SQUIT commands. - if the remote server is configured to establish the connection, it will just do this; so the disconnect is not permanent in this case! --- src/ngircd/irc-server.c | 81 ++++++++++++++++++++++++++++++++++------------ src/ngircd/parse.c | 2 +- 2 files changed, 61 insertions(+), 22 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index b75a34f..ca2502d 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -37,6 +37,7 @@ #include "numeric.h" #include "ngircd.h" #include "irc-info.h" +#include "op.h" #include "exp.h" #include "irc-server.h" @@ -273,21 +274,40 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) GLOBAL bool IRC_SQUIT(CLIENT * Client, REQUEST * Req) { - CLIENT *target; - char msg[LINE_LEN + 64]; + char msg[COMMAND_LEN], logmsg[COMMAND_LEN]; + CLIENT *from, *target; + CONN_ID con; assert(Client != NULL); assert(Req != NULL); + if (Client_Type(Client) != CLIENT_SERVER + && !Client_HasMode(Client, 'o')) + return Op_NoPrivileges(Client, Req); + /* Bad number of arguments? */ if (Req->argc != 2) return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) { + from = Client_Search(Req->prefix); + if (Client_Type(from) != CLIENT_SERVER + && !Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); + } else + from = Client; + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); + Log(LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", - Client_ID(Client), Req->argv[0], Req->argv[1]); + Client_ID(from), Req->argv[0], Req->argv[1]); target = Client_Search(Req->argv[0]); + if (Client_Type(Client) != CLIENT_SERVER && + target == Client_ThisServer()) + return Op_NoPrivileges(Client, Req); if (!target) { /* The server is (already) unknown */ Log(LOG_WARNING, @@ -296,27 +316,46 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) return CONNECTED; } - if (Req->argv[1][0]) { - if (strlen(Req->argv[1]) > LINE_LEN) - Req->argv[1][LINE_LEN] = '\0'; - snprintf(msg, sizeof(msg), "%s (SQUIT from %s).", Req->argv[1], - Client_ID(Client)); - } else - snprintf(msg, sizeof(msg), "Got SQUIT from %s.", - Client_ID(Client)); - - if (Client_Conn(target) > NONE) { - /* We are directly connected to this server */ - if (Req->argv[1][0]) - Conn_Close(Client_Conn(target), msg, Req->argv[1], - true); + con = Client_Conn(target); + + if (Req->argv[1][0]) + if (Client_NextHop(from) != Client || con > NONE) + snprintf(msg, sizeof(msg), "%s (SQUIT from %s)", + Req->argv[1], Client_ID(from)); else - Conn_Close(Client_Conn(target), msg, NULL, true); - return DISCONNECTED; + strlcpy(msg, Req->argv[1], sizeof(msg)); + else + snprintf(msg, sizeof(msg), "Got SQUIT from %s", + Client_ID(from)); + + if (con > NONE) { + /* We are directly connected to the target server, so we + * have to tear down the connection and to inform all the + * other remaining servers in the network */ + Conn_Close(con, NULL, msg, true); + if (con == Client_Conn(Client)) + return DISCONNECTED; } else { - Client_Destroy(target, msg, Req->argv[1], false); - return CONNECTED; + /* This server is not directly connected, so the SQUIT must + * be forwarded ... */ + if (Client_Type(from) != CLIENT_SERVER) { + /* The origin is not an IRC server, so don't evaluate + * this SQUIT but simply forward it */ + IRC_WriteStrClientPrefix(Client_NextHop(target), + from, "SQUIT %s :%s", Req->argv[0], Req->argv[1]); + } else { + /* SQUIT has been generated by another server, so + * remove the target server from the network! */ + logmsg[0] = '\0'; + if (!strchr(msg, '(')) + snprintf(logmsg, sizeof(logmsg), + "%s (SQUIT from %s)", Req->argv[1], + Client_ID(from)); + Client_Destroy(target, logmsg[0] ? logmsg : msg, + msg, false); + } } + return CONNECTED; } /* IRC_SQUIT */ /* -eof- */ diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 6d53525..2c28a30 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -92,7 +92,7 @@ static COMMAND My_Commands[] = { "SERVICE", IRC_SERVICE, 0xFFFF, 0, 0, 0 }, { "SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 0, 0 }, { "SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "SQUIT", IRC_SQUIT, CLIENT_SERVER, 0, 0, 0 }, + { "SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : Generate WALLOPS message on operator-generated SQUIT
by alex＠arthur.barton.de 30 Sep '09

30 Sep '09

Module: ngircd.git Branch: master Commit: 881b9af2512a9707cdd599f84628a03c4e22cf2b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=881b9af2… Author: Alexander Barton <alex(a)barton.de> Date: Tue May 19 23:06:28 2009 +0200 Generate WALLOPS message on operator-generated SQUIT --- src/ngircd/irc-server.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index ca2502d..a0a9468 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -332,6 +332,10 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) /* We are directly connected to the target server, so we * have to tear down the connection and to inform all the * other remaining servers in the network */ + IRC_SendWallops(Client_ThisServer(), Client_ThisServer(), + "Received SQUIT %s from %s: %s", + Req->argv[0], Client_ID(from), + Req->argv[1][0] ? Req->argv[1] : "-"); Conn_Close(con, NULL, msg, true); if (con == Client_Conn(Client)) return DISCONNECTED;

1 0

Alexander Barton : Make sure forwarded CONNECT commands are handled correctly
by alex＠arthur.barton.de 30 Sep '09

30 Sep '09

Module: ngircd.git Branch: master Commit: 55c04e691d2e069eebf1f2cc7d9992d2510f681f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=55c04e69… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 9 23:00:45 2009 +0200 Make sure forwarded CONNECT commands are handled correctly --- src/ngircd/irc-oper.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 68b5eb6..17b6044 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -184,7 +184,8 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Op_Check(Client, Req)) + if (Client_Type(Client) != CLIENT_SERVER + && !Client_HasMode(Client, 'o')) return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ @@ -203,7 +204,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) if (Req->argc == 3 || Req->argc == 6) { /* This CONNECT has a target parameter */ - if (Client_Type(Client) == CLIENT_SERVER) + if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) from = Client_Search(Req->prefix); if (! from) return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, @@ -230,12 +231,8 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) return CONNECTED; } - Log(LOG_NOTICE | LOG_snotice, - "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(from), - Req->argv[0]); - IRC_SendWallops(Client_ThisServer(), Client_ThisServer(), - "Received CONNECT %s from %s", - Req->argv[0], Client_ID(from)); + if (!Op_Check(from, Req)) + return Op_NoPrivileges(Client, Req); switch (Req->argc) { case 1: @@ -263,6 +260,13 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) Req->argv[0]); } + Log(LOG_NOTICE | LOG_snotice, + "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(from), + Req->argv[0]); + IRC_SendWallops(Client_ThisServer(), Client_ThisServer(), + "Received CONNECT %s from %s", + Req->argv[0], Client_ID(from)); + return CONNECTED; } /* IRC_CONNECT */

1 0

Alexander Barton : Bad_OperPass(): code cleanup.
by alex＠arthur.barton.de 30 Sep '09

30 Sep '09

Module: ngircd.git Branch: master Commit: 3bf0c6f3b9cbeded68c2c7f7a6f2a020616b73f5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3bf0c6f3… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 13 17:30:04 2008 +0200 Bad_OperPass(): code cleanup. --- src/ngircd/irc-oper.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index b0271df..736163c 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -35,14 +35,19 @@ #include "irc-oper.h" +/** + * Handle invalid received OPER command. + * Log OPER attempt and send error message to client. + */ static bool Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) { - Log( LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", Client_Mask( Client ), - errtoken, errmsg); + Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", + Client_Mask(Client), errtoken, errmsg); IRC_SetPenalty(Client, 3); - return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client )); -} + return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG, + Client_ID(Client)); +} /* Bad_OperPass */ GLOBAL bool @@ -63,7 +68,7 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) return Bad_OperPass(Client, Req->argv[0], "not configured"); if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 ) - return Bad_OperPass(Client, Conf_Oper[i].name, "Bad password"); + return Bad_OperPass(Client, Conf_Oper[i].name, "bad password"); if( Conf_Oper[i].mask && (! Match( Conf_Oper[i].mask, Client_Mask( Client ) ))) return Bad_OperPass(Client, Conf_Oper[i].mask, "hostmask check failed" );

1 0