X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fresolve.c;h=c7e600381e81b571ded2cd343887529418e7d59c;hp=4a6f2e14dce2fc3e8a7e2781ee0bb75fdaa10953;hb=48326e061aacd954e24f76c53ded10448cbc28eb;hpb=4db29b007689d34adeaca8cbe8676f7c2aedc2ab diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 4a6f2e14..c7e60038 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -1,20 +1,22 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex@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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. - * - * Asynchronous resolver */ +#define RESOLVER_TIMEOUT (Conf_PongTimeout*3)/4 #include "portab.h" -static char UNUSED id[] = "$Id: resolve.c,v 1.20 2005/09/11 11:42:48 fw Exp $"; +/** + * @file + * Asynchronous resolver + */ #include "imp.h" #include @@ -24,8 +26,8 @@ static char UNUSED id[] = "$Id: resolve.c,v 1.20 2005/09/11 11:42:48 fw Exp $"; #include #include #include -#include #include +#include #ifdef IDENTAUTH #ifdef HAVE_IDENT_H @@ -33,328 +35,429 @@ static char UNUSED id[] = "$Id: resolve.c,v 1.20 2005/09/11 11:42:48 fw Exp $"; #endif #endif +#include "array.h" #include "conn.h" +#include "conf.h" #include "defines.h" #include "log.h" +#include "ng_ipaddr.h" #include "exp.h" #include "resolve.h" #include "io.h" -#ifdef IDENTAUTH -static void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int Sock, int w_fd )); -#else -static void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int w_fd )); -#endif - -static void Do_ResolveName PARAMS(( char *Host, int w_fd )); +static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd )); +static void Do_ResolveName PARAMS(( const char *Host, int w_fd )); -#ifdef h_errno -static char *Get_Error PARAMS(( int H_Error )); +#ifdef WANT_IPV6 +extern bool Conf_ConnectIPv4; +extern bool Conf_ConnectIPv6; #endif -static RES_STAT *New_Res_Stat PARAMS(( void )); - -static void -cb_resolver(int fd, short unused) { - (void) unused; /* shut up compiler warning */ - Read_Resolver_Result(fd); -} - - -#ifdef IDENTAUTH -GLOBAL RES_STAT * -Resolve_Addr( struct sockaddr_in *Addr, int Sock ) -#else -GLOBAL RES_STAT * -Resolve_Addr( struct sockaddr_in *Addr ) -#endif +/** + * Resolve IP (asynchronous!). + */ +GLOBAL bool +Resolve_Addr(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock, + void (*cbfunc) (int, short)) { - /* Resolve IP (asynchronous!). On errors, e.g. if the child process - * can't be forked, this functions returns NULL. */ - - RES_STAT *s; - int pid; + int pipefd[2]; + pid_t pid; - s = New_Res_Stat( ); - if( ! s ) return NULL; + assert(s != NULL); - /* For sub-process */ - pid = fork( ); + pid = Proc_Fork(s, pipefd, cbfunc, RESOLVER_TIMEOUT); if (pid > 0) { - close( s->pipe[1] ); - /* Main process */ - Log( LOG_DEBUG, "Resolver for %s created (PID %d).", inet_ntoa( Addr->sin_addr ), pid ); - if (!io_setnonblock( s->pipe[0] )) { - Log( LOG_DEBUG, "Could not set Non-Blocking mode for pipefd %d", s->pipe[0] ); - goto out; - } - if (!io_event_create( s->pipe[0], IO_WANTREAD, cb_resolver )) { - Log( LOG_DEBUG, "Could not add pipefd %dto event watchlist: %s", - s->pipe[0], strerror(errno) ); - goto out; - } - s->pid = pid; - return s; + LogDebug("Resolver for %s created (PID %d).", ng_ipaddr_tostr(Addr), pid); + return true; } else if( pid == 0 ) { - close( s->pipe[0] ); /* Sub process */ - Log_Init_Resolver( ); -#ifdef IDENTAUTH - Do_ResolveAddr( Addr, Sock, s->pipe[1] ); -#else - Do_ResolveAddr( Addr, s->pipe[1] ); -#endif - Log_Exit_Resolver( ); + Log_Init_Subprocess("Resolver"); + Conn_CloseAllSockets(identsock); + Do_ResolveAddr(Addr, identsock, pipefd[1]); + Log_Exit_Subprocess("Resolver"); exit(0); } - - Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno )); - -out: /* Error! */ - close( s->pipe[0] ); - close( s->pipe[1] ); - free( s ); -return NULL; + return false; } /* Resolve_Addr */ -GLOBAL RES_STAT * -Resolve_Name( char *Host ) +/** + * Resolve hostname (asynchronous!). + */ +GLOBAL bool +Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) { - /* Resolve hostname (asynchronous!). On errors, e.g. if the child - * process can't be forked, this functions returns NULL. */ + int pipefd[2]; + pid_t pid; - RES_STAT *s; - int pid; + assert(s != NULL); - s = New_Res_Stat( ); - if( ! s ) return NULL; - - /* Fork sub-process */ - pid = fork( ); + pid = Proc_Fork(s, pipefd, cbfunc, RESOLVER_TIMEOUT); if (pid > 0) { - close( s->pipe[1] ); /* Main process */ +#ifdef DEBUG Log( LOG_DEBUG, "Resolver for \"%s\" created (PID %d).", Host, pid ); - if (!io_setnonblock( s->pipe[0] )) { - Log( LOG_DEBUG, "Could not set Non-Blocking mode for pipefd %d", s->pipe[0] ); - goto out; - } - if (!io_event_create( s->pipe[0], IO_WANTREAD, cb_resolver )) { - Log( LOG_DEBUG, "Could not add pipefd %dto event watchlist: %s", - s->pipe[0], strerror(errno) ); - goto out; - } - s->pid = pid; - return s; +#endif + return true; } else if( pid == 0 ) { - close( s->pipe[0] ); /* Sub process */ - Log_Init_Resolver( ); - Do_ResolveName( Host, s->pipe[1] ); - Log_Exit_Resolver( ); + Log_Init_Subprocess("Resolver"); + Conn_CloseAllSockets(NONE); + Do_ResolveName(Host, pipefd[1]); + Log_Exit_Subprocess("Resolver"); exit(0); } + return false; +} /* Resolve_Name */ - Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno )); -out: /* Error! */ - close( s->pipe[0] ); - close( s->pipe[1] ); - free( s ); - return NULL; -} /* Resolve_Name */ +#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) +#if !defined(WANT_IPV6) && defined(h_errno) +static char * +Get_Error( int H_Error ) +{ + /* Get error message for H_Error */ + switch( H_Error ) { + case HOST_NOT_FOUND: + return "host not found"; + case NO_DATA: + return "name valid but no IP address defined"; + case NO_RECOVERY: + return "name server error"; + case TRY_AGAIN: + return "name server temporary not available"; + } + return "unknown error"; +} +#endif +#endif -#ifdef IDENTAUTH -static void -Do_ResolveAddr( struct sockaddr_in *Addr, int Sock, int w_fd ) -#else +/* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */ static void -Do_ResolveAddr( struct sockaddr_in *Addr, int w_fd ) -#endif +Do_IdentQuery(int identsock, array *resolved_addr) { - /* Resolver sub-process: resolve IP address and write result into - * pipe to parent. */ - - char hostname[HOST_LEN]; - char ipstr[HOST_LEN]; - struct hostent *h; - size_t len; - struct in_addr *addr; - char *ntoaptr; - array resolved_addr; #ifdef IDENTAUTH char *res; -#endif - array_init(&resolved_addr); + if (identsock < 0) + return; - /* Resolve IP address */ #ifdef DEBUG - Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr )); + Log_Subprocess(LOG_DEBUG, "Doing IDENT lookup on socket %d ...", + identsock); #endif - h = gethostbyaddr( (char *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET ); - if (!h) { -#ifdef h_errno - Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\": %s!", inet_ntoa( Addr->sin_addr ), Get_Error( h_errno )); + res = ident_id( identsock, 10 ); +#ifdef DEBUG + Log_Subprocess(LOG_DEBUG, "Ok, IDENT lookup on socket %d done: \"%s\"", + identsock, res ? res : "(NULL)"); +#endif + if (!res) /* no result */ + return; + if (!array_cats(resolved_addr, res)) + Log_Subprocess(LOG_WARNING, + "Resolver: Cannot copy IDENT result: %s!", + strerror(errno)); + + free(res); #else - Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\"!", inet_ntoa( Addr->sin_addr )); -#endif - strlcpy( hostname, inet_ntoa( Addr->sin_addr ), sizeof( hostname )); + (void) identsock; + (void) resolved_addr; +#endif +} + + +/** + * perform reverse DNS lookup and put result string into resbuf. + * If no hostname could be obtained, this function stores the string representation of + * the IP address in resbuf and returns false. + * @param IpAddr ip address to resolve + * @param resbuf result buffer to store DNS name/string representation of ip address + * @param reslen size of result buffer (must be >= NGT_INET_ADDRSTRLEN) + * @return true if reverse lookup successful, false otherwise + */ +static bool +ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen) +{ + char tmp_ip_str[NG_INET_ADDRSTRLEN]; + const char *errmsg; +#ifdef HAVE_GETNAMEINFO + static const char funcname[]="getnameinfo"; + int res; + + *resbuf = 0; + + res = getnameinfo((struct sockaddr *) IpAddr, ng_ipaddr_salen(IpAddr), + resbuf, (socklen_t)reslen, NULL, 0, NI_NAMEREQD); + if (res == 0) + return true; + + if (res == EAI_SYSTEM) + errmsg = strerror(errno); + else + errmsg = gai_strerror(res); +#else + const struct sockaddr_in *Addr = (const struct sockaddr_in *) IpAddr; + struct hostent *h; + static const char funcname[]="gethostbyaddr"; + + h = gethostbyaddr((char *)&Addr->sin_addr, sizeof(Addr->sin_addr), AF_INET); + if (h) { + if (strlcpy(resbuf, h->h_name, reslen) < reslen) + return true; + errmsg = "hostname too long"; } else { - strlcpy( hostname, h->h_name, sizeof( hostname )); - - h = gethostbyname( hostname ); - if ( h ) { - if (memcmp(h->h_addr, &Addr->sin_addr, sizeof (struct in_addr))) { - addr = (struct in_addr*) h->h_addr; - strlcpy(ipstr, inet_ntoa(*addr), sizeof ipstr); - ntoaptr = inet_ntoa( Addr->sin_addr ); - Log(LOG_WARNING,"Possible forgery: %s resolved to %s (which is at ip %s!)", - ntoaptr, hostname, ipstr); - strlcpy( hostname, ntoaptr, sizeof hostname); - } - } else { - ntoaptr = inet_ntoa( Addr->sin_addr ); - Log(LOG_WARNING, "Possible forgery: %s resolved to %s (which has no ip address)", - ntoaptr, hostname); - strlcpy( hostname, ntoaptr, sizeof hostname); - } +# ifdef h_errno + errmsg = Get_Error(h_errno); +# else + errmsg = "unknown error"; +# endif /* h_errno */ } - Log_Resolver( LOG_DEBUG, "Ok, translated %s to \"%s\".", inet_ntoa( Addr->sin_addr ), hostname ); +#endif /* HAVE_GETNAMEINFO */ - len = strlen( hostname ); - hostname[len] = '\n'; len++; - if (!array_copyb(&resolved_addr, hostname, len )) { - Log_Resolver( LOG_CRIT, "Resolver: Can't copy resolved name: %s!", strerror( errno )); - close( w_fd ); - return; - } + assert(errmsg); + assert(reslen >= NG_INET_ADDRSTRLEN); + ng_ipaddr_tostr_r(IpAddr, tmp_ip_str); -#ifdef IDENTAUTH - /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */ - Log_Resolver( LOG_DEBUG, "Doing IDENT lookup on socket %d ...", Sock ); - res = ident_id( Sock, 10 ); - Log_Resolver( LOG_DEBUG, "Ok, IDENT lookup on socket %d done: \"%s\"", Sock, res ? res : "" ); - - if (res) { - if (!array_cats(&resolved_addr, res)) - Log_Resolver(LOG_WARNING, "Resolver: Cannot copy IDENT result: %s!", strerror(errno)); - /* try to omit ident and return hostname only */ - } + Log_Subprocess(LOG_WARNING, "%s: Can't resolve address \"%s\": %s", + funcname, tmp_ip_str, errmsg); + strlcpy(resbuf, tmp_ip_str, reslen); + return false; +} - if (!array_catb(&resolved_addr, "\n", 1)) { - close(w_fd); - Log_Resolver(LOG_CRIT, "Resolver: Cannot copy result: %s!", strerror(errno)); - array_free(&resolved_addr); - return; - } - if (res) free(res); +/** + * perform DNS lookup of given host name and fill IpAddr with a list of + * ip addresses associated with that name. + * ip addresses found are stored in the "array *IpAddr" argument (type ng_ipaddr_t) + * @param hostname The domain name to look up. + * @param IpAddr pointer to empty and initialized array to store results + * @return true if lookup successful, false if domain name not found + */ +static bool +ForwardLookup(const char *hostname, array *IpAddr, int af) +{ + ng_ipaddr_t addr; + +#ifdef HAVE_GETADDRINFO + int res; + struct addrinfo *a, *ai_results; + static struct addrinfo hints; + +#ifdef AI_ADDRCONFIG /* glibc has this, but not e.g. netbsd 4.0 */ + hints.ai_flags = AI_ADDRCONFIG; #endif - len = array_bytes(&resolved_addr); - if( (size_t)write( w_fd, array_start(&resolved_addr), len) != len ) - Log_Resolver( LOG_CRIT, "Resolver: Can't write result to parent: %s!", strerror( errno )); + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + hints.ai_family = af; + + memset(&addr, 0, sizeof(addr)); + + res = getaddrinfo(hostname, NULL, &hints, &ai_results); + switch (res) { + case 0: break; + case EAI_SYSTEM: + Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\": %s", hostname, strerror(errno)); + return false; + default: + Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\": %s", hostname, gai_strerror(res)); + return false; + } - close(w_fd); - array_free(&resolved_addr); -} /* Do_ResolveAddr */ + for (a = ai_results; a != NULL; a = a->ai_next) { + assert(a->ai_addrlen <= sizeof(addr)); + if (a->ai_addrlen > sizeof(addr)) + continue; -static void -Do_ResolveName( char *Host, int w_fd ) -{ - /* Resolver sub-process: resolve name and write result into pipe - * to parent. */ + memcpy(&addr, a->ai_addr, a->ai_addrlen); - char ip[16]; - struct hostent *h; - struct in_addr *addr; - int len; + if (!array_catb(IpAddr, (char *)&addr, sizeof(addr))) + break; + } - Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host ); + freeaddrinfo(ai_results); + return a == NULL; +#else + struct hostent *h = gethostbyname(hostname); - /* Resolve hostname */ - h = gethostbyname( Host ); - if( h ) { - addr = (struct in_addr *)h->h_addr; - strlcpy( ip, inet_ntoa( *addr ), sizeof( ip )); - } else { + if (!h) { #ifdef h_errno - Log_Resolver( LOG_WARNING, "Can't resolve \"%s\": %s!", Host, Get_Error( h_errno )); + Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\": %s", + hostname, Get_Error(h_errno)); #else - Log_Resolver( LOG_WARNING, "Can't resolve \"%s\"!", Host ); + Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\"", hostname); #endif - ip[0] = '\0'; + return false; } - if( ip[0] ) Log_Resolver( LOG_DEBUG, "Ok, translated \"%s\" to %s.", Host, ip ); + memset(&addr, 0, sizeof(addr)); - /* Write result into pipe to parent */ - len = strlen( ip ); - ip[len] = '\n'; len++; - if( (size_t)write( w_fd, ip, len ) != (size_t)len ) { - Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno )); - close( w_fd ); + addr.sin4.sin_family = AF_INET; + memcpy(&addr.sin4.sin_addr, h->h_addr, sizeof(struct in_addr)); + + return array_copyb(IpAddr, (char *)&addr, sizeof(addr)); +#endif /* HAVE_GETADDRINFO */ +} + + +static bool +Addr_in_list(const array *resolved_addr, const ng_ipaddr_t *Addr) +{ + char tmp_ip_str[NG_INET_ADDRSTRLEN]; + const ng_ipaddr_t *tmpAddrs = array_start(resolved_addr); + size_t len = array_length(resolved_addr, sizeof(*tmpAddrs)); + + assert(len > 0); + assert(tmpAddrs); + + while (len > 0) { + if (ng_ipaddr_ipequal(Addr, tmpAddrs)) + return true; + tmpAddrs++; + len--; + } + /* failed; print list of addresses */ + ng_ipaddr_tostr_r(Addr, tmp_ip_str); + len = array_length(resolved_addr, sizeof(*tmpAddrs)); + tmpAddrs = array_start(resolved_addr); + + while (len > 0) { + Log_Subprocess(LOG_WARNING, "Address mismatch: %s != %s", + tmp_ip_str, ng_ipaddr_tostr(tmpAddrs)); + tmpAddrs++; + len--; } -} /* Do_ResolveName */ + return false; +} -#ifdef h_errno -static char * -Get_Error( int H_Error ) +static void +Log_Forgery_NoIP(const char *ip, const char *host) { - /* Get error message for H_Error */ + Log_Subprocess(LOG_WARNING, + "Possible forgery: %s resolved to %s (which has no ip address)", ip, host); +} - switch( H_Error ) - { - case HOST_NOT_FOUND: - return "host not found"; - case NO_DATA: - return "name valid but no IP address defined"; - case NO_RECOVERY: - return "name server error"; - case TRY_AGAIN: - return "name server temporary not available"; - default: - return "unknown error"; - } -} /* Get_Error */ +static void +Log_Forgery_WrongIP(const char *ip, const char *host) +{ + Log_Subprocess(LOG_WARNING, + "Possible forgery: %s resolved to %s (which points to different address)", ip, host); +} -#endif +static void +ArrayWrite(int fd, const array *a) +{ + size_t len = array_bytes(a); + const char *data = array_start(a); + + assert(data); -static RES_STAT * -New_Res_Stat( void ) + if( (size_t)write(fd, data, len) != len ) + Log_Subprocess( LOG_CRIT, "Resolver: Can't write to parent: %s!", + strerror(errno)); +} + + +static void +Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd) { - RES_STAT *s; - - /* Allocate memory */ - s = (RES_STAT *)malloc( sizeof( RES_STAT )); - if( ! s ) - { - Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Addr]" ); - return NULL; - } + /* Resolver sub-process: resolve IP address and write result into + * pipe to parent. */ + char hostname[CLIENT_HOST_LEN]; + char tmp_ip_str[NG_INET_ADDRSTRLEN]; + size_t len; + array resolved_addr; - /* Initialize pipe for result */ - if( pipe( s->pipe ) != 0 ) - { - free( s ); - Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno )); - return NULL; + array_init(&resolved_addr); + ng_ipaddr_tostr_r(Addr, tmp_ip_str); +#ifdef DEBUG + Log_Subprocess(LOG_DEBUG, "Now resolving %s ...", tmp_ip_str); +#endif + if (!ReverseLookup(Addr, hostname, sizeof(hostname))) + goto dns_done; + + 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)); + } + } else { + Log_Forgery_NoIP(tmp_ip_str, hostname); + strlcpy(hostname, tmp_ip_str, sizeof(hostname)); } +#ifdef DEBUG + Log_Subprocess(LOG_DEBUG, "Ok, translated %s to \"%s\".", tmp_ip_str, hostname); +#endif + dns_done: + len = strlen(hostname); + hostname[len] = '\n'; + if (!array_copyb(&resolved_addr, hostname, ++len)) { + Log_Subprocess(LOG_CRIT, + "Resolver: Can't copy resolved name: %s!", + strerror(errno)); + array_free(&resolved_addr); + return; + } + + Do_IdentQuery(identsock, &resolved_addr); - s->stage = 0; - array_init(&s->buffer); - s->pid = -1; + ArrayWrite(w_fd, &resolved_addr); - return s; -} /* New_Res_Stat */ + array_free(&resolved_addr); +} /* Do_ResolveAddr */ + + +static void +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; +#endif + Log_Subprocess(LOG_DEBUG, "Now resolving \"%s\" ...", Host); + + array_init(&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; + } +#ifdef DEBUG + len = array_length(&IpAddrs, sizeof(*addr)); + assert(len > 0); + addr = array_start(&IpAddrs); + assert(addr); + for (; len > 0; --len,addr++) { + Log_Subprocess(LOG_DEBUG, "translated \"%s\" to %s.", + Host, ng_ipaddr_tostr(addr)); + } +#endif + /* Write result into pipe to parent */ + ArrayWrite(w_fd, &IpAddrs); + + array_free(&IpAddrs); +} /* Do_ResolveName */ /* -eof- */