ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

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

Alexander Barton : Add some type casts to random() and srandom() functions
by alex＠arthur.barton.de 12 Apr '11

12 Apr '11

Module: ngircd.git Branch: master Commit: e70e81460b99d6b00cb6d13d7ce7537dcd4965f8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e70e8146… Author: Alexander Barton <alex(a)barton.de> Date: Tue Apr 12 21:23:14 2011 +0200 Add some type casts to random() and srandom() functions This fixes two gcc warnings (on Mac OS X): "warning: implicit conversion shortens 64-bit value into a 32-bit value" --- src/ngircd/proc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index 557543c..217eb6d 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -62,7 +62,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; } - seed = random(); + seed = (unsigned int)random(); pid = fork(); switch (pid) { case -1: @@ -73,7 +73,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; case 0: /* New child process: */ - srandom(seed ^ time(NULL) ^ getpid()); + srandom(seed ^ (unsigned int)time(NULL) ^ getpid()); Signals_Exit(); signal(SIGTERM, Proc_GenericSignalHandler); signal(SIGALRM, Proc_GenericSignalHandler);

1 0

Florian Westphal : ngircd: improve rng initialisation
by fw＠arthur.barton.de 28 Mär '11

28 Mär '11

Module: ngircd.git Branch: master Commit: 5acb90fafc9dea012967751fb6a5c7847da1820a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5acb90fa… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Mar 27 22:48:01 2011 +0200 ngircd: improve rng initialisation we do not need this for cryptographic purposes, but we can do better than plain srandom(getpid()). Also, keep in mind that rng state is inherited across fork(), so re-init it in the child. --- src/ngircd/ngircd.c | 37 +++++++++++++++++++++++++++++++++++-- src/ngircd/proc.c | 3 +++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 74a9988..4cac909 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -60,6 +60,8 @@ static void Pidfile_Delete PARAMS(( void )); static void Fill_Version PARAMS(( void )); +static void Random_Init PARAMS(( void )); + static void Setup_FDStreams PARAMS(( int fd )); static bool NGIRCd_Init PARAMS(( bool )); @@ -262,6 +264,8 @@ main( int argc, const char *argv[] ) NGIRCd_SignalRestart = false; NGIRCd_SignalQuit = false; + Random_Init(); + /* Initialize modules, part I */ Log_Init( ! NGIRCd_NoDaemon ); Conf_Init( ); @@ -289,8 +293,6 @@ main( int argc, const char *argv[] ) exit(1); } - srandom(getpid()); - /* Create protocol and server identification. The syntax * used by ngIRCd in PASS commands and the known "extended * flags" are described in doc/Protocol.txt. */ @@ -564,6 +566,37 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) } /* NGIRCd_getNobodyID */ +static bool +Random_Init_Kern(const char *file) +{ + unsigned int seed; + bool ret = false; + int fd = open(file, O_RDONLY); + if (fd >= 0) { + if (read(fd, &seed, sizeof(seed)) == sizeof(seed)) + ret = true; + close(fd); + srandom(seed); + } + return ret; +} + +/** + * Initialize libc random(3) number generator + */ +static void +Random_Init(void) +{ + if (Random_Init_Kern("/dev/urandom")) + return; + if (Random_Init_Kern("/dev/random")) + return; + if (Random_Init_Kern("/dev/arandom")) + return; + srandom(random() ^ getpid() ^ time(NULL)); +} + + /** * Initialize ngIRCd daemon. * diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index aace805..557543c 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -50,6 +50,7 @@ GLOBAL pid_t Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout) { pid_t pid; + unsigned int seed; assert(proc != NULL); assert(pipefds != NULL); @@ -61,6 +62,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; } + seed = random(); pid = fork(); switch (pid) { case -1: @@ -71,6 +73,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; case 0: /* New child process: */ + srandom(seed ^ time(NULL) ^ getpid()); Signals_Exit(); signal(SIGTERM, Proc_GenericSignalHandler); signal(SIGALRM, Proc_GenericSignalHandler);

1 0

Alexander Barton : Merge branch 'AuthPing'
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: d61fbfc6e3a0a85ced036d8c1fa161fab0d9ba3d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d61fbfc6… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 27 20:58:18 2011 +0200 Merge branch 'AuthPing' * AuthPing: Add documentation for "RequireAuthPing" configuration option New configuration option "RequireAuthPing": PING-PONG on login ---

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