- ngIRCd GIT Updates - lists.barton.de

Florian Westphal : conn: avoid needlesly scary 'buffer overflow' messages
by fw＠arthur.barton.de 30 Apr '11

30 Apr '11

Module: ngircd.git Branch: master Commit: 0bb892bb5fe1f0d9d783808d211c039e11e12f3b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0bb892bb… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Apr 29 23:10:01 2011 +0200 conn: avoid needlesly scary 'buffer overflow' messages When the write buffer space grows too large, ngircd has to disconnect the client to avoid wasting too much memory. ngircd logs this with a scary 'write buffer overflow' message. Change this to a more descriptive wording. --- src/ngircd/conn-zip.c | 6 +++--- src/ngircd/conn.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c index fa3a11e..0a3c17c 100644 --- a/src/ngircd/conn-zip.c +++ b/src/ngircd/conn-zip.c @@ -108,8 +108,8 @@ Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len ) * otherwise the zip wbuf would grow too large */ buflen = array_bytes(&My_Connections[Idx].zip.wbuf); if (buflen + Len >= WRITEBUFFER_SLINK_LEN) { - Log(LOG_ALERT, "Zip Write Buffer overflow: %lu bytes\n", buflen + Len); - Conn_Close(Idx, "Zip Write buffer overflow", NULL, false); + Log(LOG_ALERT, "Zip Write buffer space exhausted: %lu bytes", buflen + Len); + Conn_Close(Idx, "Zip Write buffer space exhausted", NULL, false); return false; } return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len); @@ -158,7 +158,7 @@ Zip_Flush( CONN_ID Idx ) if (out->avail_out <= 0) { /* Not all data was compressed, because data became * bigger while compressing it. */ - Log (LOG_ALERT, "Compression error: buffer overvlow!?"); + Log(LOG_ALERT, "Compression error: buffer overflow!?"); Conn_Close(Idx, "Compression error!", NULL, false); return false; } diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index cc4364c..26e47c1 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -972,10 +972,10 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) if (array_bytes(&My_Connections[Idx].wbuf) + Len >= writebuf_limit) { Log(LOG_NOTICE, - "Write buffer overflow (connection %d, limit is %lu bytes, %lu bytes new, %lu bytes pending)!", + "Write buffer space exhausted (connection %d, limit is %lu bytes, %lu bytes new, %lu bytes pending)", Idx, writebuf_limit, Len, (unsigned long)array_bytes(&My_Connections[Idx].wbuf)); - Conn_Close(Idx, "Write buffer overflow!", NULL, false); + Conn_Close(Idx, "Write buffer space exhausted", NULL, false); return false; } @@ -1525,9 +1525,9 @@ Read_Request( CONN_ID Idx ) { /* Read buffer is full */ Log(LOG_ERR, - "Receive buffer overflow (connection %d): %d bytes!", + "Receive buffer space exhausted (connection %d): %d bytes", Idx, array_bytes(&My_Connections[Idx].rbuf)); - Conn_Close( Idx, "Receive buffer overflow!", NULL, false ); + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); return; } @@ -1563,7 +1563,7 @@ Read_Request( CONN_ID Idx ) Log(LOG_ERR, "Could not append recieved data to zip input buffer (connn %d): %d bytes!", Idx, len); - Conn_Close(Idx, "Receive buffer overflow!", NULL, + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); return; } @@ -1572,7 +1572,7 @@ Read_Request( CONN_ID Idx ) { if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) { Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len ); - Conn_Close( Idx, "Receive buffer overflow!", NULL, false ); + Conn_Close(Idx, "Receive buffer space exhausted", NULL, false ); } }

1 0

Florian Westphal : parse: fix logical expression testing for non RFC1459 links
by fw＠arthur.barton.de 30 Apr '11

30 Apr '11

Module: ngircd.git Branch: master Commit: 05748aa5eeaf75438a0bb238967667605fe4d52e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=05748aa5… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Apr 29 23:15:05 2011 +0200 parse: fix logical expression testing for non RFC1459 links parse.c:284: warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' The expression looks dubious, this should probably be an if-not-set, then... test. --- src/ngircd/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index d7dbffc..c260391 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -280,7 +280,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) assert( client != NULL ); if (!Req->prefix && Client_Type(client) == CLIENT_SERVER - && !Conn_Options(Idx) & CONN_RFC1459 + && !(Conn_Options(Idx) & CONN_RFC1459) && strcasecmp(Req->command, "ERROR") != 0 && strcasecmp(Req->command, "PING") != 0) {

