- ngIRCd GIT Updates - lists.barton.de

Federico G. Schwindt : Minor cosmetic change
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: 9f74c0ff075dc67e068b8c2da0c069b6c622e436 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9f74c0ff… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Sep 5 10:40:39 2013 +0100 Minor cosmetic change Add a define to indicate any client. While I'm here use hex values instead of decimal, it's somewhat clearer that they could be OR'ed together. --- src/ngircd/client.h | 23 ++++++++++++----------- src/ngircd/parse.c | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/ngircd/client.h b/src/ngircd/client.h index c104a75..e5c48b7 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -17,19 +17,20 @@ * Client management (header) */ -#define CLIENT_UNKNOWN 1 /* connection of unknown type */ -#define CLIENT_GOTPASS 2 /* client did send PASS */ -#define CLIENT_GOTNICK 4 /* client did send NICK */ -#define CLIENT_GOTUSER 8 /* client did send USER */ -#define CLIENT_USER 16 /* client is an IRC user */ -#define CLIENT_SERVER 32 /* client is a server */ -#define CLIENT_SERVICE 64 /* client is a service */ -#define CLIENT_UNKNOWNSERVER 128 /* unregistered server connection */ -#define CLIENT_GOTPASS_2813 256 /* client did send PASS, RFC 2813 style */ +#define CLIENT_UNKNOWN 0x0001 /* connection of unknown type */ +#define CLIENT_GOTPASS 0x0002 /* client did send PASS */ +#define CLIENT_GOTNICK 0x0004 /* client did send NICK */ +#define CLIENT_GOTUSER 0x0008 /* client did send USER */ +#define CLIENT_USER 0x0010 /* client is an IRC user */ +#define CLIENT_SERVER 0x0020 /* client is a server */ +#define CLIENT_SERVICE 0x0040 /* client is a service */ +#define CLIENT_UNKNOWNSERVER 0x0080 /* unregistered server connection */ +#define CLIENT_GOTPASS_2813 0x0100 /* client did send PASS, RFC 2813 style */ #ifndef STRICT_RFC -# define CLIENT_WAITAUTHPING 512 /* waiting for AUTH PONG from client */ +# define CLIENT_WAITAUTHPING 0x0200 /* waiting for AUTH PONG from client */ #endif -#define CLIENT_WAITCAPEND 1024 /* waiting for "CAP END" command */ +#define CLIENT_WAITCAPEND 0x0400 /* waiting for "CAP END" command */ +#define CLIENT_ANY 0xFFFF #define CLIENT_TYPE int diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index e5eaa6e..68aa945 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -62,11 +62,11 @@ static COMMAND My_Commands[] = { { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 }, - { "CAP", IRC_CAP, 0xFFFF, 0, 0, 0 }, + { "CAP", IRC_CAP, CLIENT_ANY, 0, 0, 0 }, { "CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 }, { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 }, - { "ERROR", IRC_ERROR, 0xFFFF, 0, 0, 0 }, + { "ERROR", IRC_ERROR, CLIENT_ANY, 0, 0, 0 }, { "GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "HELP", IRC_HELP, CLIENT_USER, 0, 0, 0 }, { "INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, @@ -83,20 +83,20 @@ static COMMAND My_Commands[] = { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "NICK", IRC_NICK, 0xFFFF, 0, 0, 0 }, + { "NICK", IRC_NICK, CLIENT_ANY, 0, 0, 0 }, { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 0, 0, 0 }, - { "NOTICE", IRC_NOTICE, 0xFFFF, 0, 0, 0 }, + { "NOTICE", IRC_NOTICE, CLIENT_ANY, 0, 0, 0 }, { "OPER", IRC_OPER, CLIENT_USER, 0, 0, 0 }, { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "PASS", IRC_PASS, 0xFFFF, 0, 0, 0 }, + { "PASS", IRC_PASS, CLIENT_ANY, 0, 0, 0 }, { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "PONG", IRC_PONG, 0xFFFF, 0, 0, 0 }, + { "PONG", IRC_PONG, CLIENT_ANY, 0, 0, 0 }, { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 }, + { "QUIT", IRC_QUIT, CLIENT_ANY, 0, 0, 0 }, { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 }, { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 }, - { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 }, - { "SERVICE", IRC_SERVICE, 0xFFFF, 0, 0, 0 }, + { "SERVER", IRC_SERVER, CLIENT_ANY, 0, 0, 0 }, + { "SERVICE", IRC_SERVICE, CLIENT_ANY, 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_USER|CLIENT_SERVER, 0, 0, 0 }, @@ -106,7 +106,7 @@ static COMMAND My_Commands[] = { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "USER", IRC_USER, 0xFFFF, 0, 0, 0 }, + { "USER", IRC_USER, CLIENT_ANY, 0, 0, 0 }, { "USERHOST", IRC_USERHOST, CLIENT_USER, 0, 0, 0 }, { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : Commands.txt: Document proprietary DIE <message> parameter
by alex＠arthur.barton.de 05 Sep '13

