- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Channel mode changes: break on error
by alex＠arthur.barton.de 03 Mär '09

03 Mär '09

Module: ngircd.git Branch: master Commit: 0a9608a26f4c5fec7d09f13a814bf4e384b17759 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0a9608a2… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 3 16:33:40 2009 +0100 Channel mode changes: break on error Don't echo multiple syntax error messages (461) on invalid commands, but break after the first one. In addition, this solves corrupted 'Unknown mode "+' messages. --- src/ngircd/irc-mode.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 2c14228..9ada4f1 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -440,6 +440,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); + goto chan_exit; } break; case 'l': /* Member limit */ @@ -475,6 +476,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); + goto chan_exit; } break; case 'P': /* Persistent channel */ @@ -519,6 +521,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); + goto chan_exit; } break; /* --- Channel lists --- */

1 0

Alexander Barton : Channel_Mode(): code cleanup (no functional changes)
by alex＠arthur.barton.de 03 Mär '09

03 Mär '09

Module: ngircd.git Branch: master Commit: dee89c2355f973db0ba7c7ca81c83940caefc3d4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dee89c23… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 3 15:06:34 2009 +0100 Channel_Mode(): code cleanup (no functional changes) --- src/ngircd/irc-mode.c | 176 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 124 insertions(+), 52 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=dee8…

1 0

Florian Westphal : TLS/SSL: remove useless error message when ssl connection is closed
by fw＠arthur.barton.de 05 Feb '09

05 Feb '09

Module: ngircd.git Branch: master Commit: b8c6dd503fe4e7814f4b9327a8cd43007a4ec150 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b8c6dd50… Author: Florian Westphal <fw(a)strlen.de> Date: Thu Feb 5 23:42:56 2009 +0100 TLS/SSL: remove useless error message when ssl connection is closed When using OpenSSL, the following annoying "error" message was logged whenever an encrypted connection was shut down in a orderly fashion: TLS/SSL Connection shutdown: ConnSSL_Read: Unable to determine error of course, this isn't an error at all. --- src/ngircd/conn-ssl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 1b4da3c..4ef8f66 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -484,8 +484,8 @@ ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname ) Conn_OPTION_ADD(c, CONN_SSL_WANT_WRITE); /* fall through */ case SSL_ERROR_NONE: return 0; /* try again later */ - case SSL_ERROR_ZERO_RETURN: /* TLS/SSL Connection was shut down */ - LogOpenSSLError("TLS/SSL Connection shutdown", fname); + case SSL_ERROR_ZERO_RETURN: + LogDebug("TLS/SSL connection shut down normally"); break; /* SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT, SSL_ERROR_WANT_X509_LOOKUP

1 0

Florian Westphal : update ChangeLog.
by fw＠arthur.barton.de 04 Feb '09

04 Feb '09

Module: ngircd.git Branch: master Commit: 66d6c3c84b092c422b094bddeff3e04fd2488cfc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=66d6c3c8… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 4 23:33:46 2009 +0100 update ChangeLog. --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e1fcc7..2cc268a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,12 @@ -- ChangeLog -- +ngIRCd-dev + - Fix memory leak when a encrypted and compressed server link goes down. + (Bug #95, reported by Christoph, fiesh(a)fiesh.homeip.net) + - Fix handling of channels containing dots (Bug #93, reported by + gonosz csiga) ngIRCd Release 13 (2008-12-25) - Updated documentation, especially doc/Services.txt and doc/SSL.txt.

1 0

Florian Westphal : SSL/TLS: clear all ssl realted flags on shutdown
by fw＠arthur.barton.de 04 Feb '09

04 Feb '09

Module: ngircd.git Branch: master Commit: 2fce4667a86e42589db8dd84a51c472aa18ac80e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2fce4667… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 4 23:23:12 2009 +0100 SSL/TLS: clear all ssl realted flags on shutdown one ssl related flags was not cleared on ssl shutdown. introduce and use CONN_SSL_FLAGS_ALL to zap them all. --- src/ngircd/conn-ssl.c | 3 ++- src/ngircd/conn.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index dc165d7..1b4da3c 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -228,7 +228,8 @@ void ConnSSL_Free(CONNECTION *c) } #endif assert(Conn_OPTION_ISSET(c, CONN_SSL)); - Conn_OPTION_DEL(c, (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE)); + /* can't just set bitmask to 0 -- there are other, non-ssl related flags, e.g. CONN_ZIP. */ + Conn_OPTION_DEL(c, CONN_SSL_FLAGS_ALL); } diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index bd332b6..450d3d1 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -39,6 +39,7 @@ #define CONN_SSL 32 /* this connection is SSL encrypted */ #define CONN_SSL_WANT_WRITE 64 /* SSL/TLS library needs to write protocol data */ #define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */ +#define CONN_SSL_FLAGS_ALL (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ) #endif typedef int CONN_ID;

1 0

Florian Westphal : TLS/SSL: fix memory leak when using compressed server links with ssl
by fw＠arthur.barton.de 04 Feb '09

04 Feb '09

Module: ngircd.git Branch: master Commit: c6a43fbaf0579741ebf34e88ca7f0586b471062e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c6a43fba… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 4 23:01:53 2009 +0100 TLS/SSL: fix memory leak when using compressed server links with ssl commit 6bc2d3d06e9cb4da68ea4b63d9b6b219d88ab927 (New connection option CONN_RFC1459) forgot to adjust the ssl bitmasks. The result is that when a compressed AND encrypted server link goes down the memory allocated by zlib and the r/w buffers are no longer free'd as the previous ConnSSL_Free() would then also remove the CONN_ZIP flag from the flag mask. --- src/ngircd/conn.h | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 08f6dde..bd332b6 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -18,7 +18,13 @@ #include <time.h> /* for time_t, see below */ - +/* + * connection state flags. this is a bitmask -- all values must + * be unique and a power of two. + * + * If you introduce new ones in between, make sure to adjust all + * remaining ones. + */ #define CONN_ISCLOSING 1 /* Conn_Close() already called */ #define CONN_ISCONNECTING 2 /* connect() in progress */ #define CONN_RFC1459 4 /* RFC 1459 compatibility mode */ @@ -29,10 +35,10 @@ #include "conf-ssl.h" #ifdef SSL_SUPPORT -#define CONN_SSL_CONNECT 8 /* wait for ssl connect to finish */ -#define CONN_SSL 16 /* this connection is SSL encrypted */ -#define CONN_SSL_WANT_WRITE 32 /* SSL/TLS library needs to write protocol data */ -#define CONN_SSL_WANT_READ 64 /* SSL/TLS library needs to read protocol data */ +#define CONN_SSL_CONNECT 16 /* wait for ssl connect to finish */ +#define CONN_SSL 32 /* this connection is SSL encrypted */ +#define CONN_SSL_WANT_WRITE 64 /* SSL/TLS library needs to write protocol data */ +#define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */ #endif typedef int CONN_ID;

1 0

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 : 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

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