ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Florian Westphal : configure.in: only add -lnsl when needed
by fw＠arthur.barton.de 17 Feb '10

17 Feb '10

Module: ngircd.git Branch: master Commit: 20276f7cc967ec1a472715574adc6792b1598314 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=20276f7c… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 17 22:23:14 2010 +0100 configure.in: only add -lnsl when needed dpkg-shlibdeps: warning: dependency on libnsl.so.1 [..] (they use none of its symbols). As shown via commit 2b14234abc252383679bae2d23861b773dc9713e (dpkg-shlibdeps: warning: dependency on libnsl.so.1) and the following revert of that commit, we cannot simply drop the AC_CHECK_LIB(nsl). Although -lnsl is indeed unneeded when glibc is used, some platforms (e.g. Solaris) need it. Use AC_SEARCH_LIBS instead to only link when the library exports a particular symbol. --- configure.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 10a72d3..f80e8a9 100644 --- a/configure.in +++ b/configure.in @@ -131,9 +131,11 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),, # -- Libraries -- +# A/UX needs this. AC_CHECK_LIB(UTIL,memmove) +# needed on solaris. GNU libc also has a libnsl, but we do not need it. +AC_SEARCH_LIBS(gethostbyname,nsl) AC_CHECK_LIB(socket,bind) -AC_CHECK_LIB(nsl,gethostent) # -- Functions --

1 0

Alexander Barton : Implement WEBIRC command
by alex＠arthur.barton.de 17 Feb '10

17 Feb '10

