X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fresolve.c;h=afbef5b375122711763fe91bb80f56c1a929c8db;hp=5839c19498cde0d8b9939d449bc947537eb678cf;hb=HEAD;hpb=596bc096b02ef94efe3d73bb747c6ab0368f63bf diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 5839c194..25be58a4 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -1,31 +1,33 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2024 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" -#include "imp.h" +/** + * @file + * Asynchronous resolver + */ + #include #include #include #include #include +#include +#include #include #include #include -#include #ifdef IDENTAUTH #ifdef HAVE_IDENT_H @@ -33,19 +35,14 @@ #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" - -static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd )); +static void Do_ResolveAddr_Ident PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd )); static void Do_ResolveName PARAMS(( const char *Host, int w_fd )); #ifdef WANT_IPV6 @@ -55,11 +52,11 @@ extern bool Conf_ConnectIPv6; /** - * Resolve IP (asynchronous!). + * Resolve IP address and do IDENT lookup asynchronously. */ GLOBAL bool -Resolve_Addr(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock, - void (*cbfunc) (int, short)) +Resolve_Addr_Ident(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock, + void (*cbfunc) (int, short)) { int pipefd[2]; pid_t pid; @@ -73,7 +70,8 @@ Resolve_Addr(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock, } else if( pid == 0 ) { /* Sub process */ Log_Init_Subprocess("Resolver"); - Do_ResolveAddr( Addr, identsock, pipefd[1]); + Conn_CloseAllSockets(identsock); + Do_ResolveAddr_Ident(Addr, identsock, pipefd[1]); Log_Exit_Subprocess("Resolver"); exit(0); } @@ -95,13 +93,12 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) pid = Proc_Fork(s, pipefd, cbfunc, RESOLVER_TIMEOUT); if (pid > 0) { /* Main process */ -#ifdef DEBUG Log( LOG_DEBUG, "Resolver for \"%s\" created (PID %d).", Host, pid ); -#endif return true; } else if( pid == 0 ) { /* Sub process */ Log_Init_Subprocess("Resolver"); + Conn_CloseAllSockets(NONE); Do_ResolveName(Host, pipefd[1]); Log_Exit_Subprocess("Resolver"); exit(0); @@ -109,9 +106,8 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) return false; } /* Resolve_Name */ - -#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) -#if !defined(WANT_IPV6) && defined(h_errno) +#if !defined(HAVE_WORKING_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) +#ifdef h_errno static char * Get_Error( int H_Error ) { @@ -142,15 +138,11 @@ Do_IdentQuery(int identsock, array *resolved_addr) if (identsock < 0) return; -#ifdef DEBUG Log_Subprocess(LOG_DEBUG, "Doing IDENT lookup on socket %d ...", identsock); -#endif 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)) @@ -218,8 +210,8 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen) assert(reslen >= NG_INET_ADDRSTRLEN); ng_ipaddr_tostr_r(IpAddr, tmp_ip_str); - Log_Subprocess(LOG_WARNING, "%s: Can't resolve address \"%s\": %s", - funcname, tmp_ip_str, errmsg); + Log_Subprocess(LOG_WARNING, "Can't resolve address \"%s\": %s [%s].", + tmp_ip_str, errmsg, funcname); strlcpy(resbuf, tmp_ip_str, reslen); return false; } @@ -234,32 +226,23 @@ 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) +#ifdef HAVE_WORKING_GETADDRINFO +ForwardLookup(const char *hostname, array *IpAddr, int af) +#else +ForwardLookup(const char *hostname, array *IpAddr, UNUSED int af) +#endif { ng_ipaddr_t addr; -#ifdef HAVE_GETADDRINFO +#ifdef HAVE_WORKING_GETADDRINFO int res; 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); @@ -274,9 +257,9 @@ ForwardLookup(const char *hostname, array *IpAddr) } for (a = ai_results; a != NULL; a = a->ai_next) { - assert(a->ai_addrlen <= sizeof(addr)); + assert((size_t)a->ai_addrlen <= sizeof(addr)); - if (a->ai_addrlen > sizeof(addr)) + if ((size_t)a->ai_addrlen > sizeof(addr)) continue; memcpy(&addr, a->ai_addr, a->ai_addrlen); @@ -345,14 +328,16 @@ static void Log_Forgery_NoIP(const char *ip, const char *host) { Log_Subprocess(LOG_WARNING, - "Possible forgery: %s resolved to %s (which has no ip address)", ip, host); + "Possible forgery: %s resolved to \"%s\", which has no IP address!", + ip, host); } 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); + "Possible forgery: %s resolved to \"%s\", which points to a different address!", + ip, host); } @@ -371,7 +356,7 @@ ArrayWrite(int fd, const array *a) static void -Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd) +Do_ResolveAddr_Ident(const ng_ipaddr_t *Addr, int identsock, int w_fd) { /* Resolver sub-process: resolve IP address and write result into * pipe to parent. */ @@ -380,15 +365,20 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd) size_t len; array resolved_addr; + hostname[0] = '\0'; array_init(&resolved_addr); ng_ipaddr_tostr_r(Addr, tmp_ip_str); -#ifdef DEBUG + + /* Skip DNS lookup when DNS is disabled; just return an empty ("") host + * name but still issue an IDENT query, if supported and enabled. */ + if (!Conf_DNS) + goto dns_done; + 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)) { + 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)); @@ -397,9 +387,7 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd) 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'; @@ -416,7 +404,7 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd) ArrayWrite(w_fd, &resolved_addr); array_free(&resolved_addr); -} /* Do_ResolveAddr */ +} /* Do_ResolveAddr_Ident */ static void @@ -425,19 +413,28 @@ Do_ResolveName( const char *Host, int w_fd ) /* Resolver sub-process: resolve name and write result into pipe * to parent. */ array IpAddrs; -#ifdef DEBUG + int af; ng_ipaddr_t *addr; size_t len; -#endif 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; } -#ifdef DEBUG len = array_length(&IpAddrs, sizeof(*addr)); assert(len > 0); addr = array_start(&IpAddrs); @@ -446,7 +443,6 @@ Do_ResolveName( const char *Host, int w_fd ) Log_Subprocess(LOG_DEBUG, "translated \"%s\" to %s.", Host, ng_ipaddr_tostr(addr)); } -#endif /* Write result into pipe to parent */ ArrayWrite(w_fd, &IpAddrs);