ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Christoph Biedl : Introduce new configuration option "CloakModeHost"
by alex＠arthur.barton.de 11 Jun '12

11 Jun '12

Module: ngircd.git Branch: master Commit: aa7db2c0e9e1112591cbdb3d346342d34ca21a6a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=aa7db2c0… Author: Christoph Biedl <ngircd.anoy(a)manchmal.in-ulm.de> Date: Sat Jun 9 01:55:22 2012 +0200 Introduce new configuration option "CloakModeHost" This closes bug #124. --- src/ngircd/client.c | 3 ++- src/ngircd/conf.c | 8 ++++++++ src/ngircd/conf.h | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1b35684..9861a0d 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -825,7 +825,8 @@ Client_MaskCloaked(CLIENT *Client) return Client_Mask(Client); snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", - Client->id, Client->user, Client_ID(Client->introducer)); + Client->id, Client->user, + *Conf_CloakModeHost ? Conf_CloakModeHost : Client_ID(Client->introducer)); return Mask_Buffer; } /* Client_MaskCloaked */ diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index f274eb8..2a259eb 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -358,6 +358,7 @@ Conf_Test( void ) printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper)); printf(" ChrootDir = %s\n", Conf_Chroot); printf(" CloakHost = %s\n", Conf_CloakHost); + printf(" CloakModeHost = %s\n", Conf_CloakModeHost); printf(" CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick)); #ifdef WANT_IPV6 printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); @@ -684,6 +685,7 @@ Set_Defaults(bool InitServers) #endif strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot)); strcpy(Conf_CloakHost, ""); + strcpy(Conf_CloakModeHost, ""); Conf_CloakUserToNick = false; Conf_ConnectIPv4 = true; #ifdef WANT_IPV6 @@ -1477,6 +1479,12 @@ Handle_OPTIONS(int Line, char *Var, char *Arg) Config_Error_TooLong(Line, Var); return; } + if (strcasecmp(Var, "CloakModeHost") == 0) { + len = strlcpy(Conf_CloakModeHost, Arg, sizeof(Conf_CloakModeHost)); + if (len >= sizeof(Conf_CloakModeHost)) + Config_Error_TooLong(Line, Var); + return; + } if (strcasecmp(Var, "CloakUserToNick") == 0) { Conf_CloakUserToNick = Check_ArgIsTrue(Arg); return; diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index be19afc..171a838 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -166,6 +166,9 @@ GLOBAL bool Conf_AllowRemoteOper; /** Cloaked hostname of the clients */ GLOBAL char Conf_CloakHost[CLIENT_ID_LEN]; +/** Cloaked hostname for clients that did +x */ +GLOBAL char Conf_CloakModeHost[CLIENT_ID_LEN]; + /** Use nick name as user name? */ GLOBAL bool Conf_CloakUserToNick;

1 0

Alexander Barton : Rename "CloakModeHost" option to "CloakHostModeX"
by alex＠arthur.barton.de 11 Jun '12

11 Jun '12