Module: ngircd.git Branch: master Commit: 6e8cf51bb216f956e7a6fdb5c61b0f2799bf8d2d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6e8cf51b… Author: Alexander Barton <alex(a)barton.de> Date: Thu Feb 11 00:01:53 2010 +0100 Implement WEBIRC command The WEBIRC command is used by some Web-to-IRC gateways to set the correct user name and host name of users instead of their own. Syntax: WEBIRC <password> <username> <hostname> <ip-address> The <password> must be set using the new configuration variable "WebircPassword" in the [Global] section of ngircd.conf. Please note that the <ip-address> is currently not used by ngIRCd (we don't store it in the CLIENT structure, only the resolved hostname). --- doc/sample-ngircd.conf | 8 +++++++- man/ngircd.conf.5.tmpl | 5 +++++ src/ngircd/conf.c | 30 +++++++++++++++++++----------- src/ngircd/conf.h | 5 ++++- src/ngircd/conn.c | 12 ++++++++---- src/ngircd/irc-login.c | 27 ++++++++++++++++++++++++++- src/ngircd/irc-login.h | 3 ++- src/ngircd/parse.c | 3 ++- 8 files changed, 73 insertions(+), 20 deletions(-) diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf index b945224..db326c9 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf @@ -28,9 +28,15 @@ # LINKS requests for example. Info = Server Info Text - # Global password for all users needed to connect to the server + # Global password for all users needed to connect to the server. + # (Default: not set) ;Password = abc + # Password required for using the WEBIRC command used by some + # Web-to-IRC gateways. If not set/empty, the WEBIRC command can't + # be used. (Default: not set) + ;WebircPassword = xyz + # Information about the server and the administrator, used by the # ADMIN command. Not required by server but by RFC! ;AdminInfo1 = Description diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 4d55592..46e0308 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -73,6 +73,11 @@ example. Global password for all users needed to connect to the server. The default is empty, so no password is required. .TP +\fBWebircPassword\fR +Password required for using the WEBIRC command used by some Web-to-IRC +gateways. If not set or empty, the WEBIRC command can't be used. +Default: not set. +.TP \fBAdminInfo1\fR, \fBAdminInfo2\fR, \fBAdminEMail\fR Information about the server and the administrator, used by the ADMIN command. diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fae2a28..694b5d4 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -291,16 +291,17 @@ Conf_Test( void ) } puts( "[GLOBAL]" ); - printf( " Name = %s\n", Conf_ServerName ); - printf( " Info = %s\n", Conf_ServerInfo ); - printf( " Password = %s\n", Conf_ServerPwd ); - printf( " AdminInfo1 = %s\n", Conf_ServerAdmin1 ); - printf( " AdminInfo2 = %s\n", Conf_ServerAdmin2 ); - printf( " AdminEMail = %s\n", Conf_ServerAdminMail ); - printf( " MotdFile = %s\n", Conf_MotdFile ); - printf( " MotdPhrase = %s\n", Conf_MotdPhrase ); - printf( " ChrootDir = %s\n", Conf_Chroot ); - printf( " PidFile = %s\n", Conf_PidFile); + printf(" Name = %s\n", Conf_ServerName); + printf(" Info = %s\n", Conf_ServerInfo); + printf(" Password = %s\n", Conf_ServerPwd); + printf(" WebircPassword = %s\n", Conf_WebircPwd); + printf(" AdminInfo1 = %s\n", Conf_ServerAdmin1); + printf(" AdminInfo2 = %s\n", Conf_ServerAdmin2); + printf(" AdminEMail = %s\n", Conf_ServerAdminMail); + printf(" MotdFile = %s\n", Conf_MotdFile); + printf(" MotdPhrase = %s\n", Conf_MotdPhrase); + printf(" ChrootDir = %s\n", Conf_Chroot); + printf(" PidFile = %s\n", Conf_PidFile); printf(" Listen = %s\n", Conf_ListenAddress); fputs(" Ports = ", stdout); ports_puts(&Conf_ListenPorts); @@ -845,6 +846,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Config_Error_TooLong( Line, Var ); return; } + if (strcasecmp(Var, "WebircPassword") == 0) { + /* Password required for WEBIRC command */ + len = strlcpy(Conf_WebircPwd, Arg, sizeof(Conf_WebircPwd)); + if (len >= sizeof(Conf_WebircPwd)) + Config_Error_TooLong(Line, Var); + return; + } if( strcasecmp( Var, "AdminInfo1" ) == 0 ) { /* Administrative info #1 */ len = strlcpy( Conf_ServerAdmin1, Arg, sizeof( Conf_ServerAdmin1 )); diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 0180515..5764d0f 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -188,6 +188,9 @@ GLOBAL bool Conf_AddServer PARAMS(( const char *Name, UINT16 Port, const char *H GLOBAL bool Conf_IsService PARAMS((int ConfServer, const char *Nick)); +/* Password required by WEBIRC command */ +GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN]; + #endif diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 1e4ba0a..cd350a8 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1999,10 +1999,14 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) c = Conn_GetClient( i ); assert( c != NULL ); - /* Only update client information of unregistered clients */ - if( Client_Type( c ) == CLIENT_UNKNOWN ) { - strlcpy(My_Connections[i].host, readbuf, sizeof( My_Connections[i].host)); - Client_SetHostname( c, readbuf); + /* Only update client information of unregistered clients. + * Note: user commands (e. g. WEBIRC) are always read _after_ reading + * the resolver results, so we don't have to worry to override settings + * from these commands here. */ + if(Client_Type(c) == CLIENT_UNKNOWN) { + strlcpy(My_Connections[i].host, readbuf, + sizeof(My_Connections[i].host)); + Client_SetHostname(c, readbuf); #ifdef IDENTAUTH ++identptr; if (*identptr) { diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 7b73d40..2de4bd5 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -557,6 +557,31 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req) } /* IRC_SERVICE */ +/** + * Handler for the IRC command "WEBIRC". + * Syntax: WEBIRC <password> <username> <real-hostname> <real-IP-address> + */ +GLOBAL bool +IRC_WEBIRC(CLIENT *Client, REQUEST *Req) +{ + /* Exactly 4 parameters are requited */ + if (Req->argc != 4) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + if (!Conf_WebircPwd[0] || strcmp(Req->argv[0], Conf_WebircPwd) != 0) + return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG, + Client_ID(Client)); + + LogDebug("Connection %d: got valid WEBIRC command: user=%s, host=%s, ip=%s", + Client_Conn(Client), Req->argv[1], Req->argv[2], Req->argv[3]); + + Client_SetUser(Client, Req->argv[1], true); + Client_SetHostname(Client, Req->argv[2]); + return CONNECTED; +} /* IRC_WEBIRC */ + + GLOBAL bool IRC_QUIT( CLIENT *Client, REQUEST *Req ) { diff --git a/src/ngircd/irc-login.h b/src/ngircd/irc-login.h index 0b92038..1504e0b 100644 --- a/src/ngircd/irc-login.h +++ b/src/ngircd/irc-login.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ GLOBAL bool IRC_PASS PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_NICK PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_USER PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_SERVICE PARAMS((CLIENT *Client, REQUEST *Req)); +GLOBAL bool IRC_WEBIRC PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PING PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req)); diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 2c28a30..3710d70 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -103,6 +103,7 @@ static COMMAND My_Commands[] = { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 0, 0, 0 }, { "WHO", IRC_WHO, CLIENT_USER, 0, 0, 0 }, { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : Re-format Init_New_Client() function
by alex＠arthur.barton.de 10 Feb '10

10 Feb '10

Module: ngircd.git Branch: master Commit: 9b3e143a26f1079d185c41611cd2475f8fbdae39 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9b3e143a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 10 23:40:03 2010 +0100 Re-format Init_New_Client() function --- src/ngircd/client.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1edc755..c565830 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -181,39 +181,46 @@ Client_NewRemoteUser(CLIENT *Introducer, const char *Nick, int Hops, const char */ static CLIENT * Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, - int Type, const char *ID, const char *User, const char *Hostname, const char *Info, int Hops, - int Token, const char *Modes, bool Idented) + int Type, const char *ID, const char *User, const char *Hostname, + const char *Info, int Hops, int Token, const char *Modes, bool Idented) { CLIENT *client; - assert( Idx >= NONE ); - assert( Introducer != NULL ); - assert( Hostname != NULL ); + assert(Idx >= NONE); + assert(Introducer != NULL); + assert(Hostname != NULL); - client = New_Client_Struct( ); - if( ! client ) return NULL; + client = New_Client_Struct(); + if (!client) + return NULL; client->starttime = time(NULL); client->conn_id = Idx; client->introducer = Introducer; client->topserver = TopServer; client->type = Type; - if( ID ) Client_SetID( client, ID ); - if( User ) Client_SetUser( client, User, Idented ); - if( Hostname ) Client_SetHostname( client, Hostname ); - if( Info ) Client_SetInfo( client, Info ); + if (ID) + Client_SetID(client, ID); + if (User) + Client_SetUser(client, User, Idented); + if (Hostname) + Client_SetHostname(client, Hostname); + if (Info) + Client_SetInfo(client, Info); client->hops = Hops; client->token = Token; - if( Modes ) Client_SetModes( client, Modes ); - if( Type == CLIENT_SERVER ) Generate_MyToken( client ); + if (Modes) + Client_SetModes(client, Modes); + if (Type == CLIENT_SERVER) + Generate_MyToken(client); - if( strchr( client->modes, 'a' )) - strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away )); + if (strchr(client->modes, 'a')) + strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away)); client->next = (POINTER *)My_Clients; My_Clients = client; - Adjust_Counters( client ); + Adjust_Counters(client); return client; } /* Init_New_Client */

