Januar 2011 - ngIRCd GIT Updates

Alexander Barton : Clean up Validate_Prefix(); don' t send punctuation in ERROR commands
by alex＠arthur.barton.de 29 Jan '11

29 Jan '11

Module: ngircd.git Branch: master Commit: 493ccd57f41bea8c9bca5311ca597b37fadc9e7f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=493ccd57… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 29 16:05:55 2011 +0100 Clean up Validate_Prefix(); don't send punctuation in ERROR commands --- src/ngircd/conn.c | 4 ++-- src/ngircd/parse.c | 29 ++++++++++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index af79c13..032a6e9 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -980,7 +980,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie if (FwdMsg) Conn_WriteStr(Idx, "ERROR :%s", FwdMsg); else - Conn_WriteStr(Idx, "ERROR :Closing connection."); + Conn_WriteStr(Idx, "ERROR :Closing connection"); } /* Try to write out the write buffer. Note: Handle_Write() eventually @@ -1276,7 +1276,7 @@ New_Connection(int Sock) "Refused connection from %s: too may connections (%ld) from this IP address!", ip_str, cnt); Simple_Message(new_sock, - "ERROR :Connection refused, too many connections from your IP address!"); + "ERROR :Connection refused, too many connections from your IP address"); close(new_sock); return -1; } diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 479b300..7c56a03 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -178,7 +178,7 @@ Parse_Request( CONN_ID Idx, char *Request ) if( ! ptr ) { LogDebug("Connection %d: Parse error: prefix without command!?", Idx); - return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" ); + return Conn_WriteStr(Idx, "ERROR :Prefix without command"); } *ptr = '\0'; #ifndef STRICT_RFC @@ -278,8 +278,9 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) assert( client != NULL ); /* only validate if this connection is already registered */ - if(( Client_Type( client ) != CLIENT_USER ) && ( Client_Type( client ) != CLIENT_SERVER ) && ( Client_Type( client ) != CLIENT_SERVICE )) - { + if (Client_Type(client) != CLIENT_USER + && Client_Type(client) != CLIENT_SERVER + && Client_Type(client) != CLIENT_SERVICE) { /* not registered, ignore prefix */ Req->prefix = NULL; return true; @@ -287,19 +288,25 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) /* check if client in prefix is known */ c = Client_Search( Req->prefix ); - if( ! c ) - { - Log( LOG_ERR, "Invalid prefix \"%s\", client not known (connection %d, command %s)!?", Req->prefix, Idx, Req->command ); - if( ! Conn_WriteStr( Idx, "ERROR :Invalid prefix \"%s\", client not known!?", Req->prefix )) *Closed = true; + if (!c) { + Log(LOG_ERR, + "Invalid prefix \"%s\", client not known (connection %d, command \"%s\")!?", + Req->prefix, Idx, Req->command); + if (!Conn_WriteStr(Idx, + "ERROR :Invalid prefix \"%s\", client not known", + Req->prefix)) + *Closed = true; return false; } /* check if the client named in the prefix is expected * to come from that direction */ - if( Client_NextHop( c ) != client ) - { - Log( LOG_ERR, "Spoofed prefix \"%s\" from \"%s\" (connection %d, command %s)!", Req->prefix, Client_Mask( Conn_GetClient( Idx )), Idx, Req->command ); - Conn_Close( Idx, NULL, "Spoofed prefix", true); + if (Client_NextHop(c) != client) { + Log(LOG_ERR, + "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!", + Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx, + Req->command); + Conn_Close(Idx, NULL, "Spoofed prefix", true); *Closed = true; return false; }

1 0

Alexander Barton : Better check for invalid IRC+ PASS command
by alex＠arthur.barton.de 23 Jan '11

23 Jan '11

Module: ngircd.git Branch: master Commit: 8700f4d93cb50ebe7639e7a32e93b94c36ed3fae URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8700f4d9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 23 18:38:36 2011 +0100 Better check for invalid IRC+ PASS command Don't do a NULL-pointer dereference when a remote server using the IRC+ protocol sends an invalid PASS command without the required <serverversion> parameter ... --- src/ngircd/irc-login.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 73dd8d1..8af4df9 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -143,8 +143,8 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) if (type && strcmp(type, PROTOIRCPLUS) == 0) { /* The peer seems to be a server which supports the * IRC+ protocol (see doc/Protocol.txt). */ - serverver = ptr + 1; - flags = strchr(serverver, ':'); + serverver = ptr ? ptr + 1 : "?"; + flags = strchr(ptr ? serverver : impl, ':'); if (flags) { *flags = '\0'; flags++;

