X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=78b7f2de92214b85731ac6664081f589f26cbad2;hb=fe67c13ddf8f546bed95a9904679b3f32c708cd9;hp=8c7ec97d85d5c4d5c1b02ae50553b34d95708e6e;hpb=cff57f7ba780a5c4fc331ccbab489abdc572379c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 8c7ec97d8..78b7f2de9 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -1,11 +1,17 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2007-2008 Robin Burchell - * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014 Attila Molnar + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2011 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007 John Brooks * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -22,111 +28,109 @@ #include "inspircd.h" -#include "socket.h" -#include "socketengine.h" -using irc::sockets::sockaddrs; -/** This will bind a socket to a port. It works for UDP/TCP. - * It can only bind to IP addresses, if you wish to bind to hostnames - * you should first resolve them using class 'Resolver'. - */ -bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten) +bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::vector& old_ports) { - sockaddrs servaddr; - int ret; - - if ((*addr == '*' || *addr == '\0') && port == -1) + for (std::vector::iterator n = old_ports.begin(); n != old_ports.end(); ++n) { - /* Port -1: Means UDP IPV4 port binding - Special case - * used by DNS engine. - */ - memset(&servaddr, 0, sizeof(servaddr)); - servaddr.in4.sin_family = AF_INET; - } - else if (!irc::sockets::aptosa(addr, port, servaddr)) - return false; + if ((**n).bind_sa == sa) + { + // Replace tag, we know addr and port match, but other info (type, ssl) may not. + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Replacing listener on %s from old tag at %s with new tag from %s", + sa.str().c_str(), (*n)->bind_tag->getTagLocation().c_str(), tag->getTagLocation().c_str()); + (*n)->bind_tag = tag; + (*n)->ResetIOHookProvider(); - ret = SE->Bind(sockfd, servaddr); + old_ports.erase(n); + return true; + } + } - if (ret < 0) + ListenSocket* ll = new ListenSocket(tag, sa); + if (!ll->HasFd()) { + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to listen on %s from tag at %s: %s", + sa.str().c_str(), tag->getTagLocation().c_str(), strerror(errno)); + delete ll; return false; } - else - { - if (dolisten) - { - if (SE->Listen(sockfd, Config->MaxConn) == -1) - { - this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno)); - return false; - } - else - { - this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port); - SE->NonBlocking(sockfd); - return true; - } - } - else - { - this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port); - return true; - } - } + + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Added a listener on %s from tag at %s", sa.str().c_str(), tag->getTagLocation().c_str()); + ports.push_back(ll); + return true; } -int InspIRCd::BindPorts(FailedPortList &failed_ports) +size_t InspIRCd::BindPorts(FailedPortList& failed_ports) { - int bound = 0; + size_t bound = 0; std::vector old_ports(ports.begin(), ports.end()); ConfigTagList tags = ServerInstance->Config->ConfTags("bind"); - for(ConfigIter i = tags.first; i != tags.second; ++i) + for (ConfigIter i = tags.first; i != tags.second; ++i) { ConfigTag* tag = i->second; - std::string porttag = tag->getString("port"); - std::string Addr = tag->getString("address"); - if (strncasecmp(Addr.c_str(), "::ffff:", 7) == 0) - this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead."); + // Are we creating a TCP/IP listener? + const std::string address = tag->getString("address"); + const std::string portlist = tag->getString("port"); + if (!address.empty() || !portlist.empty()) + { + // InspIRCd supports IPv4 and IPv6 natively; no 4in6 required. + if (strncasecmp(address.c_str(), "::ffff:", 7) == 0) + this->Logs->Log("SOCKET", LOG_DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead."); + + // A TCP listener with no ports is not very useful. + if (portlist.empty()) + this->Logs->Log("SOCKET", LOG_DEFAULT, "TCP listener on %s at %s has no ports specified!", + address.empty() ? "*" : address.c_str(), tag->getTagLocation().c_str()); + + irc::portparser portrange(portlist, false); + for (int port; (port = portrange.GetToken()); ) + { + irc::sockets::sockaddrs bindspec; + if (!irc::sockets::aptosa(address, port, bindspec)) + continue; - irc::portparser portrange(porttag, false); - int portno = -1; - while (0 != (portno = portrange.GetToken())) + if (!BindPort(tag, bindspec, old_ports)) + failed_ports.push_back(FailedPort(errno, bindspec, tag)); + else + bound++; + } + continue; + } + +#ifndef _WIN32 + // Are we creating a UNIX listener? + const std::string path = tag->getString("path"); + if (!path.empty()) { + // Expand the path relative to the config directory. + const std::string fullpath = ServerInstance->Config->Paths.PrependData(path); + + // UNIX socket paths are length limited to less than PATH_MAX. irc::sockets::sockaddrs bindspec; - if (!irc::sockets::aptosa(Addr, portno, bindspec)) + if (fullpath.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path) - 1)) + { + this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path that is too long!", + fullpath.c_str(), tag->getTagLocation().c_str()); continue; - std::string bind_readable = bindspec.str(); + } - bool skip = false; - for (std::vector::iterator n = old_ports.begin(); n != old_ports.end(); ++n) + // Check for characters which are problematic in the IRC message format. + if (fullpath.find_first_of("\n\r\t!@: ") != std::string::npos) { - if ((**n).bind_desc == bind_readable) - { - (*n)->bind_tag = tag; // Replace tag, we know addr and port match, but other info (type, ssl) may not - skip = true; - old_ports.erase(n); - break; - } + this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path containing invalid characters!", + fullpath.c_str(), tag->getTagLocation().c_str()); + continue; } - if (!skip) - { - ListenSocket* ll = new ListenSocket(tag, bindspec); - if (ll->GetFd() > -1) - { - bound++; - ports.push_back(ll); - } - else - { - failed_ports.push_back(std::make_pair(bind_readable, strerror(errno))); - delete ll; - } - } + irc::sockets::untosa(fullpath, bindspec); + if (!BindPort(tag, bindspec, old_ports)) + failed_ports.push_back(FailedPort(errno, bindspec, tag)); + else + bound++; } +#endif } std::vector::iterator n = ports.begin(); @@ -136,12 +140,12 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) n++; if (n == ports.end()) { - this->Logs->Log("SOCKET",DEFAULT,"Port bindings slipped out of vector, aborting close!"); + this->Logs->Log("SOCKET", LOG_DEFAULT, "Port bindings slipped out of vector, aborting close!"); break; } - this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.", - (**n).bind_desc.c_str()); + this->Logs->Log("SOCKET", LOG_DEFAULT, "Port binding %s was removed from the config file, closing.", + (**n).bind_sa.str().c_str()); delete *n; // this keeps the iterator valid, pointing to the next element @@ -183,120 +187,192 @@ bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::socka return false; } -int irc::sockets::sockaddrs::port() const +bool irc::sockets::untosa(const std::string& path, irc::sockets::sockaddrs& sa) { - if (sa.sa_family == AF_INET) - return ntohs(in4.sin_port); - if (sa.sa_family == AF_INET6) - return ntohs(in6.sin6_port); - return -1; + memset(&sa, 0, sizeof(sa)); + if (path.length() >= sizeof(sa.un.sun_path)) + return false; + + sa.un.sun_family = AF_UNIX; + memcpy(&sa.un.sun_path, path.c_str(), path.length() + 1); + return true; } -std::string irc::sockets::sockaddrs::addr() const +bool irc::sockets::isunix(const std::string& file) { - char addrv[INET6_ADDRSTRLEN+1]; - if (sa.sa_family == AF_INET) - { - if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv))) - return ""; - return addrv; - } - else if (sa.sa_family == AF_INET6) - { - if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv))) - return ""; - return addrv; - } - return ""; +#ifndef _WIN32 + struct stat sb; + if (stat(file.c_str(), &sb) == 0 && S_ISSOCK(sb.st_mode)) + return true; +#endif + return false; } -bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port) + +int irc::sockets::sockaddrs::family() const { - port = sa.port(); - addr = sa.addr(); - return !addr.empty(); + return sa.sa_family; } -static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 }; +int irc::sockets::sockaddrs::port() const +{ + switch (family()) + { + case AF_INET: + return ntohs(in4.sin_port); -std::string irc::sockets::sockaddrs::str() const + case AF_INET6: + return ntohs(in6.sin6_port); + + case AF_UNIX: + return 0; + } + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::port(): socket type %d is unknown!", family()); + return 0; +} + +std::string irc::sockets::sockaddrs::addr() const { - char buffer[MAXBUF]; - if (sa.sa_family == AF_INET) + switch (family()) { - const uint8_t* bits = reinterpret_cast(&in4.sin_addr); - sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port)); + case AF_INET: + char ip4addr[INET_ADDRSTRLEN]; + if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, ip4addr, sizeof(ip4addr))) + return "0.0.0.0"; + return ip4addr; + + case AF_INET6: + char ip6addr[INET6_ADDRSTRLEN]; + if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ip6addr, sizeof(ip6addr))) + return "0:0:0:0:0:0:0:0"; + return ip6addr; + + case AF_UNIX: + return un.sun_path; } - else if (sa.sa_family == AF_INET6) + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::addr(): socket type %d is unknown!", family()); + return ""; +} + +std::string irc::sockets::sockaddrs::str() const +{ + switch (family()) { - buffer[0] = '['; - if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10)) - return ""; // should never happen, buffer is large enough - int len = strlen(buffer); - // no need for snprintf, buffer has at least 9 chars left, max short len = 5 - sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port)); + case AF_INET: + char ip4addr[INET_ADDRSTRLEN]; + if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, ip4addr, sizeof(ip4addr))) + strcpy(ip4addr, "0.0.0.0"); + return InspIRCd::Format("%s:%u", ip4addr, ntohs(in4.sin_port)); + + case AF_INET6: + char ip6addr[INET6_ADDRSTRLEN]; + if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ip6addr, sizeof(ip6addr))) + strcpy(ip6addr, "0:0:0:0:0:0:0:0"); + return InspIRCd::Format("[%s]:%u", ip6addr, ntohs(in6.sin6_port)); + + case AF_UNIX: + return un.sun_path; } - else - return ""; - return std::string(buffer); + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::str(): socket type %d is unknown!", family()); + return ""; } -int irc::sockets::sockaddrs::sa_size() const +socklen_t irc::sockets::sockaddrs::sa_size() const { - if (sa.sa_family == AF_INET) - return sizeof(in4); - if (sa.sa_family == AF_INET6) - return sizeof(in6); + switch (family()) + { + case AF_INET: + return sizeof(in4); + + case AF_INET6: + return sizeof(in6); + + case AF_UNIX: + return sizeof(un); + } + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::sa_size(): socket type %d is unknown!", family()); return 0; } bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const { - if (sa.sa_family != other.sa.sa_family) + if (family() != other.family()) return false; - if (sa.sa_family == AF_INET) - return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr); - if (sa.sa_family == AF_INET6) - return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16); + + switch (family()) + { + case AF_INET: + return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr); + + case AF_INET6: + return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16); + + case AF_UNIX: + return !strcmp(un.sun_path, other.un.sun_path); + } + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::operator==(): socket type %d is unknown!", family()); return !memcmp(this, &other, sizeof(*this)); } -static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range) +static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, unsigned char range) { const unsigned char* base; - cidr.type = sa.sa.sa_family; - if (cidr.type == AF_INET) - { - base = (unsigned char*)&sa.in4.sin_addr; - if (range > 32) - range = 32; - } - else if (cidr.type == AF_INET6) - { - base = (unsigned char*)&sa.in6.sin6_addr; - if (range > 128) - range = 128; - } - else + unsigned char target_byte; + + memset(cidr.bits, 0, sizeof(cidr.bits)); + + cidr.type = sa.family(); + switch (cidr.type) { - base = (unsigned char*)""; - range = 0; + case AF_UNIX: + // XXX: UNIX sockets don't support CIDR. This fix is non-ideal but I can't + // really think of another way to handle it. + cidr.length = 0; + return; + + case AF_INET: + cidr.length = range > 32 ? 32 : range; + target_byte = sizeof(sa.in4.sin_addr); + base = (unsigned char*)&sa.in4.sin_addr; + break; + + case AF_INET6: + cidr.length = range > 128 ? 128 : range; + target_byte = sizeof(sa.in6.sin6_addr); + base = (unsigned char*)&sa.in6.sin6_addr; + break; + + default: + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: sa2cidr(): socket type %d is unknown!", cidr.type); + cidr.length = 0; + return; } - cidr.length = range; - unsigned int border = range / 8; + + unsigned int border = cidr.length / 8; unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF; - for(unsigned int i=0; i < 16; i++) + for(unsigned int i=0; i < target_byte; i++) { if (i < border) cidr.bits[i] = base[i]; else if (i == border) cidr.bits[i] = base[i] & bitmask; else - cidr.bits[i] = 0; + return; } } -irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, int range) +irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, unsigned char range) { sa2cidr(*this, sa, range); } @@ -313,7 +389,7 @@ irc::sockets::cidr_mask::cidr_mask(const std::string& mask) } else { - int range = atoi(mask.substr(bits_chars + 1).c_str()); + unsigned char range = ConvToNum(mask.substr(bits_chars + 1)); irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa); sa2cidr(*this, sa, range); } @@ -323,20 +399,30 @@ std::string irc::sockets::cidr_mask::str() const { irc::sockets::sockaddrs sa; sa.sa.sa_family = type; + unsigned char* base; - int len; - if (type == AF_INET) + size_t len; + switch (type) { - base = (unsigned char*)&sa.in4.sin_addr; - len = 4; - } - else if (type == AF_INET6) - { - base = (unsigned char*)&sa.in6.sin6_addr; - len = 16; + case AF_INET: + base = (unsigned char*)&sa.in4.sin_addr; + len = 4; + break; + + case AF_INET6: + base = (unsigned char*)&sa.in6.sin6_addr; + len = 16; + break; + + case AF_UNIX: + return sa.un.sun_path; + + default: + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::cidr_mask::str(): socket type %d is unknown!", type); + return ""; } - else - return ""; + memcpy(base, bits, len); return sa.addr() + "/" + ConvToStr((int)length); } @@ -358,9 +444,8 @@ bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const { - if (addr.sa.sa_family != type) + if (addr.family() != type) return false; irc::sockets::cidr_mask tmp(addr, length); return tmp == *this; } -