1 0

Alexander Barton : ngircd.conf.5: Document missing "Password" variable
by alex＠arthur.barton.de 10 Feb '10

10 Feb '10

Module: ngircd.git Branch: master Commit: 53fc0ebff6fe09bb6a3ae3b134647b3499fc6618 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=53fc0ebf… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 10 23:47:05 2010 +0100 ngircd.conf.5: Document missing "Password" variable --- man/ngircd.conf.5.tmpl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index d9e6f46..4d55592 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -69,6 +69,10 @@ IRC network and must contain at least one dot (".") character. Info text of the server. This will be shown by WHOIS and LINKS requests for example. .TP +\fBPassword\fR +Global password for all users needed to connect to the server. The default +is empty, so no password is required. +.TP \fBAdminInfo1\fR, \fBAdminInfo2\fR, \fBAdminEMail\fR Information about the server and the administrator, used by the ADMIN command.

1 0

Alexander Barton : New README-Interix. txt for running ngIRCd on MS SFU and MS SUA
by alex＠arthur.barton.de 05 Feb '10

05 Feb '10

Module: ngircd.git Branch: master Commit: f1bbc92b391f2dabd8c07234689f4f36207f81c6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f1bbc92b… Author: Alexander Barton <alex(a)barton.de> Date: Fri Feb 5 00:24:33 2010 +0100 New README-Interix.txt for running ngIRCd on MS SFU and MS SUA --- doc/README-Interix.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/doc/README-Interix.txt b/doc/README-Interix.txt new file mode 100644 index 0000000..8f5451f --- /dev/null +++ b/doc/README-Interix.txt @@ -0,0 +1,37 @@ + + ngIRCd - Next Generation IRC Server + + (c)2001-2010 Alexander Barton, + alex(a)barton.de, http://www.barton.de/ + + ngIRCd is free software and published under the + terms of the GNU General Public License. + + + -- README-Interix.txt -- + + +ngIRCd release 15 has successfully been tested on Microsoft Windows XP +Professional using the Services for UNIX (SFU) version 3.5 and Microsoft +Windows 7 with the bundled Subsystem for UNIX Applications (SUA). + +SFU are supported on Windows 2000, Windows 2000 Server, Windows XP, and +Windows Server 2003. SUA is supported on Windows Server 2003 R2, Windows +Server 2008 & 2008 R2, Windows Vista, and Windows 7 -- so ngIRCd should be +able to run on all of these platforms. + +But please note that the poll() API function is not fully implemented by +SFU/SUA and therefore can't be used by ngIRCd -- which normally would be +the default. Please see <http://www.suacommunity.com/faqs.aspx> section +4.25 for details: + + "If you do try to use the poll() API your program will block on the + API call forever. You must direct your program to build using the + select() API." + +So when running the ./configure script, you HAVE TO DISABLE poll() support: + + ./configure --without-poll + +ngIRCd then defaults to using the select() API function which works fine. +