1 0

Alexander Barton : Read_Request(): don't access possibly free' d CLIENT structure
by alex＠arthur.barton.de 23 Jan '11

23 Jan '11

Module: ngircd.git Branch: master Commit: 765dc320f11f117d63e5285a903dfe8af4a48795 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=765dc320… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 23 15:14:18 2011 +0100 Read_Request(): don't access possibly free'd CLIENT structure Handle_Buffer() can shut down connections and remove clients, so after calling it, we have to make sure that our CLIENT pointer is still valid. --- src/ngircd/conn.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 98a0543..af79c13 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1455,16 +1455,21 @@ Read_Request( CONN_ID Idx ) /* Update connection statistics */ My_Connections[Idx].bytes_in += len; + My_Connections[Idx].bps += Handle_Buffer(Idx); + + /* Make sure that there is still a valid client registered */ + c = Conn_GetClient(Idx); + if (!c) + return; /* Update timestamp of last data received if this connection is * registered as a user, server or service connection. Don't update * otherwise, so users have at least Conf_PongTimeout seconds time to * register with the IRC server -- see Check_Connections(). * Update "lastping", too, if time shifted backwards ... */ - c = Conn_GetClient(Idx); - if (c && (Client_Type(c) == CLIENT_USER - || Client_Type(c) == CLIENT_SERVER - || Client_Type(c) == CLIENT_SERVICE)) { + if (Client_Type(c) == CLIENT_USER + || Client_Type(c) == CLIENT_SERVER + || Client_Type(c) == CLIENT_SERVICE) { t = time(NULL); if (My_Connections[Idx].lastdata != t) My_Connections[Idx].bps = 0; @@ -1475,7 +1480,6 @@ Read_Request( CONN_ID Idx ) } /* Look at the data in the (read-) buffer of this connection */ - My_Connections[Idx].bps += Handle_Buffer(Idx); if (Client_Type(c) != CLIENT_SERVER && Client_Type(c) != CLIENT_UNKNOWNSERVER && Client_Type(c) != CLIENT_SERVICE

1 0

Alexander Barton : ngircd-test2.conf: really disable Ident and PAM ...
by alex＠arthur.barton.de 19 Jan '11

19 Jan '11

Module: ngircd.git Branch: master Commit: 9fff9f6a2b1f113513b95eae3eaa3c55052f8b91 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9fff9f6a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 19 01:19:40 2011 +0100 ngircd-test2.conf: really disable Ident and PAM ... --- src/testsuite/ngircd-test2.conf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf index 585d9bb..54c1232 100644 --- a/src/testsuite/ngircd-test2.conf +++ b/src/testsuite/ngircd-test2.conf @@ -12,8 +12,8 @@ MaxJoins = 4 [Features] - Ident = yes - PAM = yes + Ident = no + PAM = no [Operator] Name = TestOp

1 0

Alexander Barton : Log "Can't read MOTD file" as "configuration error"
by alex＠arthur.barton.de 18 Jan '11

18 Jan '11

Module: ngircd.git Branch: master Commit: b856a580511a0e25be375bd83efd480c61e62a80 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b856a580… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 18 23:44:07 2011 +0100 Log "Can't read MOTD file" as "configuration error" Now this error message is displayed in the console without debug prefix when running the configuration test (--configtest). --- src/ngircd/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index db91a57..6c0e351 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -668,7 +668,7 @@ Read_Motd(const char *filename) fp = fopen(filename, "r"); if (!fp) { - Log(LOG_WARNING, "Can't read MOTD file \"%s\": %s", + Config_Error(LOG_WARNING, "Can't read MOTD file \"%s\": %s", filename, strerror(errno)); return; }

1 0

Alexander Barton : Allow "Port = 0" in [Server] blocks
by alex＠arthur.barton.de 18 Jan '11

18 Jan '11

Module: ngircd.git Branch: master Commit: 8927700b221ba3cffbde50005319868efbdb1f3e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8927700b… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 18 22:45:01 2011 +0100 Allow "Port = 0" in [Server] blocks Port number 0 marks remote servers that try to connect to this daemon, but where this daemon never tries to establis a connection on its own: only incoming connections are allowed. --- src/ngircd/conf.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index e1fb73b..db91a57 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1361,11 +1361,12 @@ Handle_SERVER( int Line, char *Var, char *Arg ) if( strcasecmp( Var, "Port" ) == 0 ) { /* Port to which this server should connect */ port = atol( Arg ); - if( port > 0 && port < 0xFFFF ) + if (port >= 0 && port < 0xFFFF) New_Server.port = (UINT16)port; else - Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", - NGIRCd_ConfFile, Line, port ); + Config_Error(LOG_ERR, + "%s, line %d (section \"Server\"): Illegal port number %ld!", + NGIRCd_ConfFile, Line, port ); return; } #ifdef SSL_SUPPORT

1 0

Alexander Barton : conf: fix 'Value of "..." is not a number!' for negative values
by alex＠arthur.barton.de 18 Jan '11

18 Jan '11

Module: ngircd.git Branch: master Commit: 58a4dae56dd34e41b32dd3e5cede03a7ea5c7bb5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=58a4dae5… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 18 22:41:27 2011 +0100 conf: fix 'Value of "..." is not a number!' for negative values Don't use isdigit() function any more, because it only checks the first character of the variable value and because it doesn't know about the minus sign which is required e.g. for "Group = -1". --- configure.in | 2 +- src/ngircd/conf.c | 41 ++++++++++++++--------------------------- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/configure.in b/configure.in index 9a36843..5e33496 100644 --- a/configure.in +++ b/configure.in @@ -162,7 +162,7 @@ AC_CHECK_FUNCS([ \ bind gethostbyaddr gethostbyname gethostname inet_ntoa \ setsid setsockopt socket strcasecmp waitpid],,AC_MSG_ERROR([required function missing!])) -AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_aton isdigit sigaction sigprocmask snprintf \ +AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_aton sigaction sigprocmask snprintf \ vsnprintf strdup strlcpy strlcat strtok_r) # -- Configuration options -- diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fa22df0..e1fb73b 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1055,11 +1055,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) pwd = getpwnam( Arg ); if( pwd ) Conf_UID = pwd->pw_uid; else { -#ifdef HAVE_ISDIGIT - if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); - else -#endif Conf_UID = (unsigned int)atoi( Arg ); + if (!Conf_UID && strcmp(Arg, "0")) + Config_Error_NaN(Line, Var); } return; } @@ -1068,11 +1066,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) grp = getgrnam( Arg ); if( grp ) Conf_GID = grp->gr_gid; else { -#ifdef HAVE_ISDIGIT - if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); - else -#endif - Conf_GID = (unsigned int)atoi( Arg ); + Conf_GID = (unsigned int)atoi(Arg); + if (!Conf_GID && strcmp(Arg, "0")) + Config_Error_NaN( Line, Var ); } return; } @@ -1153,29 +1149,23 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) } if( strcasecmp( Var, "MaxConnections" ) == 0 ) { /* Maximum number of connections. 0 -> "no limit". */ -#ifdef HAVE_ISDIGIT - if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var); - else -#endif Conf_MaxConnections = atol( Arg ); + if (!Conf_MaxConnections && strcmp(Arg, "0")) + Config_Error_NaN(Line, Var); return; } if( strcasecmp( Var, "MaxConnectionsIP" ) == 0 ) { /* Maximum number of simultaneous connections from one IP. 0 -> "no limit" */ -#ifdef HAVE_ISDIGIT - if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); - else -#endif Conf_MaxConnectionsIP = atoi( Arg ); + if (!Conf_MaxConnectionsIP && strcmp(Arg, "0")) + Config_Error_NaN(Line, Var); return; } if( strcasecmp( Var, "MaxJoins" ) == 0 ) { /* Maximum number of channels a user can join. 0 -> "no limit". */ -#ifdef HAVE_ISDIGIT - if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); - else -#endif Conf_MaxJoins = atoi( Arg ); + if (!Conf_MaxJoins && strcmp(Arg, "0")) + Config_Error_NaN(Line, Var); return; } if( strcasecmp( Var, "MaxNickLength" ) == 0 ) { @@ -1386,12 +1376,9 @@ Handle_SERVER( int Line, char *Var, char *Arg ) #endif if( strcasecmp( Var, "Group" ) == 0 ) { /* Server group */ -#ifdef HAVE_ISDIGIT - if( ! isdigit( (int)*Arg )) - Config_Error_NaN( Line, Var ); - else -#endif New_Server.group = atoi( Arg ); + if (!New_Server.group && strcmp(Arg, "0")) + Config_Error_NaN(Line, Var); return; } if( strcasecmp( Var, "Passive" ) == 0 ) { @@ -1479,7 +1466,7 @@ Handle_CHANNEL(int Line, char *Var, char *Arg) if( strcasecmp( Var, "MaxUsers" ) == 0 ) { /* maximum user limit, mode l */ chan->maxusers = (unsigned long) atol(Arg); - if (chan->maxusers == 0) + if (!chan->maxusers && strcmp(Arg, "0")) Config_Error_NaN(Line, Var); return; }

1 0

Alexander Barton : Don't read MOTD file twice
by alex＠arthur.barton.de 18 Jan '11

18 Jan '11

Module: ngircd.git Branch: master Commit: 914d6a26d85ecaf7e0962c40392769cf4764e987 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=914d6a26… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 18 22:01:27 2011 +0100 Don't read MOTD file twice The MOTD file is read in Read_Config(), so don't read it when handling the "MotdFile" configuration variable. Instead make sure that it is initialized properly when (re-)reading the configuration. --- src/ngircd/conf.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 32846fa..fa22df0 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -641,6 +641,9 @@ Set_Defaults(bool InitServers) for (i = 0; i < MAX_SERVERS; Init_Server_Struct(&Conf_Server[i++])); } + + /* Free MOTD; this is important when reloading the configuration */ + array_free(&Conf_Motd); } /* Set_Defaults */ @@ -1016,7 +1019,6 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) len = strlcpy( Conf_MotdFile, Arg, sizeof( Conf_MotdFile )); if (len >= sizeof( Conf_MotdFile )) Config_Error_TooLong( Line, Var ); - Read_Motd(Arg); return; } if( strcasecmp( Var, "MotdPhrase" ) == 0 ) {

1 0

Alexander Barton : Add [Features] section to ngircd-test{1|2}.conf
by alex＠arthur.barton.de 18 Jan '11

18 Jan '11

Module: ngircd.git Branch: master Commit: c98e794b38684d39d51a964e5b1670908be01691 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c98e794b… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 18 21:39:48 2011 +0100 Add [Features] section to ngircd-test{1|2}.conf Fix commit 5a34bb203a: It is not enough to strip the "No" prefix from "Ident" and "PAM", but we have to introduce the new [Features] section to fix all warning messages of ngIRCd. Variables "Ident" and "PAM" in [Global] are completely wrong :-( --- src/testsuite/ngircd-test1.conf | 2 ++ src/testsuite/ngircd-test2.conf | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/testsuite/ngircd-test1.conf b/src/testsuite/ngircd-test1.conf index 8e154ef..43851f6 100644 --- a/src/testsuite/ngircd-test1.conf +++ b/src/testsuite/ngircd-test1.conf @@ -10,6 +10,8 @@ MaxConnectionsIP = 0 OperCanUseMode = yes MaxJoins = 4 + +[Features] Ident = no PAM = no diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf index 2d788d6..585d9bb 100644 --- a/src/testsuite/ngircd-test2.conf +++ b/src/testsuite/ngircd-test2.conf @@ -10,6 +10,8 @@ MaxConnectionsIP = 0 OperCanUseMode = yes MaxJoins = 4 + +[Features] Ident = yes PAM = yes

1 0

Alexander Barton : Enable WHOIS command to return information about services
by alex＠arthur.barton.de 18 Jan '11

18 Jan '11

Module: ngircd.git Branch: master Commit: a990bd72ece1569ec24b598cfa7ac83d25a3cb8f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a990bd72… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 18 21:04:55 2011 +0100 Enable WHOIS command to return information about services --- src/ngircd/irc-info.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 638a8e9..9640a30 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -914,6 +914,15 @@ IRC_WHO( CLIENT *Client, REQUEST *Req ) } /* IRC_WHO */ +/** + * Handler for the IRC "WHOIS" command. + * + * See RFC 2812, 3.6.2 "Whois query". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_WHOIS( CLIENT *Client, REQUEST *Req ) { @@ -926,11 +935,17 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); /* Bad number of parameters? */ - if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc < 1 || Req->argc > 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); /* Search client */ - c = Client_Search( Req->argv[Req->argc - 1] ); - if(( ! c ) || ( Client_Type( c ) != CLIENT_USER )) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[Req->argc - 1] ); + c = Client_Search(Req->argv[Req->argc - 1]); + if (!c || (Client_Type(c) != CLIENT_USER + && Client_Type(c) != CLIENT_SERVICE)) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), + Req->argv[Req->argc - 1]); /* Search sender of the WHOIS */ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );

1 0