05 Sep '13

Module: ngircd.git Branch: master Commit: e5cdd61fe3d78fa976836192dbca64874160a493 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e5cdd61f… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 5 00:18:49 2013 +0200 Commands.txt: Document proprietary DIE <message> parameter --- doc/Commands.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index e049f5e..dde1498 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -668,10 +668,13 @@ Administrative Commands - RFC 2812, 3.4.7 "Connect message" - DIE - DIE + DIE [<message>] . Instructs the server to shut down. . + The optional (and non-standard) <message> text is sent to each client + connected to this server before all connections are closed. + . To use this command, the user must be an IRC Operator. References:

1 0

Alexander Barton : getpid.sh: use /bin/pidof when available
by alex＠arthur.barton.de 03 Sep '13

03 Sep '13

Module: ngircd.git Branch: master Commit: e3a2a6c44d30a68f3afeab17ba19a5559e09f3a5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e3a2a6c4… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 3 21:33:22 2013 +0200 getpid.sh: use /bin/pidof when available --- src/testsuite/getpid.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh index 96ab474..f200afb 100755 --- a/src/testsuite/getpid.sh +++ b/src/testsuite/getpid.sh @@ -1,10 +1,11 @@ #!/bin/sh # ngIRCd Test Suite -# $Id: getpid.sh,v 1.5 2006/08/05 00:15:28 alex Exp $ # did we get a name? [ $# -ne 1 ] && exit 1 +[ -x /bin/pidof ] && exec /bin/pidof -s $@ + # detect flags for "ps" and "head" UNAME=`uname` if [ $UNAME = "FreeBSD" ]; then

1 0

Alexander Barton : Don't enforce channel types for other servers
by alex＠arthur.barton.de 03 Sep '13

03 Sep '13

Module: ngircd.git Branch: master Commit: aad92ceafe8b4b0091867415504f83930a74428b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=aad92cea… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 3 17:13:46 2013 +0200 Don't enforce channel types for other servers The configuration option "AllowedChannelTypes" must only be enforced for regular clients and not for remote servers. Channels created by other servres are always allowed, because they already exist and the daemon must stay in sync with the network. --- src/ngircd/irc-channel.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 78332ea..4bd5a9d 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -341,12 +341,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } chan = Channel_Search(channame); - if (!chan && !strchr(Conf_AllowedChannelTypes, channame[0])) { - /* channel must be created, but forbidden by config */ - IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG, - Client_ID(Client), channame); - goto join_next; - } /* Local client? */ if (Client_Type(Client) == CLIENT_USER) { @@ -354,6 +348,15 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Already existing channel: already member? */ if (Channel_IsMemberOf(chan, Client)) goto join_next; + } else { + /* Channel must be created */ + if (!strchr(Conf_AllowedChannelTypes, channame[0])) { + /* ... but channel type is not allowed! */ + IRC_WriteErrClient(Client, + ERR_NOSUCHCHANNEL_MSG, + Client_ID(Client), channame); + goto join_next; + } } /* Test if the user has reached the channel limit */