1 0

Alexander Barton : Only require server prefixes on non RFC1459 links
by alex＠arthur.barton.de 29 Apr '11

29 Apr '11

Module: ngircd.git Branch: master Commit: c26ca7773bfc92ca41344a0994bee45ec917b261 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c26ca777… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 29 12:11:01 2011 +0200 Only require server prefixes on non RFC1459 links Not all servers (and services!) using the RFC1459 protocol style send prefixes on all commands; so don't require them to do so. This relaxes the requirements introduced by commit 15775e679. --- src/ngircd/parse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 8f5e601..d7dbffc 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -280,6 +280,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) assert( client != NULL ); if (!Req->prefix && Client_Type(client) == CLIENT_SERVER + && !Conn_Options(Idx) & CONN_RFC1459 && strcasecmp(Req->command, "ERROR") != 0 && strcasecmp(Req->command, "PING") != 0) {

1 0

Alexander Barton : Merge branch 'master' of git://arthur.barton.de/ ngircd-alex
by alex＠arthur.barton.de 26 Apr '11

26 Apr '11

Module: ngircd.git Branch: master Commit: 1cb2f5739d867502c45cad1c8edfa4c5dcd47933 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1cb2f573… Author: Alexander Barton <alex(a)barton.de> Date: Tue Apr 26 12:04:22 2011 +0200 Merge branch 'master' of git://arthur.barton.de/ngircd-alex * 'master' of git://arthur.barton.de/ngircd-alex: Do reverse lookups using the AF of the incoming connection resolve: fix reverse lookups of client connections with ConnectIPv6=no ---

1 0

Alexander Barton : Mac OS X: install on root volume only, and set correct permissions
by alex＠arthur.barton.de 26 Apr '11

26 Apr '11

Module: ngircd.git Branch: master Commit: 66315cab9aaf6f9c2acf9fae86f577dc8a30da23 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=66315cab… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 16 15:18:43 2011 +0200 Mac OS X: install on root volume only, and set correct permissions Update Mac OS X Installer.app description bundle, so that the ngIRCd package can only be installed on the root volume ("/"); and make sure that all installed files and directories have correct ownership and permissions. --- contrib/MacOSX/ngIRCd.pmdoc/01ngircd-contents.xml | 2 +- contrib/MacOSX/ngIRCd.pmdoc/01ngircd.xml | 2 +- contrib/MacOSX/ngIRCd.pmdoc/02de-contents.xml | 2 +- contrib/MacOSX/ngIRCd.pmdoc/02de.xml | 2 +- contrib/MacOSX/ngIRCd.pmdoc/index.xml | 13 ++++++------- 5 files changed, 10 insertions(+), 11 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=6631…

1 0

Alexander Barton : Do reverse lookups using the AF of the incoming connection
by alex＠arthur.barton.de 26 Apr '11

26 Apr '11