Module: ngircd.git Branch: master Commit: 7b6b492bdd259c25c4477e33392510872107ca6a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7b6b492b… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 9 01:57:17 2012 +0200 Rename "CloakModeHost" option to "CloakHostModeX" --- src/ngircd/client.c | 3 ++- src/ngircd/conf.c | 10 +++++----- src/ngircd/conf.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 9861a0d..e203cdd 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -826,7 +826,8 @@ Client_MaskCloaked(CLIENT *Client) snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, - *Conf_CloakModeHost ? Conf_CloakModeHost : Client_ID(Client->introducer)); + *Conf_CloakHostModeX ? Conf_CloakHostModeX + : Client_ID(Client->introducer)); return Mask_Buffer; } /* Client_MaskCloaked */ diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 2a259eb..5f7b24f 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -358,7 +358,7 @@ Conf_Test( void ) printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper)); printf(" ChrootDir = %s\n", Conf_Chroot); printf(" CloakHost = %s\n", Conf_CloakHost); - printf(" CloakModeHost = %s\n", Conf_CloakModeHost); + printf(" CloakHostModeX = %s\n", Conf_CloakHostModeX); printf(" CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick)); #ifdef WANT_IPV6 printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); @@ -685,7 +685,7 @@ Set_Defaults(bool InitServers) #endif strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot)); strcpy(Conf_CloakHost, ""); - strcpy(Conf_CloakModeHost, ""); + strcpy(Conf_CloakHostModeX, ""); Conf_CloakUserToNick = false; Conf_ConnectIPv4 = true; #ifdef WANT_IPV6 @@ -1479,9 +1479,9 @@ Handle_OPTIONS(int Line, char *Var, char *Arg) Config_Error_TooLong(Line, Var); return; } - if (strcasecmp(Var, "CloakModeHost") == 0) { - len = strlcpy(Conf_CloakModeHost, Arg, sizeof(Conf_CloakModeHost)); - if (len >= sizeof(Conf_CloakModeHost)) + if (strcasecmp(Var, "CloakHostModeX") == 0) { + len = strlcpy(Conf_CloakHostModeX, Arg, sizeof(Conf_CloakHostModeX)); + if (len >= sizeof(Conf_CloakHostModeX)) Config_Error_TooLong(Line, Var); return; } diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 171a838..86f00fe 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -167,7 +167,7 @@ GLOBAL bool Conf_AllowRemoteOper; GLOBAL char Conf_CloakHost[CLIENT_ID_LEN]; /** Cloaked hostname for clients that did +x */ -GLOBAL char Conf_CloakModeHost[CLIENT_ID_LEN]; +GLOBAL char Conf_CloakHostModeX[CLIENT_ID_LEN]; /** Use nick name as user name? */ GLOBAL bool Conf_CloakUserToNick;

1 0

Alexander Barton : Describe "CloakHostModeX" in sample-ngircd. conf an ngircd.conf(5)
by alex＠arthur.barton.de 11 Jun '12

11 Jun '12

Module: ngircd.git Branch: master Commit: bf121ae95fa352d74ec710fda33c08148562a52c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bf121ae9… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 9 02:04:50 2012 +0200 Describe "CloakHostModeX" in sample-ngircd.conf an ngircd.conf(5) --- doc/sample-ngircd.conf.tmpl | 8 +++++++- man/ngircd.conf.5.tmpl | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index f696dc6..e8b2fb0 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -127,7 +127,13 @@ # Set this hostname for every client instead of the real one. # Please note: don't use the percentage sign ("%"), it is reserved for # future extensions! - ;CloakHost = irc.example.net + ;CloakHost = cloaked.host + + # Use this hostname for hostname cloaking on clients that have the + # user mode "+x" set, instead of the name of the server. + # Please note: don't use the percentage sign ("%"), it is reserved for + # future extensions! + ;CloakHostModeX = cloaked.user # Set every clients' user name to their nick name ;CloakUserToNick = yes diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 85cf73f..0473206 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -220,6 +220,17 @@ don't change. Don't use the percentage sign ("%"), it is reserved for future extensions! .RE .TP +\fBCloakHostModeX\fR (string) +Use this hostname for hostname cloaking on clients that have the user mode +"+x" set, instead of the name of the server. Default: empty, use the name +of the server. +.PP +.RS +.B Please note: +.br +Don't use the percentage sign ("%"), it is reserved for future extensions! +.RE +.TP \fBCloakUserToNick\fR (boolean) Set every clients' user name to their nick name and hide the one supplied by the IRC client. Default: no.

1 0

Alexander Barton : Merge branch 'bug124-CloakHostModeX'
by alex＠arthur.barton.de 11 Jun '12

11 Jun '12

Module: ngircd.git Branch: master Commit: bf5610a3b9ceef67da9777c5f4a72b9733124a33 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bf5610a3… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jun 11 10:44:02 2012 +0200 Merge branch 'bug124-CloakHostModeX' * bug124-CloakHostModeX: Describe "CloakHostModeX" in sample-ngircd.conf an ngircd.conf(5) Rename "CloakModeHost" option to "CloakHostModeX" Introduce new configuration option "CloakModeHost" This closes bug #124. ---

1 0

Alexander Barton : Update ChangeLog and NEWS files
by alex＠arthur.barton.de 09 Jun '12

09 Jun '12

Module: ngircd.git Branch: master Commit: 7bce6780ca0099f38efc801a7e613939cb90c99a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7bce6780… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 9 12:53:44 2012 +0200 Update ChangeLog and NEWS files --- ChangeLog | 23 +++++++++++++++++++++++ NEWS | 7 +++++++ 2 files changed, 30 insertions(+) diff --git a/ChangeLog b/ChangeLog index f7cc163..c90332f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,29 @@ -- ChangeLog -- +ngIRCd-dev + + - Correctly handle asynchronously re-established server links: a race + condition could let the daemon loose track of an already re-established + incoming server link while preparing its own outgoing connection. + Peers that both try to connect each other could have been affected. + - Log a debug message when SIGUSR2 is handled in debug mode. + - Only allow alphanumeric characters in user-supplied user names of + USER command and IDENT replies. + - Change wording of "TLS initialized" message to make it more consistent. + - Don't leak file descriptors on error path when creating "PID files". + - Add missing mode "r" to CHANMODES in 005 "ISUPPORT" numeric. + - Update doc/Modes.txt and doc/Platforms.txt documents. + - contrib/platformtest.sh: correctly detect Open64 C compiler and handle + "CC=xxx MAKE=yyy ./platformtest.sh" calling convention. + - Add instructions for setting up Atheme IRC services. + - Implement support for IRC capability handling, the new "CAP" command, + and capablity "multi-prefix" which allows both the NAME and WHO command + handlers to return more than one "class prefix" to the client. + - Update Xcode project files: reference missing documentation files. + - Fix: Don't ignore "permission denied" errors when enabling chroot. + - FAQ: enhance description of chroot setup. + ngIRCd Release 19.1 (2012-03-19) - Fix gcc warning (v4.6.3), initialize "list" variable to NULL. diff --git a/NEWS b/NEWS index 0889679..703ae76 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,13 @@ -- NEWS -- +ngIRCd-dev + + - Add instructions for setting up Atheme IRC services. + - Implement support for IRC capability handling, the new "CAP" command, + and capablity "multi-prefix" which allows both the NAME and WHO command + handlers to return more than one "class prefix" to the client. + ngIRCd Release 19.1 (2012-03-19) - Really include _all_ patches to build the Anope module into the

1 0

Alexander Barton : Correctly handle asynchronously re-established server links
by alex＠arthur.barton.de 09 Jun '12

09 Jun '12

Module: ngircd.git Branch: master Commit: 684e50f0a4d827965b61c4b9feeda403ec3c3b87 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=684e50f0… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 9 01:03:48 2012 +0200 Correctly handle asynchronously re-established server links Don't try to establish an outgoing server link after DNS lookup when this server re-connected on its own in the meantime. In addition, log a warning message if we try to update the connection index of an already connected server structure -- and ignore it. Up to now, both behaviour could lead to a race when the remote server connects to this daemon while it still prepares the outgoing connection: - The local server prepares the new outgoing connection ... - in the meantime the remote server becomes connected and registered. - Now the new outgoing connection overwrites the (correct) socket handle, - then the 2nd connection becomes disconnected: "already registered", - and the 1st connection becomes unhandled ("gets lost") because the configuration structure is reset because of the wrong socket handle. This patch hopefully fixes all these problems. --- src/ngircd/conf.c | 10 +++++++++- src/ngircd/conn.c | 12 ++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 5426900..f274eb8 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -492,6 +492,14 @@ Conf_SetServer( int ConfServer, CONN_ID Idx ) assert( ConfServer > NONE ); assert( Idx > NONE ); + if (Conf_Server[ConfServer].conn_id > NONE && + Conf_Server[ConfServer].conn_id != Idx) { + Log(LOG_ALERT, + "Trying to update connection index for already registered server \"%s\": %d/%d - ignored.", + Conf_Server[ConfServer].name, + Conf_Server[ConfServer].conn_id, Idx); + return; + } Conf_Server[ConfServer].conn_id = Idx; } diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 09f726c..06236fd 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -1935,6 +1935,14 @@ New_Server( int Server , ng_ipaddr_t *dest) assert( Server > NONE ); + /* Make sure that the remote server hasn't re-linked to this server + * asynchronously on its own */ + if (Conf_Server[Server].conn_id > NONE) { + Log(LOG_INFO, + "Connection to \"%s\" meanwhile re-established, aborting preparation."); + return; + } + if (!ng_ipaddr_tostr_r(dest, ip_str)) { Log(LOG_WARNING, "New_Server: Could not convert IP to string"); return; @@ -2008,7 +2016,7 @@ New_Server( int Server , ng_ipaddr_t *dest) Client_SetToken( c, TOKEN_OUTBOUND ); /* Register connection */ - Conf_Server[Server].conn_id = new_sock; + Conf_SetServer(Server, new_sock); My_Connections[new_sock].sock = new_sock; My_Connections[new_sock].addr = *dest; My_Connections[new_sock].client = c;

1 0

Alexander Barton : Log a debug message when SIGUSR2 is handled
by alex＠arthur.barton.de 08 Jun '12

08 Jun '12

Module: ngircd.git Branch: master Commit: 4a90959cb563e7c6ca57d32779074b448982c94f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a90959c… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jun 8 22:08:52 2012 +0200 Log a debug message when SIGUSR2 is handled --- src/ngircd/sighandlers.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index 427789c..efb41bc 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -218,8 +218,11 @@ Signal_Handler_BH(int Signal) break; #ifdef DEBUG case SIGUSR2: - if (NGIRCd_Debug) + if (NGIRCd_Debug) { + Log(LOG_INFO|LOG_snotice, + "Got SIGUSR2, dumping internal state ..."); Dump_State(); + } break; default: Log(LOG_DEBUG, "Got signal %d! Ignored.", Signal);

1 0

Alexander Barton : doc/Platforms.txt: more updates
by alex＠arthur.barton.de 07 Jun '12

07 Jun '12

Module: ngircd.git Branch: master Commit: 9b1cf420f1e8768166e823891d7897590bdec638 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9b1cf420… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jun 7 17:09:45 2012 +0200 doc/Platforms.txt: more updates Added: - armv6l/unkn./linux-gnueabi, gcc 4.4.5 - i686/pc/linux-gnu, gcc 2.7.2 Updated: - i386/pc/solaris2.11, gcc 4.2.3 Thanks to Götz Hoffart! --- doc/Platforms.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 87c8039..b8e33b5 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -26,6 +26,7 @@ list can be updated. Thanks for your help! Platform Compiler ngIRCd Date Tester C M T R See --------------------------- ------------ ---------- -------- ------ - - - - --- alpha/unknown/netbsd3.0 gcc 3.3.3 CVSHEAD 06-05-07 fw Y Y Y Y (3) +armv6l/unkn./linux-gnueabi gcc 4.4.5 19.1 12-06-04 goetz Y Y Y Y (5) armv7l/unkn./linux-gnueabi gcc 4.4.3 19.1 12-04-29 goetz Y Y Y Y (5) hppa/unknown/openbsd3.5 gcc 2.95.3 CVSHEAD 04-05-25 alex Y Y Y Y hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y @@ -36,7 +37,7 @@ i386/apple/darwin10.8.0 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) i386/apple/darwin11.3.0 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y i386/pc/solaris2.11 gcc 3.4.3 19 12-02-26 alex Y Y N Y (4) -i386/pc/solaris2.11 gcc 4.2.3 18 11-08-17 goetz Y Y Y Y (4) +i386/pc/solaris2.11 gcc 4.2.3 19.1 12-05-29 goetz Y Y Y Y (4) i386/unknown/freebsd5.2.1 gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y i386/unknown/freebsd6.2 gcc 3.4.6 19 12-02-26 alex Y Y Y Y (3) i386/unknown/freebsd7.3 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) @@ -50,6 +51,7 @@ 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 16 10-04-11 alex Y Y Y Y (3) i586/pc/interix3.5 gcc 3.3 19 12-02-29 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.7.2 19.1 12-05-30 goetz Y Y Y Y (1) 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) i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1)

