- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : ngircd.c, main(): use strlcat() instead of strcat()
by alex＠arthur.barton.de 07 Okt '13

07 Okt '13

Module: ngircd.git Branch: master Commit: 4c5b439992ce99f1bed84c51e4d9c3a3cd118858 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4c5b4399… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 7 21:56:09 2013 +0200 ngircd.c, main(): use strlcat() instead of strcat() This fixes the following warning on OpenBSD 5.3: ngircd.o(.text+0xeb4): In function `main': src/ngircd/ngircd.c:300: warning: strcat() is almost always misused, please use strlcat() Thanks to Götz Hoffart for reporting this! --- src/ngircd/ngircd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 5637cb2..9c27409 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -297,7 +297,7 @@ main(int argc, const char *argv[]) PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS); #ifdef ZLIB - strcat(NGIRCd_ProtoID, "Z"); + strlcat(NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID); #endif if (Conf_OperCanMode) strcat(NGIRCd_ProtoID, "o");

1 0

Tag rel-21-rc1: Alexander Barton : ngIRCd Release 21~rc1
by alex＠arthur.barton.de 05 Okt '13

05 Okt '13

Module: ngircd.git Branch: refs/tags/rel-21-rc1 Tag: e1de5e4ec63ae2b674775c78482cafdd1be00c4c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=e1de5e4ec63… Tagger: Alexander Barton <alex(a)barton.de> Date: Sat Oct 5 23:40:43 2013 +0200 ngIRCd Release 21~rc1

1 0

Alexander Barton : ngIRCd Release 21~rc1
by alex＠arthur.barton.de 05 Okt '13

05 Okt '13

Module: ngircd.git Branch: master Commit: 86cd2da8d5dc08eedbf23be5249d1cc3a16f0787 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=86cd2da8… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 5 23:40:29 2013 +0200 ngIRCd Release 21~rc1 --- ChangeLog | 2 +- NEWS | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22e558d..cbf5d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ -- ChangeLog -- -ngIRCd 21 +ngIRCd 21~rc1 (2013-10-05) - Actually KILL clients on GLINE/KLINE. (Closes bug #156) - Adjust log messages for invalid and spoofed prefixes, which cleans up diff --git a/NEWS b/NEWS index 6b40328..e8f898a 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,7 @@ -- NEWS -- -ngIRCd 21 +ngIRCd 21~rc1 (2013-10-05) - Actually KILL clients on GLINE/KLINE. (Closes bug #156) - Add support to show all user links using the "STATS L" (uppercase) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 396d1d0..46646fc 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (21~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 21. + + -- Alexander Barton <alex(a)barton.de> Sat, 05 Oct 2013 23:24:09 +0200 + ngircd (20.3-0ab1) unstable; urgency=high * New "upstream" release, fixing a security related bug: ngIRCd 20.3. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 0469313..65df307 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 20.3 +%define version 21~rc1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 02 Okt '13

02 Okt '13

Module: ngircd.git Branch: master Commit: 9b1fee8995f5e1ee5390ba36635804744a368c94 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9b1fee89… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 2 02:10:48 2013 +0200 Update NEWS and ChangeLog files --- ChangeLog | 42 +++++++++++++++++++++++++++++++++++++++++- NEWS | 19 +++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1186276..22e558d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,45 @@ ngIRCd 21 + - Actually KILL clients on GLINE/KLINE. (Closes bug #156) + - Adjust log messages for invalid and spoofed prefixes, which cleans up + logging of commands related to already KILL'ed clients. And don't + forward KILL commands for (already) unknown clients any more to prevent + unnecessary duplicates. + - Add support to show all user links using the "STATS L" (uppercase) + command (restricted to IRC Operators). + - Fixed blocking of server reconnects in some error confitions. + - Don't ignore SSL-related errors during startup any more: abort startup + when SSL is requested by the configuration but can't be initialized and + don't continue only listening on plain text communicaiton ports. + (Closes bug #163) + - Implement configurable SSL cipher list selection for GnuTLS and OpenSSL + using the new configuration option "CipherList". In addition, this + changes the defaults to more secure values: "HIGH:!aNULL:@STRENGTH" for + OpenSSL, and "SECURE128" for GnuTLS. + - Fix "TRACE": Correctly return ERR_NEEDMOREPARAMS(461) (which basically + is "syntax error") when there are too many parameters. + - Clean up lots of permission and parameter checks in functions handling + IRC commands; and more consistently add penalty times on errors. + - Fix error numeric of WHOIS when no nick namename has been provided: + as per RFC it shoud be ERR_NONICKNAMEGIVEN(431). + - Only log "IDENT ... no result" messages when an IDENT looked took place + and didn't return any data, not when IDENT has been disabled. + - Show connection flag "s" (SSL) in RPL_TRACE{LINK|SERVER} messages: now + you can check if a server-to-server link is SSL-encrypted or not using + the IRC "TRACE" command. + - Correctly discard supplementary groups on server startup. + - Save client IP address text for "WebIRC" users and correctly display + it on WHOIS, for example. (Closes bug #159) + - Implement the new configuration option "DefaultUserModes" which lists + user modes that become automatically set on new local clients right + after login. Please note that only modes can be set that the client + could set on itself, so you can't set "a" (away) or "o" (IRC Op), + for example! User modes "i" (invisible) or "x" (cloaked) etc. are + "interesting", though. (Closes bug #160) + - Add support for the new METADATA "account" property, which allows + services to automatically identify users after netsplits and across + service restarts. - Enforce "penalty times" on error conditions more consistently and in more places. Now most error codes sent back from the IRC server to the client should result in a 2 second "penalty". @@ -43,7 +82,8 @@ ngIRCd 21 into this directory. (Closes bug #157) - Fix use-after-free in the Lists_CheckReason() function, which is used to check if a client is a member of a particular ban/invite/... list. - - Xcode: fix detection of host OS, vendor, and CPU type. + - Xcode: fix detection of host OS, vendor, and CPU type, and update + project settings for Xcode 5. - OS X PackageMaker: use relative path names in project files and package with correct file permissions (requires root privileges on "make"). - Add Travis-CI configuration file (".travis.yml") to project. diff --git a/NEWS b/NEWS index a8dc433..6b40328 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,25 @@ ngIRCd 21 + - Actually KILL clients on GLINE/KLINE. (Closes bug #156) + - Add support to show all user links using the "STATS L" (uppercase) + command (restricted to IRC Operators). + - Implement configurable SSL cipher list selection for GnuTLS and OpenSSL + using the new configuration option "CipherList". In addition, this + changes the defaults to more secure values: "HIGH:!aNULL:@STRENGTH" for + OpenSSL, and "SECURE128" for GnuTLS. + - Show connection flag "s" (SSL) in RPL_TRACE{LINK|SERVER} messages: now + you can check if a server-to-server link is SSL-encrypted or not using + the IRC "TRACE" command. + - Implement the new configuration option "DefaultUserModes" which lists + user modes that become automatically set on new local clients right + after login. Please note that only modes can be set that the client + could set on itself, so you can't set "a" (away) or "o" (IRC Op), + for example! User modes "i" (invisible) or "x" (cloaked) etc. are + "interesting", though. (Closes bug #160) + - Add support for the new METADATA "account" property, which allows + services to automatically identify users after netsplits and across + service restarts. - Implement a new configuration option "AllowedChannelTypes" that lists all allowed channel types (channel prefixes) for newly created channels on the local server. By default, all supported channel types are allowed.

1 0

Alexander Barton : Actually KILL clients on GLINE/KLINE
by alex＠arthur.barton.de 01 Okt '13

01 Okt '13

Module: ngircd.git Branch: master Commit: 2798a12444bce91613388ceb7ab52d1e97787687 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2798a124… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 1 12:09:59 2013 +0200 Actually KILL clients on GLINE/KLINE Kill all clients that match a new GLINE/KLINE mask and genrate apropriate KILL commands. These KILL commands can be superfluous, but are required when the IRC Operator isn't allowd to set remote G-Lines or if there are older servers in the network that don't kill clients on GLINE/KLINE. Closes bug #156. --- src/ngircd/irc-oper.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 74f17cc..4ccc76a 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -28,12 +28,14 @@ #include "conf.h" #include "channel.h" #include "class.h" +#include "parse.h" +#include "irc.h" #include "irc-macros.h" #include "irc-write.h" +#include "lists.h" #include "log.h" #include "match.h" #include "messages.h" -#include "parse.h" #include "op.h" #include <exp.h> @@ -384,9 +386,10 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) GLOBAL bool IRC_xLINE(CLIENT *Client, REQUEST *Req) { - CLIENT *from; + CLIENT *from, *c, *c_next; + char reason[COMMAND_LEN], class_c; + struct list_head *list; int class; - char class_c; assert(Client != NULL); assert(Req != NULL); @@ -446,6 +449,20 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) Req->argv[0], Req->argv[1], Req->argv[2]); } + + /* Check currently connected clients */ + snprintf(reason, sizeof(reason), "%c-Line by \"%s\": \"%s\"", + class_c, Client_ID(from), Req->argv[2]); + list = Class_GetList(class); + c = Client_First(); + while (c) { + c_next = Client_Next(c); + if ((class == CLASS_GLINE || Client_Conn(c) > NONE) + && Lists_Check(list, c)) + IRC_KillClient(Client, NULL, + Client_ID(c), reason); + c = c_next; + } } }

1 0

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

Alexander Barton : Remove CLIENT.oper_by_my, Client_SetOperByMe() and Client_OperByMe()
by alex＠arthur.barton.de 25 Sep '13

25 Sep '13

Module: ngircd.git Branch: master Commit: eccbd97e1f2599bfb76818fe6bc32967ed07e0c7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eccbd97e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 25 01:29:23 2013 +0200 Remove CLIENT.oper_by_my, Client_SetOperByMe() and Client_OperByMe() All places where Client_OperByMe() is used can either be converted to Client_HasMode(Client, 'o') or Op_Check(). And Op_Check() itself can use the connection handle for deciding whether the IRC Operator is a local user or not. --- src/ngircd/client.c | 17 ----------------- src/ngircd/client.h | 3 --- src/ngircd/irc-channel.c | 7 +++++-- src/ngircd/irc-mode.c | 23 +++++++---------------- src/ngircd/irc-oper.c | 13 +++++-------- src/ngircd/irc.c | 6 +++--- src/ngircd/op.c | 2 +- 7 files changed, 21 insertions(+), 50 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 37b97d6..b1a371f 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -545,14 +545,6 @@ Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer ) } /* Client_SetIntroducer */ -GLOBAL void -Client_SetOperByMe( CLIENT *Client, bool OperByMe ) -{ - assert( Client != NULL ); - Client->oper_by_me = OperByMe; -} /* Client_SetOperByMe */ - - GLOBAL bool Client_ModeAdd( CLIENT *Client, char Mode ) { @@ -889,14 +881,6 @@ Client_Flags( CLIENT *Client ) } /* Client_Flags */ -GLOBAL bool -Client_OperByMe( CLIENT *Client ) -{ - assert( Client != NULL ); - return Client->oper_by_me; -} /* Client_OperByMe */ - - GLOBAL int Client_Hops( CLIENT *Client ) { @@ -1426,7 +1410,6 @@ New_Client_Struct( void ) c->type = CLIENT_UNKNOWN; c->conn_id = NONE; - c->oper_by_me = false; c->hops = -1; c->token = -1; c->mytoken = -1; diff --git a/src/ngircd/client.h b/src/ngircd/client.h index e5c48b7..c6fcec0 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -58,7 +58,6 @@ typedef struct _CLIENT char info[CLIENT_INFO_LEN]; /* long user name (user) / info text (server) */ char modes[CLIENT_MODE_LEN]; /* client modes */ int hops, token, mytoken; /* "hops" and "Token" (see SERVER command) */ - bool oper_by_me; /* client is local IRC operator on this server? */ char *away; /* AWAY text (valid if mode 'a' is set) */ char flags[CLIENT_FLAGS_LEN]; /* flags of the client */ char *account_name; /* login account (for services) */ @@ -120,7 +119,6 @@ GLOBAL const char *Client_IPAText PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client )); -GLOBAL bool Client_OperByMe PARAMS(( CLIENT *Client )); GLOBAL int Client_Hops PARAMS(( CLIENT *Client )); GLOBAL int Client_Token PARAMS(( CLIENT *Client )); GLOBAL int Client_MyToken PARAMS(( CLIENT *Client )); @@ -142,7 +140,6 @@ GLOBAL void Client_SetInfo PARAMS(( CLIENT *Client, const char *Info )); GLOBAL void Client_SetType PARAMS(( CLIENT *Client, int Type )); GLOBAL void Client_SetHops PARAMS(( CLIENT *Client, int Hops )); GLOBAL void Client_SetToken PARAMS(( CLIENT *Client, int Token )); -GLOBAL void Client_SetOperByMe PARAMS(( CLIENT *Client, bool OperByMe )); GLOBAL void Client_SetModes PARAMS(( CLIENT *Client, const char *Modes )); GLOBAL void Client_SetFlags PARAMS(( CLIENT *Client, const char *Flags )); GLOBAL void Client_SetIntroducer PARAMS(( CLIENT *Client, CLIENT *Introducer )); diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index d5e7bdd..b286b5a 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -129,7 +129,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return false; } - if (Channel_HasMode(chan, 'O') && !Client_OperByMe(Client)) { + if (Channel_HasMode(chan, 'O') && !Client_HasMode(Client, 'o')) { /* Only IRC operators are allowed! */ IRC_WriteErrClient(Client, ERR_OPONLYCHANNEL_MSG, Client_ID(Client), channame); @@ -619,7 +619,10 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) /* Gotcha! */ if (!Channel_HasMode(chan, 's') || Channel_IsMemberOf(chan, from) - || (!Conf_MorePrivacy && Client_OperByMe(Client))) { + || (!Conf_MorePrivacy + && Client_HasMode(Client, 'o') + && Client_Conn(Client) > NONE)) + { if ((Conf_MaxListSize > 0) && IRC_CheckListTooBig(from, count, Conf_MaxListSize, diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index e2fa59a..af59683 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -223,11 +223,12 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) else x[0] = 'B'; break; - case 'c': /* Receive connect notices - * (only settable by IRC operators!) */ + case 'c': /* Receive connect notices */ + case 'q': /* KICK-protected user */ + /* (only settable by IRC operators!) */ if (!set || Client_Type(Client) == CLIENT_SERVER - || Client_OperByMe(Origin)) - x[0] = 'c'; + || Client_HasMode(Origin, 'o')) + x[0] = *mode_ptr; else ok = IRC_WriteErrClient(Origin, ERR_NOPRIVILEGES_MSG, @@ -235,22 +236,12 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) break; case 'o': /* IRC operator (only unsettable!) */ if (!set || Client_Type(Client) == CLIENT_SERVER) { - Client_SetOperByMe(Target, false); x[0] = 'o'; } else ok = IRC_WriteErrClient(Origin, ERR_NOPRIVILEGES_MSG, Client_ID(Origin)); break; - case 'q': /* KICK-protected user */ - if (!set || Client_Type(Client) == CLIENT_SERVER - || Client_OperByMe(Origin)) - x[0] = 'q'; - else - ok = IRC_WriteErrClient(Origin, - ERR_NOPRIVILEGES_MSG, - Client_ID(Origin)); - break; case 'r': /* Restricted (only settable) */ if (set || Client_Type(Client) == CLIENT_SERVER) x[0] = 'r'; @@ -274,7 +265,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) Client_ID(Origin)); else if (!set || Conf_CloakHostModeX[0] || Client_Type(Client) == CLIENT_SERVER - || Client_OperByMe(Client)) { + || Client_HasMode(Origin, 'o')) { x[0] = 'x'; send_RPL_HOSTHIDDEN_MSG = true; } else @@ -455,7 +446,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* Check if origin is oper and opers can use mode */ use_servermode = Conf_OperServerMode; - if(Client_OperByMe(Client) && Conf_OperCanMode) { + if(Client_HasMode(Client, 'o') && Conf_OperCanMode) { is_oper = true; } diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 4d17085..74f17cc 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -90,12 +90,10 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) Client_ID(Client)); } - if (!Client_OperByMe(Client)) - Log(LOG_NOTICE|LOG_snotice, - "Got valid OPER for \"%s\" from \"%s\", user is an IRC operator now.", - Req->argv[0], Client_Mask(Client)); + Log(LOG_NOTICE|LOG_snotice, + "Got valid OPER for \"%s\" from \"%s\", user is an IRC operator now.", + Req->argv[0], Client_Mask(Client)); - Client_SetOperByMe(Client, true); return IRC_WriteStrClient(Client, RPL_YOUREOPER_MSG, Client_ID(Client)); } /* IRC_OPER */ @@ -357,9 +355,8 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) switch (Client_Type(Client)) { case CLIENT_USER: - if (!Client_OperByMe(Client)) - return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG, - Client_ID(Client)); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); from = Client; break; case CLIENT_SERVER: diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 8c08cdc..34180aa 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -33,6 +33,7 @@ #include "match.h" #include "messages.h" #include "parse.h" +#include "op.h" #include "tool.h" #include "exp.h" @@ -134,9 +135,8 @@ IRC_KILL(CLIENT *Client, REQUEST *Req) assert (Client != NULL); assert (Req != NULL); - if (Client_Type(Client) != CLIENT_SERVER && !Client_OperByMe(Client)) - return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG, - Client_ID(Client)); + if (Client_Type(Client) != CLIENT_SERVER && !Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Get prefix (origin); use the client if no prefix is given. */ if (Req->prefix) diff --git a/src/ngircd/op.c b/src/ngircd/op.c index 2d36cd5..71e7cbc 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -86,7 +86,7 @@ Op_Check(CLIENT * Client, REQUEST * Req) return c; if (!Client_HasMode(c, 'o')) return NULL; - if (!Client_OperByMe(c) && !Conf_AllowRemoteOper) + if (Client_Conn(c) <= NONE && !Conf_AllowRemoteOper) return NULL; /* The client is an local IRC operator, or this server is configured

1 0

Federico G. Schwindt : Add support to show user links using "STATS L"
by alex＠arthur.barton.de 24 Sep '13

24 Sep '13

Module: ngircd.git Branch: master Commit: ec5ab4fcd1bc361cacb56e999b2b8f0a00caf5a9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ec5ab4fc… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Sep 18 23:51:44 2013 +0100 Add support to show user links using "STATS L" Change "stats L" to show servers and user links and restrict it to IRC Operators. --- doc/Commands.txt | 8 ++++++-- src/ngircd/irc-info.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index dde1498..e4f0090 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -451,17 +451,21 @@ Status and Informational Commands Show statistics and other information of type <query> of a particular IRC server in the network. . - The following <query> types are supported (case-insensitive): + The following <query> types are supported (case-insensitive where + applicable): . - g Network-wide bans ("G-Lines"). - k Server-local bans ("K-Lines"). - - l Link status (parent server and own link only). + - L Link status (servers and user links). + - l Link status (servers and own link). - m Command usage count. - u Server uptime. . <target> can be a server name, the nickname of a client connected to a specific server, or a mask matching a server name in the network. The server of the current connection is used when <target> is omitted. + . + To use "STATS L" the user must be an IRC Operator. References: - RFC 2812, 3.4.4 "Stats message" diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 1c250a4..79a157c 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -41,6 +41,7 @@ #include "irc-macros.h" #include "irc-write.h" #include "client-cap.h" +#include "op.h" #include "exp.h" #include "irc-info.h" @@ -865,6 +866,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) unsigned int days, hrs, mins; struct list_head *list; struct list_elem *list_item; + bool more_links = false; assert(Client != NULL); assert(Req != NULL); @@ -909,16 +911,20 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) list_item = Lists_GetNext(list_item); } break; + case 'L': /* Link status (servers and user links) */ + if (!Op_Check(from, Req)) + return Op_NoPrivileges(from, Req); + more_links = true; + case 'l': /* Link status (servers and own link) */ - case 'L': time_now = time(NULL); for (con = Conn_First(); con != NONE; con = Conn_Next(con)) { cl = Conn_GetClient(con); if (!cl) continue; - if ((Client_Type(cl) == CLIENT_SERVER) - || (cl == Client)) { - /* Server link or our own connection */ + if (Client_Type(cl) == CLIENT_SERVER || + cl == Client || + (more_links && Client_Type(cl) == CLIENT_USER)) { #ifdef ZLIB if (Conn_Options(con) & CONN_ZIP) { if (!IRC_WriteStrClient

1 0