Module: ngircd.git Branch: master Commit: 160f5725a6646d432f70fe8b677ffdbcbdeb02ce URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=160f5725… Author: Alexander Barton <alex(a)barton.de> Date: Tue Apr 26 11:09:59 2011 +0200 Do reverse lookups using the AF of the incoming connection This fixes errors like this one: Address mismatch: 2001:1234:abcd:1::1 != 192.168.1.1 --- src/ngircd/resolve.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index ff40b8d..9b17af9 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -380,7 +380,7 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd) if (!ReverseLookup(Addr, hostname, sizeof(hostname))) goto dns_done; - if (ForwardLookup(hostname, &resolved_addr, AF_UNSPEC)) { + if (ForwardLookup(hostname, &resolved_addr, ng_ipaddr_af(Addr))) { if (!Addr_in_list(&resolved_addr, Addr)) { Log_Forgery_WrongIP(tmp_ip_str, hostname); strlcpy(hostname, tmp_ip_str, sizeof(hostname));

1 0

Florian Westphal : resolve: fix reverse lookups of client connections with ConnectIPv6=no
by fw＠arthur.barton.de 25 Apr '11

25 Apr '11

Module: ngircd.git Branch: master Commit: e4e1595bffdb6c43cd163ae576ee9715b859e494 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e4e1595b… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Apr 25 18:00:10 2011 +0200 resolve: fix reverse lookups of client connections with ConnectIPv6=no We re-use the same helper function for both forward lookups (when we want to connect to a peer server) and for validation of reverse loopups (where we make a lookup on the hostname returned by a reverse lookup on the IP address that connected). Problem: When ConnectIPv6=no, the forward lookup helper sets the adderss family to AF_INET, and, if out client connected via ipv6, we fail to validate the result. Thus move the ConnectIPvX check out of the helper. --- src/ngircd/resolve.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 9aeb68e..ff40b8d 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -236,7 +236,7 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen) * @return true if lookup successful, false if domain name not found */ static bool -ForwardLookup(const char *hostname, array *IpAddr) +ForwardLookup(const char *hostname, array *IpAddr, int af) { ng_ipaddr_t addr; @@ -245,23 +245,13 @@ ForwardLookup(const char *hostname, array *IpAddr) struct addrinfo *a, *ai_results; static struct addrinfo hints; -#ifndef WANT_IPV6 - hints.ai_family = AF_INET; -#endif #ifdef AI_ADDRCONFIG /* glibc has this, but not e.g. netbsd 4.0 */ hints.ai_flags = AI_ADDRCONFIG; #endif hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; + hints.ai_family = af; -#ifdef WANT_IPV6 - assert(Conf_ConnectIPv6 || Conf_ConnectIPv4); - - if (!Conf_ConnectIPv6) - hints.ai_family = AF_INET; - if (!Conf_ConnectIPv4) - hints.ai_family = AF_INET6; -#endif memset(&addr, 0, sizeof(addr)); res = getaddrinfo(hostname, NULL, &hints, &ai_results); @@ -390,7 +380,7 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd) if (!ReverseLookup(Addr, hostname, sizeof(hostname))) goto dns_done; - if (ForwardLookup(hostname, &resolved_addr)) { + if (ForwardLookup(hostname, &resolved_addr, AF_UNSPEC)) { if (!Addr_in_list(&resolved_addr, Addr)) { Log_Forgery_WrongIP(tmp_ip_str, hostname); strlcpy(hostname, tmp_ip_str, sizeof(hostname)); @@ -427,6 +417,7 @@ Do_ResolveName( const char *Host, int w_fd ) /* Resolver sub-process: resolve name and write result into pipe * to parent. */ array IpAddrs; + int af; #ifdef DEBUG ng_ipaddr_t *addr; size_t len; @@ -434,8 +425,19 @@ Do_ResolveName( const char *Host, int w_fd ) Log_Subprocess(LOG_DEBUG, "Now resolving \"%s\" ...", Host); array_init(&IpAddrs); - /* Resolve hostname */ - if (!ForwardLookup(Host, &IpAddrs)) { + +#ifdef WANT_IPV6 + af = AF_UNSPEC; + assert(Conf_ConnectIPv6 || Conf_ConnectIPv4); + + if (!Conf_ConnectIPv6) + af = AF_INET; + if (!Conf_ConnectIPv4) + af = AF_INET6; +#else + af = AF_INET; +#endif + if (!ForwardLookup(Host, &IpAddrs, af)) { close(w_fd); return; }

1 0

Alexander Barton : Mac OS X: update installer texts and add logo.
by alex＠arthur.barton.de 16 Apr '11

16 Apr '11

Module: ngircd.git Branch: master Commit: 67a9d994e33e3adbb32019a199678e84537a040c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=67a9d994… Author: Alexander Barton <alex(a)barton.de> Date: Thu Apr 14 11:24:07 2011 +0200 Mac OS X: update installer texts and add logo. --- contrib/MacOSX/ngIRCd.pmdoc/01ngircd.xml | 2 +- contrib/MacOSX/ngIRCd.pmdoc/02de.xml | 2 +- contrib/MacOSX/ngIRCd.pmdoc/index.xml | 89 +++++++++++++++++++++++------- contrib/Makefile.am | 2 +- contrib/ngIRCd-Logo.gif | Bin 0 -> 1975 bytes 5 files changed, 72 insertions(+), 23 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=67a9…

1 0

Alexander Barton : Doxygen'ify conf.c
by alex＠arthur.barton.de 12 Apr '11

12 Apr '11

Module: ngircd.git Branch: master Commit: 1cd8d7f3867c5548ed47626c232fa5dcef411469 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1cd8d7f3… Author: Alexander Barton <alex(a)barton.de> Date: Tue Apr 12 23:15:29 2011 +0200 Doxygen'ify conf.c --- src/ngircd/conf.c | 374 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 292 insertions(+), 82 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=1cd8…

1 0

Alexander Barton : New function Config_Error_Section(); and code cleanup
by alex＠arthur.barton.de 12 Apr '11

12 Apr '11

Module: ngircd.git Branch: master Commit: 9a102ca96b7d2cbecdbe1a7fcec1444cad22d50b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9a102ca9… Author: Alexander Barton <alex(a)barton.de> Date: Tue Apr 12 21:55:32 2011 +0200 New function Config_Error_Section(); and code cleanup --- src/ngircd/conf.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index a00049e..19d22d1 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 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 @@ -72,6 +72,8 @@ static void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg )); static void Config_Error PARAMS(( const int Level, const char *Format, ... )); static void Config_Error_NaN PARAMS(( const int LINE, const char *Value )); +static void Config_Error_Section PARAMS(( const int Line, const char *Item, + const char *Section )); static void Config_Error_TooLong PARAMS(( const int LINE, const char *Value )); static void Init_Server_Struct PARAMS(( CONF_SERVER *Server )); @@ -973,11 +975,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) struct passwd *pwd; struct group *grp; size_t len; - + assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - + if( strcasecmp( Var, "Name" ) == 0 ) { /* Server name */ len = strlcpy( Conf_ServerName, Arg, sizeof( Conf_ServerName )); @@ -1271,9 +1273,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) return; } #endif - Config_Error(LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", - NGIRCd_ConfFile, Line, Var); -} /* Handle_GLOBAL */ + + Config_Error_Section(Line, Var, "Global"); +} static void @@ -1301,9 +1303,7 @@ Handle_FEATURES(int Line, char *Var, char *Arg) return; } - Config_Error(LOG_ERR, - "%s, line %d (section \"Features\"): Unknown variable \"%s\"!", - NGIRCd_ConfFile, Line, Var); + Config_Error_Section(Line, Var, "Options"); } static void @@ -1343,17 +1343,16 @@ Handle_OPERATOR( int Line, char *Var, char *Arg ) op->mask = strdup_warn( Arg ); return; } - Config_Error( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", - NGIRCd_ConfFile, Line, Var ); -} /* Handle_OPERATOR */ + Config_Error_Section(Line, Var, "Operator"); +} static void Handle_SERVER( int Line, char *Var, char *Arg ) { long port; size_t len; - + assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); @@ -1439,9 +1438,8 @@ Handle_SERVER( int Line, char *Var, char *Arg ) return; } - Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!", - NGIRCd_ConfFile, Line, Var ); -} /* Handle_SERVER */ + Config_Error_Section(Line, Var, "Server"); +} static bool @@ -1523,10 +1521,8 @@ Handle_CHANNEL(int Line, char *Var, char *Arg) return; } - Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!", - NGIRCd_ConfFile, Line, Var ); -} /* Handle_CHANNEL */ - + Config_Error_Section(Line, Var, "Channel"); +} static bool Validate_Config(bool Configtest, bool Rehash) @@ -1634,6 +1630,12 @@ Config_Error_TooLong ( const int Line, const char *Item ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" too long!", NGIRCd_ConfFile, Line, Item ); } +static void +Config_Error_Section(const int Line, const char *Item, const char *Section) +{ + Config_Error(LOG_ERR, "%s, line %d (section \"%s\"): Unknown variable \"%s\"!", + NGIRCd_ConfFile, Line, Section, Item); +} static void Config_Error_NaN( const int Line, const char *Item ) @@ -1642,7 +1644,6 @@ Config_Error_NaN( const int Line, const char *Item ) NGIRCd_ConfFile, Line, Item ); } - #ifdef PROTOTYPES static void Config_Error( const int Level, const char *Format, ... ) #else @@ -1666,7 +1667,7 @@ va_dcl #endif vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); va_end( ap ); - + /* During "normal operations" the log functions of the daemon should * be used, but during testing of the configuration file, all messages * should go directly to the console: */

1 0