1 0

Alexander Barton : NoticeAuth: Fix test if IDENT reply has been invalid
by alex＠arthur.barton.de 02 Jun '12

02 Jun '12

Module: ngircd.git Branch: master Commit: e7e47e77a3886c258368a14a8c0bb393280aac64 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e7e47e77… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 2 00:32:19 2012 +0200 NoticeAuth: Fix test if IDENT reply has been invalid This fixes conn.c: In function ‘cb_Read_Resolver_Result’: conn.c:2252: warning: comparison between pointer and integer --- src/ngircd/conn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4d77871..09f726c 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2249,7 +2249,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) if (Conf_NoticeAuth) { (void)Conn_WriteStr(i, "NOTICE AUTH :*** Got %sident response", - *ptr == NULL ? "" : "invalid "); + *ptr ? "invalid " : ""); } } else { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);

1 0

Alexander Barton : IDENT reply: only allow alphanumeric characters in user name
by alex＠arthur.barton.de 02 Jun '12

02 Jun '12

Module: ngircd.git Branch: master Commit: 695df6532ec717e5571e1ddc2c88a8c968603c5a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=695df653… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 2 00:24:53 2012 +0200 IDENT reply: only allow alphanumeric characters in user name Only alphanumeric characters are allowed in the user name, so ignore all IDENT replies that would violate this rule and use the one supplied by the USER command. --- src/ngircd/conn.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index b6e6280..4d77871 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2174,6 +2174,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) char *identptr; #ifdef IDENTAUTH char readbuf[HOST_LEN + 2 + CLIENT_USER_LEN]; + char *ptr; #else char readbuf[HOST_LEN + 1]; #endif @@ -2226,11 +2227,30 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) #ifdef IDENTAUTH ++identptr; if (*identptr) { - Log(LOG_INFO, "IDENT lookup for connection %d: \"%s\".", i, identptr); - Client_SetUser(c, identptr, true); - if (Conf_NoticeAuth) + ptr = identptr; + while (*ptr) { + if ((*ptr < '0' || *ptr > '9') && + (*ptr < 'A' || *ptr > 'Z') && + (*ptr < 'a' || *ptr > 'z')) + break; + ptr++; + } + if (*ptr) { + /* Erroneous IDENT reply */ + Log(LOG_NOTICE, + "Got invalid IDENT reply for connection %d! Ignored.", + i); + } else { + Log(LOG_INFO, + "IDENT lookup for connection %d: \"%s\".", + i, identptr); + Client_SetUser(c, identptr, true); + } + if (Conf_NoticeAuth) { (void)Conn_WriteStr(i, - "NOTICE AUTH :*** Got ident response"); + "NOTICE AUTH :*** Got %sident response", + *ptr == NULL ? "" : "invalid "); + } } else { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); if (Conf_NoticeAuth && Conf_Ident)

1 0

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates