January 2009 - ngIRCd GIT Updates

Alexander Barton : Fix spelling of log message: "channek" vs. "channel" ...
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: 3be9c477be674228c86378e017a70bf49acf06a4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3be9c477… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 9 20:18:23 2009 +0100 Fix spelling of log message: "channek" vs. "channel" ... --- src/ngircd/channel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 8408ccb..0a1ba45 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1080,7 +1080,7 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) return false; fd = fopen(file_name, "r"); if (!fd) { - Log(LOG_ERR, "Can't open channek key file \"%s\" for %s: %s", + Log(LOG_ERR, "Can't open channel key file \"%s\" for %s: %s", file_name, Chan->name, strerror(errno)); return false; }

1 0

Alexander Barton : Channel key file: store file name and open on each access.
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: d09094812f5a8998e779fd75d265396486878117 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d0909481… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 4 17:26:50 2009 +0100 Channel key file: store file name and open on each access. Store the file name of channel key files and reopen them on each access (on each JOIN command) insted of just storing the file handles. This eliminates the special requirements (no delete) and makes sure that always the actual file contents are used in all circumstances. --- src/ngircd/channel.c | 75 ++++++++++++++++++++++++++----------------------- src/ngircd/channel.h | 2 +- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 6d23b24..8408ccb 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -61,9 +61,7 @@ static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan )); static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan )); static void Delete_Channel PARAMS(( CHANNEL *Chan )); static void Free_Channel PARAMS(( CHANNEL *Chan )); -static void Update_Predefined PARAMS((CHANNEL *Chan, - const struct Conf_Channel *Conf_Chan)); -static void Set_Key_File PARAMS((CHANNEL *Chan, FILE *KeyFile)); +static void Set_KeyFile PARAMS((CHANNEL *Chan, const char *KeyFile)); GLOBAL void @@ -124,7 +122,7 @@ Channel_InitPredefined( void ) Log(LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", conf_chan->name); - Update_Predefined(new_chan, conf_chan); + Set_KeyFile(new_chan, conf_chan->keyfile); continue; } @@ -148,7 +146,7 @@ Channel_InitPredefined( void ) Channel_SetKey(new_chan, conf_chan->key); Channel_SetMaxUsers(new_chan, conf_chan->maxusers); - Update_Predefined(new_chan, conf_chan); + Set_KeyFile(new_chan, conf_chan->keyfile); } if (channel_count) array_free(&Conf_Channels); @@ -159,10 +157,9 @@ static void Free_Channel(CHANNEL *chan) { array_free(&chan->topic); + array_free(&chan->keyfile); Lists_Free(&chan->list_bans); Lists_Free(&chan->list_invites); - if (Chan->keyfile) - fclose(Chan->keyfile); free(chan); } @@ -1064,7 +1061,8 @@ Channel_LogServer(char *msg) GLOBAL bool Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) { - char line[COMMAND_LEN], *nick, *pass; + char *file_name, line[COMMAND_LEN], *nick, *pass; + FILE *fd; assert(Chan != NULL); assert(Client != NULL); @@ -1074,11 +1072,20 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) return true; if (strcmp(Chan->key, Key) == 0) return true; - if (!Chan->keyfile) + if (*Key == '\0') + return false; + + file_name = array_start(&Chan->keyfile); + if (!file_name) return false; + fd = fopen(file_name, "r"); + if (!fd) { + Log(LOG_ERR, "Can't open channek key file \"%s\" for %s: %s", + file_name, Chan->name, strerror(errno)); + return false; + } - Chan->keyfile = freopen(NULL, "r", Chan->keyfile); - while (fgets(line, sizeof(line), Chan->keyfile) != NULL) { + while (fgets(line, sizeof(line), fd) != NULL) { ngt_TrimStr(line); if (! (nick = strchr(line, ':'))) continue; @@ -1093,8 +1100,10 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) if (strcmp(Key, pass) != 0) continue; + fclose(fd); return true; } + fclose(fd); return false; } /* Channel_CheckKey */ @@ -1157,35 +1166,31 @@ Delete_Channel(CHANNEL *Chan) static void -Update_Predefined(CHANNEL *Chan, const struct Conf_Channel *Conf_Chan) +Set_KeyFile(CHANNEL *Chan, const char *KeyFile) { - FILE *fd; - - if (! Conf_Chan->keyfile || ! *Conf_Chan->keyfile) - return; + size_t len; - fd = fopen(Conf_Chan->keyfile, "r"); - if (! fd) - Log(LOG_ERR, - "Can't open channel key file for \"%s\", \"%s\": %s", - Conf_Chan->name, Conf_Chan->keyfile, - strerror(errno)); - else - Set_Key_File(Chan, fd); -} /* Update_Predefined */ + assert(Chan != NULL); + assert(KeyFile != NULL); + len = strlen(KeyFile); + if (len < array_bytes(&Chan->keyfile)) { + Log(LOG_INFO, "Channel key file of %s removed.", Chan->name); + array_free(&Chan->keyfile); + } -static void -Set_Key_File(CHANNEL *Chan, FILE *KeyFile) -{ - assert(Chan != NULL); + if (len < 1) + return; - if (Chan->keyfile) - fclose(Chan->keyfile); - Chan->keyfile = KeyFile; - Log(LOG_INFO|LOG_snotice, - "New local channel key file for \"%s\" activated.", Chan->name); -} /* Set_Key_File */ + if (!array_copyb(&Chan->keyfile, KeyFile, len+1)) + Log(LOG_WARNING, + "Could not set new channel key file \"%s\" for %s: %s", + KeyFile, Chan->name, strerror(errno)); + else + Log(LOG_INFO|LOG_snotice, + "New local channel key file \"%s\" for %s activated.", + KeyFile, Chan->name); +} /* Set_KeyFile */ /* -eof- */ diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index 3aa1853..411c345 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -37,7 +37,7 @@ typedef struct _CHANNEL unsigned long maxusers; /* Maximum number of members (mode "l") */ struct list_head list_bans; /* list head of banned users */ struct list_head list_invites; /* list head of invited users */ - FILE *keyfile; /* handle of the channel key file */ + array keyfile; /* Name of the channel key file */ } CHANNEL; typedef struct _CLIENT2CHAN

1 0

Alexander Barton : Support individual channel keys for pre-defined channels .
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: c5000694d16da0a205e7dde49681d589d552d144 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c5000694… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jan 1 22:26:13 2009 +0100 Support individual channel keys for pre-defined channels. This patch introduces the new configuration variable "KeyFile" for [Channel] sections in ngircd.conf. Here a file can be configured for each pre-defined channel which contains individual channel keys for different users. This file is line-based and must have the following syntax: <user>:<nick>:<key> <user> and <nick> can contain the wildcard character "*". Please not that these channel keys are only in effect, when the channel has a regular key set using channel mode "k"! --- doc/sample-ngircd.conf | 4 ++ man/ngircd.conf.5.tmpl | 45 +++++++++++++++++++++++- src/ngircd/channel.c | 88 +++++++++++++++++++++++++++++++++++++++++++-- src/ngircd/channel.h | 4 ++ src/ngircd/conf.c | 10 +++++- src/ngircd/conf.h | 1 + src/ngircd/irc-channel.c | 7 ++-- 7 files changed, 149 insertions(+), 10 deletions(-) diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf index 526e880..0d0061b 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf @@ -245,6 +245,10 @@ # initial channel password (mode k) ;Key = Secret + # Key file, syntax for each line: "<user>:<nick>:<key>". + # Default: none. + ;KeyFile = /etc/ngircd/#chan.key + # maximum users per channel (mode l) ;MaxUsers = 23 diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index b8aa7bd..df15b77 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -319,7 +319,50 @@ Topic for this channel. Initial channel modes. .TP \fBKey\fR -Sets initial channel key (only relevant if mode k is set). +Sets initial channel key (only relevant if channel mode "k" is set). +.TP +\fBKeyFile\fR +Path and file name of a "key file" containing individual channel keys for +different users. The file consists of plain text lines with the following +syntax (without spaces!): +.PP +.RS +.RS +.I user +: +.I nick +: +.I key +.RE +.PP +.I user +and +.I nick +can contain the wildcard character "*". +.br +.I key +is an arbitrary password. +.PP +Valid examples are: +.PP +.RS +*:*:KeY +.br +*:nick:123 +.br +~user:*:xyz +.RE +.PP +The key file is read on each JOIN command when this channel has a key +(channel mode +k). Access is granted, if a) the channel key set using the +MODE +k command or b) one of the lines in the key file match. +.PP +.B Please note: +.br +The file is not reopened on each access, so you can modify and overwrite it +without problems, but moving or deleting the file will have not effect until +the daemon re-reads its configuration! +.RE .TP \fBMaxUsers\fR Set maximum user limit for this channel (only relevant if channel mode "l" diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 46e42ac..6d23b24 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <stdio.h> #include <strings.h> #include "defines.h" @@ -39,6 +40,7 @@ #include "lists.h" #include "log.h" #include "messages.h" +#include "match.h" #include "exp.h" @@ -59,6 +61,9 @@ static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan )); static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan )); static void Delete_Channel PARAMS(( CHANNEL *Chan )); static void Free_Channel PARAMS(( CHANNEL *Chan )); +static void Update_Predefined PARAMS((CHANNEL *Chan, + const struct Conf_Channel *Conf_Chan)); +static void Set_Key_File PARAMS((CHANNEL *Chan, FILE *KeyFile)); GLOBAL void @@ -116,8 +121,10 @@ Channel_InitPredefined( void ) new_chan = Channel_Search(conf_chan->name); if (new_chan) { - Log(LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", - conf_chan->name); + Log(LOG_INFO, + "Can't create pre-defined channel \"%s\": name already in use.", + conf_chan->name); + Update_Predefined(new_chan, conf_chan); continue; } @@ -127,6 +134,8 @@ Channel_InitPredefined( void ) conf_chan->name); continue; } + Log(LOG_INFO, "Created pre-defined channel \"%s\"", + conf_chan->name); Channel_ModeAdd(new_chan, 'P'); @@ -139,8 +148,7 @@ Channel_InitPredefined( void ) Channel_SetKey(new_chan, conf_chan->key); Channel_SetMaxUsers(new_chan, conf_chan->maxusers); - Log(LOG_INFO, "Created pre-defined channel \"%s\"", - conf_chan->name); + Update_Predefined(new_chan, conf_chan); } if (channel_count) array_free(&Conf_Channels); @@ -153,6 +161,8 @@ Free_Channel(CHANNEL *chan) array_free(&chan->topic); Lists_Free(&chan->list_bans); Lists_Free(&chan->list_invites); + if (Chan->keyfile) + fclose(Chan->keyfile); free(chan); } @@ -1051,6 +1061,44 @@ Channel_LogServer(char *msg) } /* Channel_LogServer */ +GLOBAL bool +Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) +{ + char line[COMMAND_LEN], *nick, *pass; + + assert(Chan != NULL); + assert(Client != NULL); + assert(Key != NULL); + + if (!strchr(Chan->modes, 'k')) + return true; + if (strcmp(Chan->key, Key) == 0) + return true; + if (!Chan->keyfile) + return false; + + Chan->keyfile = freopen(NULL, "r", Chan->keyfile); + while (fgets(line, sizeof(line), Chan->keyfile) != NULL) { + ngt_TrimStr(line); + if (! (nick = strchr(line, ':'))) + continue; + *nick++ = '\0'; + if (!Match(line, Client_User(Client))) + continue; + if (! (pass = strchr(nick, ':'))) + continue; + *pass++ = '\0'; + if (!Match(nick, Client_ID(Client))) + continue; + if (strcmp(Key, pass) != 0) + continue; + + return true; + } + return false; +} /* Channel_CheckKey */ + + static CL2CHAN * Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan ) { @@ -1108,4 +1156,36 @@ Delete_Channel(CHANNEL *Chan) } /* Delete_Channel */ +static void +Update_Predefined(CHANNEL *Chan, const struct Conf_Channel *Conf_Chan) +{ + FILE *fd; + + if (! Conf_Chan->keyfile || ! *Conf_Chan->keyfile) + return; + + fd = fopen(Conf_Chan->keyfile, "r"); + if (! fd) + Log(LOG_ERR, + "Can't open channel key file for \"%s\", \"%s\": %s", + Conf_Chan->name, Conf_Chan->keyfile, + strerror(errno)); + else + Set_Key_File(Chan, fd); +} /* Update_Predefined */ + + +static void +Set_Key_File(CHANNEL *Chan, FILE *KeyFile) +{ + assert(Chan != NULL); + + if (Chan->keyfile) + fclose(Chan->keyfile); + Chan->keyfile = KeyFile; + Log(LOG_INFO|LOG_snotice, + "New local channel key file for \"%s\" activated.", Chan->name); +} /* Set_Key_File */ + + /* -eof- */ diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index 56b1240..3aa1853 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -37,6 +37,7 @@ typedef struct _CHANNEL unsigned long maxusers; /* Maximum number of members (mode "l") */ struct list_head list_bans; /* list head of banned users */ struct list_head list_invites; /* list head of invited users */ + FILE *keyfile; /* handle of the channel key file */ } CHANNEL; typedef struct _CLIENT2CHAN @@ -127,6 +128,9 @@ GLOBAL bool Channel_ShowInvites PARAMS((CLIENT *client, CHANNEL *c)); GLOBAL void Channel_LogServer PARAMS((char *msg)); +GLOBAL bool Channel_CheckKey PARAMS((CHANNEL *Chan, CLIENT *Client, + const char *Key)); + #define Channel_IsLocal(c) (Channel_Name(c)[0] == '&') diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fc12cd9..4a8b628 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -313,7 +313,8 @@ Conf_Test( void ) printf(" Modes = %s\n", predef_chan->modes); printf(" Key = %s\n", predef_chan->key); printf(" MaxUsers = %lu\n", predef_chan->maxusers); - printf(" Topic = %s\n\n", predef_chan->topic); + printf(" Topic = %s\n", predef_chan->topic); + printf(" KeyFile = %s\n\n", predef_chan->keyfile); } return (config_valid ? 0 : 1); @@ -1232,6 +1233,13 @@ Handle_CHANNEL(int Line, char *Var, char *Arg) Config_Error_NaN(Line, Var); return; } + if (strcasecmp(Var, "KeyFile") == 0) { + /* channel keys */ + len = strlcpy(chan->keyfile, Arg, sizeof(chan->keyfile)); + if (len >= sizeof(chan->keyfile)) + Config_Error_TooLong(Line, Var); + return; + } Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index cd9cb95..4695b25 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -72,6 +72,7 @@ struct Conf_Channel { char modes[CHANNEL_MODE_LEN]; /* Initial channel modes */ char key[CLIENT_PASS_LEN]; /* Channel key ("password", mode "k" ) */ char topic[COMMAND_LEN]; /* Initial topic */ + char keyfile[512]; /* Path and name of channel key file */ unsigned long maxusers; /* maximum usercount for this channel, mode "l" */ }; diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 27414d3..6c478c8 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -89,10 +89,9 @@ join_allowed(CLIENT *Client, CLIENT *target, CHANNEL *chan, } /* Is the channel protected by a key? */ - if (strchr(channel_modes, 'k') && - strcmp(Channel_Key(chan), key ? key : "")) - { - IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG, Client_ID(Client), channame); + if (!Channel_CheckKey(chan, target, key ? key : "")) { + IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG, + Client_ID(Client), channame); return false; } /* Are there already too many members? */

1 0

Alexander Barton : RFC 2812, sec. 3.3.1: really check for the last dot
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: 2c1b6280fac393c8977df03d94cc6a1dcf2a5f5d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2c1b6280… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 20 16:49:34 2009 +0100 RFC 2812, sec. 3.3.1: really check for the last dot This fixes commit 5a3128243f4b60 and makes the test suite ("make check") run again without errors. --- src/ngircd/irc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index a0dc0ea..2466b6b 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -516,7 +516,7 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask, * RFC 2812, sec. 3.3.1 requires that targetMask have at least one * dot (".") and no wildcards ("*", "?") following the last one. */ - check_wildcards = strchr(targetMask, '.'); + check_wildcards = strrchr(targetMask, '.'); assert(check_wildcards != NULL); if (check_wildcards && check_wildcards[strcspn(check_wildcards, "*?")])

1 0

Florian Westphal : irc.c: reject masks with wildcard after last dot
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: 5a3128243f4b609b79a2b97ed8cef780198338bb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5a312824… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 18 00:33:34 2009 +0100 irc.c: reject masks with wildcard after last dot RFC 2812 says in section 3.3.1 ("Private Messages"): The mask MUST have at least 1 (one) "." in it and no wildcards following the last ".". --- src/ngircd/irc.c | 19 ++++++++++++++++++- src/ngircd/messages.h | 1 + 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index e5f5bbd..a0dc0ea 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -468,11 +468,11 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) return DISCONNECTED; } else if (ForceType != CLIENT_SERVICE && (chan = Channel_Search(currentTarget))) { - /* channel */ if (!Channel_Write(chan, from, Client, Req->command, SendErrors, Req->argv[1])) return DISCONNECTED; } else if (ForceType != CLIENT_SERVICE + /* $#: server/target mask, RFC 2812, sec. 3.3.1 */ && strchr("$#", currentTarget[0]) && strchr(currentTarget, '.')) { /* targetmask */ @@ -501,6 +501,7 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask, CLIENT *cl; bool client_match; char *mask = targetMask + 1; + const char *check_wildcards; cl = NULL; @@ -511,6 +512,21 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask, Client_ID(from)); } + /* + * RFC 2812, sec. 3.3.1 requires that targetMask have at least one + * dot (".") and no wildcards ("*", "?") following the last one. + */ + check_wildcards = strchr(targetMask, '.'); + assert(check_wildcards != NULL); + if (check_wildcards && + check_wildcards[strcspn(check_wildcards, "*?")]) + { + if (!SendErrors) + return true; + return IRC_WriteStrClient(from, ERR_WILDTOPLEVEL, targetMask); + } + + /* #: hostmask, see RFC 2812, sec. 3.3.1 */ if (targetMask[0] == '#') { for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) { if (Client_Type(cl) != CLIENT_USER) @@ -522,6 +538,7 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask, return false; } } else { + assert(targetMask[0] == '$'); /* $: server mask, see RFC 2812, sec. 3.3.1 */ for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) { if (Client_Type(cl) != CLIENT_USER) continue; diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 562f778..209485a 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -96,6 +96,7 @@ #define ERR_NOORIGIN_MSG "409 %s :No origin specified" #define ERR_NORECIPIENT_MSG "411 %s :No receipient given (%s)" #define ERR_NOTEXTTOSEND_MSG "412 %s :No text to send" +#define ERR_WILDTOPLEVEL "414 %s :Wildcard in toplevel domain" #define ERR_UNKNOWNCOMMAND_MSG "421 %s %s :Unknown command" #define ERR_NOMOTD_MSG "422 %s :MOTD file is missing" #define ERR_NONICKNAMEGIVEN_MSG "431 %s :No nickname given"

1 0

Florian Westphal : irc.c: Fix handling of channels containing dots
by alex＠arthur.barton.de 21 Jan '09

21 Jan '09

Module: ngircd.git Branch: master Commit: 95e8320ca99eb9546102d10a329d708458257c56 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=95e8320c… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 18 00:12:28 2009 +0100 irc.c: Fix handling of channels containing dots commit 2546a13ad2949192eb70bf21e114ec60af287ee4 ('Cumulative Message Patch') broke PRIVMSG to channels containing dots. Fix this by switching evaluation order: Check first if the target matches a existing channel and only do a check for target masks if that failed. PRIVMSG with host/server masks is described in RFC 2812, section 3.3.1. Makes one wonder how a server is _really_ supposed to tell the difference between hostmasks and channel names. Sigh. --- src/ngircd/irc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 47f8652..e5f5bbd 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -467,18 +467,18 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) Req->argv[1])) return DISCONNECTED; } else if (ForceType != CLIENT_SERVICE + && (chan = Channel_Search(currentTarget))) { + /* channel */ + if (!Channel_Write(chan, from, Client, Req->command, + SendErrors, Req->argv[1])) + return DISCONNECTED; + } else if (ForceType != CLIENT_SERVICE && strchr("$#", currentTarget[0]) && strchr(currentTarget, '.')) { /* targetmask */ if (!Send_Message_Mask(from, Req->command, currentTarget, Req->argv[1], SendErrors)) return DISCONNECTED; - } else if (ForceType != CLIENT_SERVICE - && (chan = Channel_Search(currentTarget))) { - /* channel */ - if (!Channel_Write(chan, from, Client, Req->command, - SendErrors, Req->argv[1])) - return DISCONNECTED; } else { if (!SendErrors) return CONNECTED;

1 0

Ask Bjørn Hansen : Update ngircd.spec file
by alex＠arthur.barton.de 13 Jan '09

13 Jan '09

Module: ngircd.git Branch: master Commit: 8f46681bc86162936ffdf56d7f534221ba20fbf5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8f46681b… Author: Ask Bjørn Hansen <ask(a)develooper.com> Date: Mon Jan 12 23:31:18 2009 -0800 Update ngircd.spec file - Change Copyright to License - Update URL - Make BuildRoot use %{_tmppath} macro - Add basic BuildRequires - Compile with zlib and openssl - Install all docs in standard document location Signed-off-by: Ask Bjørn Hansen <ask(a)develooper.com> --- contrib/ngircd.spec | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index be6a9c0..dc3dfd8 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -7,12 +7,12 @@ Summary: A lightweight daemon for the Internet Relay Chat (IRC) Name: %{name} Version: %{version} Release: %{release} -Copyright: GPL -Group: Networking/Daemons -URL: http://arthur.ath.cx/~alex/ngircd/ +License: GPLv2+ +Group: System Environment/Daemons +URL: http://ngircd.barton.de/ Source: %{name}-%{version}.tar.gz -Packager: Sean Reifschneider <jafo-rpms(a)tummy.com> -BuildRoot: /var/tmp/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: zlib-devel, openssl-devel %description ngIRCd is a free open source daemon for the Internet Relay Chat (IRC), @@ -29,10 +29,13 @@ ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run mixed networks. %prep -%setup +%setup -q %build -%configure -make +%configure \ + --with-zlib \ + --with-openssl + +make %{?_smp_mflags} %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" @@ -42,6 +45,7 @@ make ( cd usr/sbin; mv *-ngircd ngircd ) ( cd usr/share/man/man5; mv *-ngircd.conf.5 ngircd.conf.5 ) ( cd usr/share/man/man8; mv *-ngircd.8 ngircd.8 ) + rm -fr usr/share/doc/ngircd ) %clean @@ -49,7 +53,8 @@ make %files %defattr(755,root,root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README +%doc AUTHORS COPYING ChangeLog INSTALL NEWS README doc/* %config(noreplace) /etc %{_prefix}/sbin -%{_prefix}/share/man/ +%{_mandir}/man5/ngircd.conf* +%{_mandir}/man8/ngircd.8*

1 0

Florian Westphal : remove unneeded LOG_DEBUG when not compiling with DEBUG support
by fw＠arthur.barton.de 10 Jan '09

10 Jan '09

Module: ngircd.git Branch: master Commit: 1c7b9dbe931ecbb0f355ab66c9b422f7e6001058 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1c7b9dbe… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Jan 10 00:44:34 2009 +0100 remove unneeded LOG_DEBUG when not compiling with DEBUG support when ngircd is build without DEBUG enabled, LOG_DEBUG messages are always discarded. To avoid the extra code, ngircd has a LogDebug() wrapper which gets removed by the compiler when compiling without DEBUG defined. Update a few functings which were using the Log(LOG_DEBUG, .. interface directly without #ifdef DEBUG guards. text data bss dec hex filename 127748 1900 28280 157928 268e8 ngircd.before 126836 1896 28280 157012 26554 ngircd.after --- src/ngircd/channel.c | 2 +- src/ngircd/client.c | 2 +- src/ngircd/irc-login.c | 6 +++--- src/ngircd/irc-mode.c | 4 ++-- src/ngircd/ngircd.c | 2 +- src/ngircd/parse.c | 2 +- src/ngircd/resolve.c | 4 +--- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 8caa81a..46e42ac 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -876,7 +876,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client ) cl2chan->next = My_Cl2Chan; My_Cl2Chan = cl2chan; - Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( Client ), Chan->name ); + LogDebug("User \"%s\" joined channel \"%s\".", Client_Mask(Client), Chan->name); return cl2chan; } /* Add_Client */ diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1d01f78..fbe130a 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1047,7 +1047,7 @@ Generate_MyToken( CLIENT *Client ) else c = (CLIENT *)c->next; } Client->mytoken = token; - Log( LOG_DEBUG, "Assigned token %d to server \"%s\".", token, Client->id ); + LogDebug("Assigned token %d to server \"%s\".", token, Client->id); } /* Generate_MyToken */ diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 943612e..1091852 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -242,7 +242,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) Client_Type(target) != CLIENT_SERVICE && Client_Type(target) != CLIENT_SERVER) { /* New client */ - Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", + LogDebug("Connection %d: got valid NICK command ...", Client_Conn( Client )); /* Register new nickname of this client */ @@ -723,7 +723,7 @@ IRC_PONG(CLIENT *Client, REQUEST *Req) /* The connection timestamp has already been updated when the data has * been read from so socket, so we don't need to update it here. */ - +#ifdef DEBUG if (Client_Conn(Client) > NONE) Log(LOG_DEBUG, "Connection %d: received PONG. Lag: %ld seconds.", @@ -732,7 +732,7 @@ IRC_PONG(CLIENT *Client, REQUEST *Req) else Log(LOG_DEBUG, "Connection %d: received PONG.", Client_Conn(Client)); - +#endif return CONNECTED; } /* IRC_PONG */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ed70a9b..aa979ac 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -531,7 +531,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) strlcat(the_args, " ", sizeof(the_args)); strlcat(the_args, Client_ID(client), sizeof(the_args)); strlcat(the_modes, x, sizeof(the_modes)); - Log(LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", + LogDebug("User \"%s\": Mode change on %s, now \"%s\"", Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client)); } } else { @@ -539,7 +539,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) retval = set ? Channel_ModeAdd(Channel, x[0]) : Channel_ModeDel(Channel, x[0]); if (retval) { strlcat(the_modes, x, sizeof(the_modes)); - Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel)); + LogDebug("Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel)); } } diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index b564295..ad1168a 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -316,7 +316,7 @@ main( int argc, const char *argv[] ) #ifdef ZLIB strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID ); #endif - Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID ); + LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID); /* Vordefinierte Channels anlegen */ Channel_InitPredefined( ); diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index ec856a0..6801997 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -180,7 +180,7 @@ Parse_Request( CONN_ID Idx, char *Request ) ptr = strchr( Request, ' ' ); if( ! ptr ) { - Log( LOG_DEBUG, "Connection %d: Parse error: prefix without command!?", Idx ); + LogDebug("Connection %d: Parse error: prefix without command!?", Idx); return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" ); } *ptr = '\0'; diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 999ef99..e7f73ad 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -14,8 +14,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: resolve.c,v 1.29 2008/02/26 22:04:17 fw Exp $"; - #include "imp.h" #include <assert.h> #include <errno.h> @@ -92,7 +90,7 @@ Resolve_Addr(RES_STAT * s, const ng_ipaddr_t *Addr, int identsock, pid = Resolver_fork(pipefd); if (pid > 0) { - Log(LOG_DEBUG, "Resolver for %s created (PID %d).", ng_ipaddr_tostr(Addr), pid); + LogDebug("Resolver for %s created (PID %d).", ng_ipaddr_tostr(Addr), pid); s->pid = pid; s->resolver_fd = pipefd[0];

1 0

Florian Westphal : documentation: gnutls does not support password-protected privkeys
by fw＠arthur.barton.de 09 Jan '09

09 Jan '09

Module: ngircd.git Branch: master Commit: 0acef7c598765e4cd786b875395c6601f7e41a19 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0acef7c5… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Jan 9 21:30:43 2009 +0100 documentation: gnutls does not support password-protected privkeys already mentioned in man page and sample config file, but for completeness also document it in doc/SSL.txt. --- doc/SSL.txt | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/SSL.txt b/doc/SSL.txt index 6b590b8..7207f1b 100644 --- a/doc/SSL.txt +++ b/doc/SSL.txt @@ -20,8 +20,11 @@ options of the ./configure script to enable it: --with-openssl enable SSL support using OpenSSL --with-gnutls enable SSL support using GnuTLS -You need a SSL certificate, see below for how to create a self-signed one. +You also need a key/certificate, see below for how to create a self-signed one. +From a feature point of view, ngIRCds support for both libraries is +comparable. The only major difference (at this time) is that ngircd with gnutls +does not support password protected private keys. Configuration ~~~~~~~~~~~~~ @@ -64,7 +67,7 @@ Create DH parameters (optional): Alternate approach using stunnel(1) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Alternatively (or if you are using ngIRCd without compiled without support +Alternatively (or if you are using ngIRCd compiled without support for GnuTLS/OpenSSL), you can use external programs/tools like stunnel(1) to get SSL encrypted connections: @@ -101,4 +104,7 @@ short "how-to", thanks Stefan! That's it. Don't forget to activate ssl support in your irc client ;) + The main drawback of this approach compared to using builtin ssl + is that from ngIRCds point of view, all ssl-enabled client connections will + originate from the host running stunnel. === snip ===

1 0

Alexander Barton : Mac OS X: update texts for Mac OS X Installer.app
by alex＠arthur.barton.de 06 Jan '09

06 Jan '09

Module: ngircd.git Branch: master Commit: 00c8dfa8beed7d5765f6f765714a72cb01832cac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=00c8dfa8… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 6 17:40:25 2009 +0100 Mac OS X: update texts for Mac OS X Installer.app --- contrib/MacOSX/ngIRCd.pmdoc/index.xml | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.pmdoc/index.xml b/contrib/MacOSX/ngIRCd.pmdoc/index.xml index 553e305..2881d58 100644 --- a/contrib/MacOSX/ngIRCd.pmdoc/index.xml +++ b/contrib/MacOSX/ngIRCd.pmdoc/index.xml @@ -1,10 +1,10 @@ -<pkmkdoc spec="1.12"><properties><title>ngIRCd</title><build>/Users/alex/Desktop/ngIRCd.mpkg</build><organization>de.barton.ngircd</organization><userSees ui="both"/><min-target os="2"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>ngIRCd – next generation IRC (Internet Relay Chat) server daemon</description><contents><choice title="ngIRCd daemon" id="choicengircd" tooltip="ngIRCd daemon, documentation and manual pages" description="Binaries, documentation and manual pages of the ngIRCd, the next generation IRC (Internet Relay Chat) daemon. This package will be installed into /opt/ngircd." starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.ngircd.daemon.pkg"/></choice><choice title="Start and stop script" id="choicelaunchscript" tooltip="LaunchDaemon start and stop script" description="Installs the ngIRCd start and stop script for the "launch daemon". If this is an update/upgrade, and ngIRCd is already running, it will be automatically restarted." starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/Library/LaunchDaemons</customLoc><pkgref id="de.barton.ngircd.launchscript.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf330 +<pkmkdoc spec="1.12"><properties><title>ngIRCd</title><build>/Users/alex/Desktop/ngIRCd.mpkg</build><organization>de.barton.ngircd</organization><userSees ui="both"/><min-target os="2"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>ngIRCd – next generation IRC (Internet Relay Chat) server daemon</description><contents><choice title="ngIRCd daemon" id="choicengircd" tooltip="ngIRCd daemon, documentation and manual pages" description="Binaries, documentation and manual pages of the ngIRCd, the next generation IRC (Internet Relay Chat) daemon. This package will be installed into /opt/ngircd." starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.ngircd.daemon.pkg"/></choice><choice title="Start and stop script" id="choicelaunchscript" tooltip="LaunchDaemon start and stop script" description="Installs the ngIRCd start and stop script for the "launch daemon". If this is an update/upgrade, and ngIRCd is already running, it will be automatically restarted." starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/Library/LaunchDaemons</customLoc><pkgref id="de.barton.ngircd.launchscript.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \f0\i\fs24 \cf0 ngIRCd -- The Next Generation IRC Daemon\ -Copyright (c)2001-2008 Alexander Barton and Contributors.\ +Copyright (c)2001-2009 Alexander Barton and Contributors.\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural \i0 \cf0 \ @@ -151,7 +151,7 @@ Each version is given a distinguishing version number. If the Program specifies 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\ \ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\ -}]]></resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf330 +}]]></resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural @@ -160,7 +160,7 @@ Each version is given a distinguishing version number. If the Program specifies \ Homepage: http://ngircd.barton.de\ \ -You will be guided through all steps necessary to install this software.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf330 +You will be guided through all steps necessary to install this software.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset0 Monaco;} {\colortbl;\red255\green255\blue255;} {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1} @@ -168,7 +168,9 @@ You will be guided through all steps necessary to install this software.}]]></re {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural -\f0\fs26 \cf0 ngIRCd has been successfully installed/upgraded, and has been restarted if it was already running before and you have installed the LaunchDaemon start and stop script (which is the default).\ +\f0\fs26 \cf0 ngIRCd has been successfully installed/upgraded.\ +\ +It has been restarted if it was already running before and you have installed the LaunchDaemon start and stop script (which is the default).\ \ If you installed ngIRCd the first time (or had the LaunchDaemon script disabled before), you can start ngIRCd using the following terminal command:\ \

1 0