1 0

Alexander Barton : Added "i586/pc/interix3.5" (MS Services for UNIX) to Platforms.txt
by alex＠arthur.barton.de 22 Jan '10

22 Jan '10

Module: ngircd.git Branch: master Commit: 1da3e25e65c7bcc3e47d18f114f7c4e76e274250 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1da3e25e… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 22 18:26:26 2010 +0100 Added "i586/pc/interix3.5" (MS Services for UNIX) to Platforms.txt --- doc/Platforms.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 85b3afa..8629252 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -49,6 +49,7 @@ i386/unknown/netbsdelf3.0.1 gcc 3.3.3 0.10.0-p1 06-08-30 alex Y Y Y Y (3) i386/unknown/netbsdelf4.0 gcc 4.1.2 14.1 09-07-28 alex Y Y Y Y (3) i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y (3) i386/unknown/openbsd4.1 gcc 3.3.5 14.1 09-07-28 alex Y Y Y Y (3) +i586/pc/interix3.5 gcc 3.3 15 10-01-22 alex Y Y N Y i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y n Y i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1)

1 0

Alexander Barton : Quote received messages of ERROR commands in log output
by alex＠arthur.barton.de 19 Jan '10

19 Jan '10

Module: ngircd.git Branch: master Commit: e1de769ab9958f6debbd884a1555de09d1191d32 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e1de769a… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 19 19:20:56 2010 +0100 Quote received messages of ERROR commands in log output --- src/ngircd/irc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 2466b6b..67ad2a6 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -53,8 +53,12 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if( Req->argc < 1 ) Log( LOG_NOTICE, "Got ERROR from \"%s\"!", Client_Mask( Client )); - else Log( LOG_NOTICE, "Got ERROR from \"%s\": %s!", Client_Mask( Client ), Req->argv[0] ); + if (Req->argc < 1) + Log(LOG_NOTICE, "Got ERROR from \"%s\"!", + Client_Mask(Client)); + else + Log(LOG_NOTICE, "Got ERROR from \"%s\": \"%s\"!", + Client_Mask(Client), Req->argv[0]); return CONNECTED; } /* IRC_ERROR */

1 0

Alexander Barton : Implemented new "secure clients only" channel mode: +z
by alex＠arthur.barton.de 17 Jan '10

17 Jan '10

