September 2012 - ngIRCd GIT Updates

Brett Smith : Allow limited punctuation in usernames, for better PAM integration.
by alex＠arthur.barton.de 15 Sep '12

15 Sep '12

Module: ngircd.git Branch: master Commit: 85abfd84beee0a5fc6725624b0bd0260c7b2d856 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=85abfd84… Author: Brett Smith <brett(a)w3.org> Date: Fri Sep 14 11:56:38 2012 -0400 Allow limited punctuation in usernames, for better PAM integration. --- src/ngircd/irc-login.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 9e1abdd..74d8b9d 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -418,12 +418,15 @@ IRC_USER(CLIENT * Client, REQUEST * Req) Client_ID(Client), Req->command); - /* User name: only alphanumeric characters are allowed! */ + /* User name: only alphanumeric characters and limited + punctuation is allowed.*/ ptr = Req->argv[0]; while (*ptr) { if ((*ptr < '0' || *ptr > '9') && (*ptr < 'A' || *ptr > 'Z') && - (*ptr < 'a' || *ptr > 'z')) { + (*ptr < 'a' || *ptr > 'z') && + (*ptr != '+') && (*ptr != '-') && + (*ptr != '.') && (*ptr != '_')) { Conn_Close(Client_Conn(Client), NULL, "Invalid user name", true); return DISCONNECTED;

1 0

Alexander Barton : Merge pull request #2 from briancollins/master
by alex＠arthur.barton.de 11 Sep '12

11 Sep '12

Module: ngircd.git Branch: master Commit: a072180c9262f8a1c6bba6b8f0613bccc2863f48 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a072180c… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 11:29:14 2012 -0700 Merge pull request #2 from briancollins/master Fix IRC_Send_NAMES not sending correct prefix for certain clients. ---

1 0

Brian Collins : Fix NAMES response when client has multi-prefix
by alex＠arthur.barton.de 11 Sep '12

11 Sep '12

Module: ngircd.git Branch: master Commit: 16f94546f5d7c941a0d49b49e8cd523e7b67b19d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=16f94546… Author: Brian Collins <bricollins(a)gmail.com> Date: Mon Aug 27 16:14:47 2012 +0100 Fix NAMES response when client has multi-prefix Two fixes here: IRC_Send_NAMES was checking the capability of the wrong client when responding, and it didn't return any prefix for clients that had either +v or +o but not both. --- src/ngircd/irc-info.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 0ea8587..89d2dee 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1578,10 +1578,10 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan) if (is_member || is_visible) { if (str[strlen(str) - 1] != ':') strlcat(str, " ", sizeof(str)); - if (Client_Cap(cl) & CLIENT_CAP_MULTI_PREFIX) { - if (strchr(Channel_UserModes(Chan, cl), 'o') && - strchr(Channel_UserModes(Chan, cl), 'v')) - strlcat(str, "@+", sizeof(str)); + if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX && + strchr(Channel_UserModes(Chan, cl), 'o') && + strchr(Channel_UserModes(Chan, cl), 'v')) { + strlcat(str, "@+", sizeof(str)); } else { if (strchr(Channel_UserModes(Chan, cl), 'o')) strlcat(str, "@", sizeof(str));

1 0

Alexander Barton : Correctly re-initialize signal handlers on RESTART
by alex＠arthur.barton.de 11 Sep '12

11 Sep '12

Module: ngircd.git Branch: master Commit: 0fd9a8505a2dc325d0a17c7ebbed4b08a76576bf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0fd9a850… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 15:44:31 2012 +0200 Correctly re-initialize signal handlers on RESTART This fixes part 2 of bug #127 :-) --- src/ngircd/ngircd.c | 1 + src/ngircd/sighandlers.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 8a93bcb..e24cefa 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -330,6 +330,7 @@ main(int argc, const char *argv[]) Channel_Exit(); Class_Exit(); Log_Exit(); + Signals_Exit(); } Pidfile_Delete(); diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index efb41bc..a219105 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -334,6 +334,7 @@ Signals_Exit(void) #endif close(signalpipe[1]); close(signalpipe[0]); + signalpipe[0] = signalpipe[1] = 0; } /* -eof- */

1 0

Alexander Barton : New_Connection(): mark "IsSSL" parameter as UNUSED
by alex＠arthur.barton.de 11 Sep '12

11 Sep '12

Module: ngircd.git Branch: master Commit: f5441d217068cdb4a34c27b2fde9ca59558e7a5b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f5441d21… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 13:14:08 2012 +0200 New_Connection(): mark "IsSSL" parameter as UNUSED This fixes the following warning message when building without SSL support: conn.c: In function "New_Connection": conn.c:1365: warning: unused parameter "IsSSL" Introduced by commit 01b62202. --- src/ngircd/conn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 81a0f45..6091ebe 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1366,7 +1366,7 @@ Count_Connections(ng_ipaddr_t *a) * @returns Accepted socket descriptor or -1 on error. */ static int -New_Connection(int Sock, bool IsSSL) +New_Connection(int Sock, UNUSED bool IsSSL) { #ifdef TCPWRAP struct request_info req;

1 0

Alexander Barton : Show a warning on startup if config file is not a full path
by alex＠arthur.barton.de 11 Sep '12

11 Sep '12

Module: ngircd.git Branch: master Commit: f38a9035e5439cb395b2de6b9bdfa36102bfe80c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f38a9035… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 11:40:47 2012 +0200 Show a warning on startup if config file is not a full path ngIRCd is a long-running process and changes its working directory to "/" to not block mounted filesystems and the like when running as daemon ("not in the foreground"); therefore the path to the configuration file must be relative to "/" (or the chroot() directory), which basically is "not relative", to ensure that "kill -HUP" and the "REHASH" command work as expected later on. This fixes parts of bug #127. --- src/ngircd/conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 034281c..627e6d3 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1911,6 +1911,13 @@ Validate_Config(bool Configtest, bool Rehash) bool config_valid = true; char *ptr; + /* Emit a warning when the config file is not a full path name */ + if (NGIRCd_ConfFile[0] && NGIRCd_ConfFile[0] != '/') { + Config_Error(LOG_WARNING, + "Not specifying a full path name to \"%s\" can cause problems when rehashing the server!", + NGIRCd_ConfFile); + } + /* Validate configured server name, see RFC 2812 section 2.3.1 */ ptr = Conf_ServerName; do {

1 0

Alexander Barton : Create &SERVER channel after predefined channels
by alex＠arthur.barton.de 10 Sep '12

10 Sep '12

Module: ngircd.git Branch: master Commit: a12d6ff257813d47657d53f00699d21bfaf0e301 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a12d6ff2… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 10 17:59:15 2012 +0200 Create &SERVER channel after predefined channels This patch allows you to define &SERVER in a [Channel] block yourself and to overwrite the built-in topic and channel modes. Fixes bug #131. --- src/ngircd/channel.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 0f21a45..f0a9525 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -66,16 +66,8 @@ static void Set_KeyFile PARAMS((CHANNEL *Chan, const char *KeyFile)); GLOBAL void Channel_Init( void ) { - CHANNEL *sc; - My_Channels = NULL; My_Cl2Chan = NULL; - - sc = Channel_Create("&SERVER"); - if (sc) { - Channel_SetModes(sc, "mnPt"); - Channel_SetTopic(sc, Client_ThisServer(), "Server Messages"); - } } /* Channel_Init */ @@ -103,11 +95,12 @@ Channel_GetListInvites(CHANNEL *c) } +/** + * Generate predefined persistent channels and &SERVER + */ GLOBAL void Channel_InitPredefined( void ) { - /* Generate predefined persistent channels */ - CHANNEL *new_chan; const struct Conf_Channel *conf_chan; const char *c; @@ -160,6 +153,18 @@ Channel_InitPredefined( void ) } if (channel_count) array_free(&Conf_Channels); + + /* Make sure the local &SERVER channel exists */ + if (!Channel_Search("&SERVER")) { + new_chan = Channel_Create("&SERVER"); + if (new_chan) { + Channel_SetModes(new_chan, "mnPt"); + Channel_SetTopic(new_chan, Client_ThisServer(), + "Server Messages"); + } else + Log(LOG_ERR, "Failed to create \"&SERVER\" channel!"); + } else + LogDebug("Required channel \"&SERVER\" already exists, ok."); } /* Channel_InitPredefined */

1 0

Alexander Barton : WHO #channel: don't limit list size
by alex＠arthur.barton.de 10 Sep '12

10 Sep '12

Module: ngircd.git Branch: master Commit: 2205227c3b3cbc8788bcf97a037c9e3016f71c9c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2205227c… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 10 12:43:44 2012 +0200 WHO #channel: don't limit list size It makes no sense to limit the list size when doing WHO for a channel and not to return all the users in that channel, so I removed the check. But if there are more than MAX_RPL_WHO(25) replies, the client requesting the list will be "penalized" one second more (then 2 in total). This fixes bug #125. --- src/ngircd/irc-info.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 6ec184a..6eb8d94 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -848,6 +848,8 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) assert( Client != NULL ); assert( Chan != NULL ); + IRC_SetPenalty(Client, 1); + is_member = Channel_IsMemberOf(Chan, Client); /* Secret channel? */ @@ -866,9 +868,6 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) is_visible = strchr(client_modes, 'i') == NULL; if (is_member || is_visible) { - if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO")) - break; - strcpy(flags, who_flags_status(client_modes)); if (is_ircop) strlcat(flags, "*", sizeof(flags)); @@ -883,6 +882,11 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) count++; } } + + /* If there are a lot of clients, augment penalty a bit */ + if (count > MAX_RPL_WHO) + IRC_SetPenalty(Client, 1); + return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), Channel_Name(Chan)); } @@ -911,6 +915,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) if (Mask) ngt_LowerStr(Mask); + IRC_SetPenalty(Client, 3); for (c = Client_First(); c != NULL; c = Client_Next(c)) { if (Client_Type(c) != CLIENT_USER) continue; @@ -1014,13 +1019,11 @@ IRC_WHO(CLIENT *Client, REQUEST *Req) chan = Channel_Search(Req->argv[0]); if (chan) { /* Members of a channel have been requested */ - IRC_SetPenalty(Client, 1); return IRC_WHO_Channel(Client, chan, only_ops); } if (strcmp(Req->argv[0], "0") != 0) { /* A mask has been given. But please note this RFC * stupidity: "0" is same as no arguments ... */ - IRC_SetPenalty(Client, 3); return IRC_WHO_Mask(Client, Req->argv[0], only_ops); } }

1 0

Alexander Barton : Define EV_SET() for kqueue() on systems that don' t have it
by alex＠arthur.barton.de 04 Sep '12

04 Sep '12

Module: ngircd.git Branch: master Commit: d2d867ea36b57c594546c5486aa8c2d4ef199af0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d2d867ea… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 4 23:28:32 2012 +0200 Define EV_SET() for kqueue() on systems that don't have it Some systems, notably FreeBSD 4.x, do have the kqueue() function but lack the definition of EV_SET() in their header files -- but don't worry, we can #define it on our own ;-) Definition taken from /usr/include/sys/event.h of FreeBSD 8.1. Patch tested on FreeBSD 4.1 by Götz Hoffart. Thanks! --- src/ngircd/io.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index 9ffdfd6..cce6ef5 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -86,6 +86,20 @@ static int io_masterfd; static int io_dispatch_kqueue(struct timeval *tv); static bool io_event_change_kqueue(int, short, const int action); + +#ifndef EV_SET +/* Taken from /usr/include/sys/event.h of FreeBSD 8.1 and required by all + * platforms that have kqueue but lack EV_SET() -- for example FreeBSD 4. */ +#define EV_SET(kevp, a, b, c, d, e, f) do { \ + struct kevent *__kevp__ = (kevp); \ + __kevp__->ident = (a); \ + __kevp__->filter = (b); \ + __kevp__->flags = (c); \ + __kevp__->fflags = (d); \ + __kevp__->data = (e); \ + __kevp__->udata = (f); \ +} while(0) +#endif #endif #ifdef IO_USE_POLL

1 0

Alexander Barton : Fix contrib/Makefile.am to list all files in EXTRA_DIST
by alex＠arthur.barton.de 04 Sep '12

04 Sep '12

Module: ngircd.git Branch: master Commit: b232ae2f1727cfa8ae9106f0d65fc4cebe3a9d40 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b232ae2f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 4 22:48:47 2012 +0200 Fix contrib/Makefile.am to list all files in EXTRA_DIST --- contrib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 73611fd..99ab684 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -16,7 +16,7 @@ EXTRA_DIST = README \ ngircd-bsd.sh \ ngIRCd-Logo.gif \ ngircd-redhat.init \ - ngircd.service + ngircd.service \ ngircd.spec \ platformtest.sh \ systrace.policy

1 0