1 0

Alexander Barton : Only log "IDENT ... no result" when IDENT was looked up
by alex＠arthur.barton.de 02 Sep '13

02 Sep '13

Module: ngircd.git Branch: master Commit: 4102e8fdfea33a5d8c398c98db90914c5dc29610 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4102e8fd… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 2 16:37:50 2013 +0200 Only log "IDENT ... no result" when IDENT was looked up Without this patch, ngIRCd logged the "IDENT lookup for connection X: no result"-message even when IDENT lookups have been disabled using the "Ident = no" configuration option, which is a little bit misleading. Reported by "btwe" in #ngircd. --- src/ngircd/conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 8d72c1c..3b09278 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2454,9 +2454,9 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) *ptr ? "" : ": ", *ptr ? "" : identptr); } - } else { + } else if(Conf_Ident) { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); - if (Conf_NoticeAuth && Conf_Ident) + if (Conf_NoticeAuth) (void)Conn_WriteStr(i, "NOTICE AUTH :*** No ident response"); }

1 0

Florian Westphal : ngircd: use setgid/setuid errno value in error path
by fw＠arthur.barton.de 31 Aug '13

31 Aug '13

Module: ngircd.git Branch: master Commit: f8f8a9a04146fb7a4e1570ce0474ea86806879ed URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f8f8a9a0… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Aug 31 22:42:56 2013 +0200 ngircd: use setgid/setuid errno value in error path Need to use saved errno value as strerror argument, else you get bogus output ('success') in the log message. --- src/ngircd/ngircd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index e26ac3b..f0cb150 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -720,7 +720,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) grp = getgrgid(Conf_GID); Log(LOG_ERR, "Can't change group ID to %s(%u): %s!", grp ? grp->gr_name : "?", Conf_GID, - strerror(errno)); + strerror(real_errno)); if (real_errno != EPERM) goto out; } @@ -741,7 +741,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) pwd = getpwuid(Conf_UID); Log(LOG_ERR, "Can't change user ID to %s(%u): %s!", pwd ? pwd->pw_name : "?", Conf_UID, - strerror(errno)); + strerror(real_errno)); if (real_errno != EPERM) goto out; }

1 0

Alexander Barton : Show connection flag "s" (SSL) in RPL_TRACE{LINK|SERVER}
by alex＠arthur.barton.de 31 Aug '13

31 Aug '13

Module: ngircd.git Branch: master Commit: 04b947cdc3ad1f3370aae2ba2e7308587bea0dda URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=04b947cd… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 31 14:15:09 2013 +0200 Show connection flag "s" (SSL) in RPL_TRACE{LINK|SERVER} Now you can check if a server-to-server link is SSL-encrypted or not using the IRC "TRACE" command. Idea by Götz Hoffart, thanks! --- src/ngircd/irc.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index d1e1d41..968bcea 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -450,6 +450,12 @@ Help(CLIENT *Client, const char *Topic) return CONNECTED; } +/** + * Get pointer to a static string representing the connection "options". + * + * @param Idx Connection index. + * @return Pointer to static (global) string buffer. + */ static char * #ifdef ZLIB Option_String(CONN_ID Idx) @@ -460,16 +466,22 @@ Option_String(UNUSED CONN_ID Idx) static char option_txt[8]; #ifdef ZLIB UINT16 options; - - options = Conn_Options(Idx); #endif + assert(Idx != NONE); + + options = Conn_Options(Idx); strcpy(option_txt, "F"); /* No idea what this means, but the * original ircd sends it ... */ +#ifdef SSL_SUPPORT + if(options & CONN_SSL) /* SSL encrypted link */ + strlcat(option_txt, "s", sizeof(option_txt)); +#endif #ifdef ZLIB - if(options & CONN_ZIP) /* zlib compression supported. */ - strcat(option_txt, "z"); + if(options & CONN_ZIP) /* zlib compression enabled */ + strlcat(option_txt, "z", sizeof(option_txt)); #endif + LogDebug(" *** %d: %d = %s", Idx, options, option_txt); return option_txt; } /* Option_String */