Module: ngircd.git Branch: master Commit: 9f58418765576950983b4a95c4f5f71f068f424f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9f584187… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 17 14:19:35 2010 +0100 Implemented new "secure clients only" channel mode: +z Only clients using a SSL encrypted connection to the server are allowed to join such a channel. But please note three things: a) already joined clients are not checked when setting this mode, b) IRC operators are always allowed to join every channel, and c) remote clients using a server not supporting this mode are not checked either and therefore always allowed to join. --- NEWS | 12 +++++++++++- src/ngircd/defines.h | 2 +- src/ngircd/irc-channel.c | 14 +++++++++++--- src/ngircd/irc-mode.c | 3 ++- src/ngircd/messages.h | 1 + 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 5a0a9dd..3457312 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2009 Alexander Barton, + (c)2001-2010 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -10,6 +10,16 @@ -- NEWS -- +ngIRCd Release 16 + + - A new channel mode "secure connections only" (+z) has been implemented: + Only clients using a SSL encrypted connection to the server are allowed + to join such a channel. + But please note three things: a) already joined clients are not checked + when setting this mode, b) IRC operators are always allowed to join + every channel, and c) remote clients using a server not supporting this + mode are not checked either and therefore always allowed to join. + ngIRCd Release 15 (2009-11-07) ngIRCd 15~rc1 (2009-10-15) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 010dd8e..94c7dd1 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -81,7 +81,7 @@ in seconds. */ #define USERMODES "aiorsw" /* Supported user modes. */ -#define CHANMODES "biIklmnoPstv" /* Supported channel modes. */ +#define CHANMODES "biIklmnoPstvz" /* Supported channel modes. */ #define CONNECTED true /* Internal status codes. */ #define DISCONNECTED false diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 010be35..1014d3a 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, } channel_modes = Channel_Modes(chan); - if ((strchr(channel_modes, 'i')) && !is_invited) { + if (strchr(channel_modes, 'i') && !is_invited) { /* Channel is "invite-only" and client is not on invite list */ IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, Client_ID(Client), channame); @@ -108,7 +108,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return false; } - if ((strchr(channel_modes, 'l')) && + if (strchr(channel_modes, 'l') && (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) { /* There are more clints joined to this channel than allowed */ IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, @@ -116,6 +116,14 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return false; } + if (strchr(channel_modes, 'z') && !Conn_UsesSSL(Client_Conn(Client))) { + /* Only "secure" clients are allowed, but clients doesn't + * use SSL encryption */ + IRC_WriteStrClient(Client, ERR_SECURECHANNEL_MSG, + Client_ID(Client), channame); + return false; + } + return true; } diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 9509fb0..d22d32f 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -401,6 +401,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) case 'n': /* Only members can write */ case 's': /* Secret channel */ case 't': /* Topic locked */ + case 'z': /* Secure connections only */ if (modeok) x[0] = *mode_ptr; else diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 59c6cdb..e15bf16 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -113,6 +113,7 @@ #define ERR_ALREADYREGISTRED_MSG "462 %s :Connection already registered" #define ERR_PASSWDMISMATCH_MSG "464 %s :Invalid password" #define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l)" +#define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z)" #define ERR_UNKNOWNMODE_MSG "472 %s: %c :is unknown mode char for %s" #define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i)" #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b)"

1 0

Alexander Barton : Clean up and document IRC_STATS() function
by alex＠arthur.barton.de 16 Jan '10

16 Jan '10

