Add default empty openssl compiler flags.

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 1d110323567a589ca39d3a55c89a2c1884363540..78b7f2de92214b85731ac6664081f589f26cbad2 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -1,11 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2011 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -39,9 +45,9 @@ bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::
                        return true;
                }
        }
-       
+
        ListenSocket* ll = new ListenSocket(tag, sa);
-       if (ll->GetFd() < 0)
+       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));
@@ -54,9 +60,9 @@ bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::
        return true;
 }
 
-int InspIRCd::BindPorts(FailedPortList& failed_ports)
+size_t InspIRCd::BindPorts(FailedPortList& failed_ports)
 {
-       int bound = 0;
+       size_t bound = 0;
        std::vector<ListenSocket*> old_ports(ports.begin(), ports.end());
 
        ConfigTagList tags = ServerInstance->Config->ConfTags("bind");
@@ -86,36 +92,45 @@ int InspIRCd::BindPorts(FailedPortList& failed_ports)
                                        continue;
 
                                if (!BindPort(tag, bindspec, old_ports))
-                                       failed_ports.push_back(std::make_pair(bindspec, errno));
+                                       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 (path.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path)))
+                       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!",
-                                       path.c_str(), tag->getTagLocation().c_str());
+                                       fullpath.c_str(), tag->getTagLocation().c_str());
                                continue;
                        }
 
-                       // Create the bindspec manually (aptosa doesn't work with AF_UNIX yet).
-                       memset(&bindspec, 0, sizeof(bindspec));
-                       bindspec.un.sun_family = AF_UNIX;
-                       stpncpy(bindspec.un.sun_path, path.c_str(), sizeof(bindspec.un.sun_path) - 1);
+                       // Check for characters which are problematic in the IRC message format.
+                       if (fullpath.find_first_of("\n\r\t!@: ") != std::string::npos)
+                       {
+                               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;
+                       }
 
+                       irc::sockets::untosa(fullpath, bindspec);
                        if (!BindPort(tag, bindspec, old_ports))
-                               failed_ports.push_back(std::make_pair(bindspec, errno));
+                               failed_ports.push_back(FailedPort(errno, bindspec, tag));
                        else
                                bound++;
                }
+#endif
        }
 
        std::vector<ListenSocket*>::iterator n = ports.begin();
@@ -172,6 +187,28 @@ bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::socka
        return false;
 }
 
+bool irc::sockets::untosa(const std::string& path, irc::sockets::sockaddrs& sa)
+{
+       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;
+}
+
+bool irc::sockets::isunix(const std::string& file)
+{
+#ifndef _WIN32
+       struct stat sb;
+       if (stat(file.c_str(), &sb) == 0 && S_ISSOCK(sb.st_mode))
+               return true;
+#endif
+       return false;
+}
+
+
 int irc::sockets::sockaddrs::family() const
 {
        return sa.sa_family;
@@ -352,7 +389,7 @@ irc::sockets::cidr_mask::cidr_mask(const std::string& mask)
        }
        else
        {
-               int range = ConvToInt(mask.substr(bits_chars + 1));
+               unsigned char range = ConvToNum<unsigned char>(mask.substr(bits_chars + 1));
                irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa);
                sa2cidr(*this, sa, range);
        }
@@ -375,6 +412,7 @@ std::string irc::sockets::cidr_mask::str() const
                case AF_INET6:
                        base = (unsigned char*)&sa.in6.sin6_addr;
                        len = 16;
+                       break;
 
                case AF_UNIX:
                        return sa.un.sun_path;
@@ -386,7 +424,7 @@ std::string irc::sockets::cidr_mask::str() const
        }
 
        memcpy(base, bits, len);
-       return sa.addr() + "/" + ConvToStr(length);
+       return sa.addr() + "/" + ConvToStr((int)length);
 }
 
 bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const