1 0

Federico G. Schwindt : Change away to be allocated dynamically
by alex＠arthur.barton.de 27 Aug '13

27 Aug '13

Module: ngircd.git Branch: master Commit: be2e611680834cf469c31ff0a230f1bf6d55c554 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be2e6116… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Mon Aug 26 22:52:23 2013 +0100 Change away to be allocated dynamically --- src/ngircd/client.c | 10 ++++++++-- src/ngircd/client.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 2835b46..37b97d6 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -221,7 +221,7 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, Generate_MyToken(client); if (Client_HasMode(client, 'a')) - strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away)); + client->away = strndup(DEFAULT_AWAY_MSG, CLIENT_AWAY_LEN - 1); client->next = (POINTER *)My_Clients; My_Clients = client; @@ -500,7 +500,11 @@ Client_SetAway( CLIENT *Client, const char *Txt ) assert( Client != NULL ); assert( Txt != NULL ); - strlcpy( Client->away, Txt, sizeof( Client->away )); + if (Client->away) + free(Client->away); + + Client->away = strndup(Txt, CLIENT_AWAY_LEN - 1); + LogDebug("%s \"%s\" is away: %s", Client_TypeText(Client), Client_Mask(Client), Txt); } /* Client_SetAway */ @@ -1441,6 +1445,8 @@ Free_Client(CLIENT **Client) if ((*Client)->account_name) free((*Client)->account_name); + if ((*Client)->away) + free((*Client)->away); if ((*Client)->cloaked) free((*Client)->cloaked); if ((*Client)->ipa_text) diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 71d413b..c104a75 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -58,7 +58,7 @@ typedef struct _CLIENT 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[CLIENT_AWAY_LEN]; /* AWAY text (valid if mode 'a' is set) */ + 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) */ int capabilities; /* enabled IRC capabilities */

1 0

Alexander Barton : Ignore "operation not permitted" while dropping groups
by alex＠arthur.barton.de 27 Aug '13

27 Aug '13

Module: ngircd.git Branch: master Commit: 41f75b69740bd205864bd34afbb65ab0a3776136 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=41f75b69… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 27 00:39:59 2013 +0200 Ignore "operation not permitted" while dropping groups Without this exception, you can't start ngIRCd as user any more, it is analog to setting the user and group ID. --- src/ngircd/ngircd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 4099719..e26ac3b 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -725,9 +725,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) goto out; } if (setgroups(0, NULL) != 0) { - Log(LOG_ERR, "Can't drop supplementary group ids: %s!", + real_errno = errno; + Log(LOG_ERR, "Can't drop supplementary group IDs: %s!", strerror(errno)); - goto out; + if (real_errno != EPERM) + goto out; } } #endif

1 0

Florian Westphal : ngircd: discard supplementary group ids on startup
by fw＠arthur.barton.de 27 Aug '13

27 Aug '13

Module: ngircd.git Branch: master Commit: e009ccbe66f67a4c5344d6a1f415c50b699765ad URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e009ccbe… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Aug 27 00:19:31 2013 +0200 ngircd: discard supplementary group ids on startup The intention was to switch to JUST uid:gid, but setgid is not sufficient. Reported-by: Michael Scherer <misc(a)zarb.org> --- src/ngircd/ngircd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index e075e0a..4099719 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -724,6 +724,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) if (real_errno != EPERM) goto out; } + if (setgroups(0, NULL) != 0) { + Log(LOG_ERR, "Can't drop supplementary group ids: %s!", + strerror(errno)); + goto out; + } } #endif

1 0