Module: ngircd.git Branch: master Commit: ef157715a00f565c8e17cf5618eb437b2df6d4bc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ef157715… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 16 23:24:19 2010 +0100 Clean up and document IRC_STATS() function --- src/ngircd/irc-info.c | 131 ++++++++++++++++++++++++++++-------------------- 1 files changed, 76 insertions(+), 55 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 5a8555a..28722e7 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -465,6 +465,10 @@ uptime_mins(time_t *now) } +/** + * Handler for the IRC command "STATS". + * See RFC 2812 section 3.4.4. + */ GLOBAL bool IRC_STATS( CLIENT *Client, REQUEST *Req ) { @@ -475,11 +479,12 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) time_t time_now; unsigned int days, hrs, mins; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); if (Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); /* use prefix to determine "From" */ if (Client_Type(Client) == CLIENT_SERVER) @@ -487,18 +492,21 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) else from = Client; - if (! from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix); + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); if (Req->argc == 2) { /* forward to another server? */ - target = Client_Search( Req->argv[1] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) - return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] ); + target = Client_Search(Req->argv[1]); + if ((!target) || (Client_Type(target) != CLIENT_SERVER)) + return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(from), Req->argv[1]); - if( target != Client_ThisServer()) { + if (target != Client_ThisServer()) { /* forward to another server */ - return IRC_WriteStrClientPrefix( target, from, "STATS %s %s", Req->argv[0], Req->argv[1] ); + return IRC_WriteStrClientPrefix(target, from, + "STATS %s %s", Req->argv[0], Req->argv[1]); } } @@ -508,57 +516,70 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) query = '*'; switch (query) { - case 'l': /* Links */ - case 'L': - time_now = time(NULL); - for (con = Conn_First(); con != NONE ;con = Conn_Next(con)) { - cl = Conn_GetClient(con); - if (!cl) - continue; - if ((Client_Type(cl) == CLIENT_SERVER) || (cl == Client)) { - /* Server link or our own connection */ + case 'l': /* Link status (servers and own link) */ + case 'L': + time_now = time(NULL); + for (con = Conn_First(); con != NONE; con = Conn_Next(con)) { + cl = Conn_GetClient(con); + if (!cl) + continue; + if ((Client_Type(cl) == CLIENT_SERVER) + || (cl == Client)) { + /* Server link or our own connection */ #ifdef ZLIB - if (Conn_Options(con) & CONN_ZIP) { - if (!IRC_WriteStrClient(from, RPL_STATSLINKINFOZIP_MSG, - Client_ID(from), Client_Mask(cl), Conn_SendQ(con), - Conn_SendMsg(con), Zip_SendBytes(con), Conn_SendBytes(con), - Conn_RecvMsg(con), Zip_RecvBytes(con), Conn_RecvBytes(con), (long)(time_now - Conn_StartTime(con)))) - return DISCONNECTED; - continue; - } -#endif - if (!IRC_WriteStrClient(from, RPL_STATSLINKINFO_MSG, Client_ID(from), - Client_Mask(cl), Conn_SendQ(con), Conn_SendMsg(con), Conn_SendBytes(con), - Conn_RecvMsg(con), Conn_RecvBytes(con), (long)(time_now - Conn_StartTime(con)))) - return DISCONNECTED; - } - } - break; - case 'm': /* IRC-Commands */ - case 'M': - cmd = Parse_GetCommandStruct( ); - for (; cmd->name ; cmd++) { - if (cmd->lcount == 0 && cmd->rcount == 0) + if (Conn_Options(con) & CONN_ZIP) { + if (!IRC_WriteStrClient + (from, RPL_STATSLINKINFOZIP_MSG, + Client_ID(from), Client_Mask(cl), + Conn_SendQ(con), Conn_SendMsg(con), + Zip_SendBytes(con), + Conn_SendBytes(con), + Conn_RecvMsg(con), + Zip_RecvBytes(con), + Conn_RecvBytes(con), + (long)(time_now - Conn_StartTime(con)))) + return DISCONNECTED; continue; - if (!IRC_WriteStrClient(from, RPL_STATSCOMMANDS_MSG, Client_ID(from), - cmd->name, cmd->lcount, cmd->bytes, cmd->rcount)) - return DISCONNECTED; + } +#endif + if (!IRC_WriteStrClient + (from, RPL_STATSLINKINFO_MSG, + Client_ID(from), Client_Mask(cl), + Conn_SendQ(con), Conn_SendMsg(con), + Conn_SendBytes(con), Conn_RecvMsg(con), + Conn_RecvBytes(con), + (long)(time_now - Conn_StartTime(con)))) + return DISCONNECTED; } - break; - case 'u': /* server uptime */ - case 'U': - time_now = time(NULL) - NGIRCd_Start; - days = uptime_days(&time_now); - hrs = uptime_hrs(&time_now); - mins = uptime_mins(&time_now); - if (!IRC_WriteStrClient(from, RPL_STATSUPTIME, Client_ID(from), - days, hrs, mins, (unsigned int) time_now)) - return DISCONNECTED; - break; + } + break; + case 'm': /* IRC command status (usage count) */ + case 'M': + cmd = Parse_GetCommandStruct(); + for (; cmd->name; cmd++) { + if (cmd->lcount == 0 && cmd->rcount == 0) + continue; + if (!IRC_WriteStrClient + (from, RPL_STATSCOMMANDS_MSG, Client_ID(from), + cmd->name, cmd->lcount, cmd->bytes, cmd->rcount)) + return DISCONNECTED; + } + break; + case 'u': /* Server uptime */ + case 'U': + time_now = time(NULL) - NGIRCd_Start; + days = uptime_days(&time_now); + hrs = uptime_hrs(&time_now); + mins = uptime_mins(&time_now); + if (!IRC_WriteStrClient(from, RPL_STATSUPTIME, Client_ID(from), + days, hrs, mins, (unsigned int)time_now)) + return DISCONNECTED; + break; } IRC_SetPenalty(from, 2); - return IRC_WriteStrClient(from, RPL_ENDOFSTATS_MSG, Client_ID(from), query); + return IRC_WriteStrClient(from, RPL_ENDOFSTATS_MSG, + Client_ID(from), query); } /* IRC_STATS */

1 0

Alexander Barton : Clean up and document IRC_JOIN() and join_allowed() functions
by alex＠arthur.barton.de 16 Jan '10

16 Jan '10

Module: ngircd.git Branch: master Commit: ecad9f32c82f50312010ab41f7702d1329bc511e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ecad9f32… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 16 22:30:55 2010 +0100 Clean up and document IRC_JOIN() and join_allowed() functions --- src/ngircd/irc-channel.c | 72 ++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index af0f066..010be35 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -62,9 +62,18 @@ part_from_all_channels(CLIENT* client, CLIENT *target) } +/** + * Check weather a local client is allowed to join an already existing + * channel or not. + * @param Client Client that sent the JOIN command + * @param chan Channel to check + * @param channame Name of the channel + * @param key Provided channel key (or NULL if none has been provided) + * @return true if client is allowed to join channel, false otherwise + */ static bool -join_allowed(CLIENT *Client, CLIENT *target, CHANNEL *chan, - const char *channame, const char *key) +join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, + const char *key) { bool is_invited, is_banned; const char *channel_modes; @@ -73,32 +82,40 @@ join_allowed(CLIENT *Client, CLIENT *target, CHANNEL *chan, if (strchr(Client_Modes(Client), 'o')) return true; - is_banned = Lists_Check(Channel_GetListBans(chan), target); - is_invited = Lists_Check(Channel_GetListInvites(chan), target); + is_banned = Lists_Check(Channel_GetListBans(chan), Client); + is_invited = Lists_Check(Channel_GetListInvites(chan), Client); if (is_banned && !is_invited) { - IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); + /* Client is banned from channel (and not on invite list) */ + IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, + Client_ID(Client), channame); return false; } channel_modes = Channel_Modes(chan); if ((strchr(channel_modes, 'i')) && !is_invited) { - /* Channel is "invite-only" (and Client wasn't invited) */ - IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, Client_ID(Client), channame); + /* Channel is "invite-only" and client is not on invite list */ + IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, + Client_ID(Client), channame); return false; } - /* Is the channel protected by a key? */ - if (!Channel_CheckKey(chan, target, key ? key : "")) { + if (!Channel_CheckKey(chan, Client, key ? key : "")) { + /* Channel is protected by a channel key and the client + * didn't specify the correct one */ IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG, Client_ID(Client), channame); return false; } - /* Are there already too many members? */ - if ((strchr(channel_modes, 'l')) && (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) { - IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, Client_ID(Client), channame); + + if ((strchr(channel_modes, 'l')) && + (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) { + /* There are more clints joined to this channel than allowed */ + IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, + Client_ID(Client), channame); return false; } + return true; } @@ -270,20 +287,23 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Local client? */ if (Client_Type(Client) == CLIENT_USER) { - /* Test if the user has reached his maximum channel count */ - if ((Conf_MaxJoins > 0) && (Channel_CountForUser(Client) >= Conf_MaxJoins)) - return IRC_WriteStrClient(Client, ERR_TOOMANYCHANNELS_MSG, - Client_ID(Client), channame); - if (!chan) { - /* - * New Channel: first user will be channel operator - * unless this is a modeless channel. - */ + /* Test if the user has reached the channel limit */ + if ((Conf_MaxJoins > 0) && + (Channel_CountForUser(Client) >= Conf_MaxJoins)) + return IRC_WriteStrClient(Client, + ERR_TOOMANYCHANNELS_MSG, + Client_ID(Client), channame); + if (chan) { + /* Already existing channel: check if the + * client is allowed to join */ + if (!join_allowed(Client, chan, channame, key)) + break; + } else { + /* New channel: first user will become channel + * operator unless this is a modeless channel */ if (*channame != '+') flags = "o"; - } else - if (!join_allowed(Client, target, chan, channame, key)) - break; + } /* Local client: update idle time */ Conn_UpdateIdle(Client_Conn(Client)); @@ -293,7 +313,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) * that the "one shot" entries (generated by INVITE * commands) in this list become deleted when a user * joins a channel this way. */ - if (chan) (void)Lists_Check(Channel_GetListInvites(chan), target); + if (chan) + (void)Lists_Check(Channel_GetListInvites(chan), + target); } /* Join channel (and create channel if it doesn't exist) */

1 0

Springe zur Seite:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates