Rename `<bind:ssl>` to `<bind:sslprofile>`.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 60ee0b449c0d24ef3c1b1452a78f7c23009aa3e3..f14db773a2675a40cd970f28e23476d5653fcd07 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -1,7 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019-2020 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009-2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -29,9 +38,17 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        : bind_tag(tag)
        , bind_sa(bind_to)
 {
-       fd = socket(bind_to.family(), SOCK_STREAM, 0);
+       // Are we creating a UNIX socket?
+       if (bind_to.family() == AF_UNIX)
+       {
+               // Is 'replace' enabled?
+               const bool replace = tag->getBool("replace");
+               if (replace && irc::sockets::isunix(bind_to.str()))
+                       unlink(bind_to.str().c_str());
+       }
 
-       if (this->fd == -1)
+       fd = socket(bind_to.family(), SOCK_STREAM, 0);
+       if (!HasFd())
                return;
 
 #ifdef IPV6_V6ONLY
@@ -71,8 +88,17 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        if (rv >= 0)
                rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn);
 
+       if (bind_to.family() == AF_UNIX)
+       {
+               const std::string permissionstr = tag->getString("permissions");
+               unsigned int permissions = strtoul(permissionstr.c_str(), NULL, 8);
+               if (permissions && permissions <= 07777)
+                       chmod(bind_to.str().c_str(), permissions);
+       }
+
        // Default defer to on for TLS listeners because in TLS the client always speaks first
-       int timeout = tag->getDuration("defer", (tag->getString("ssl").empty() ? 0 : 3));
+       unsigned int timeoutdef = tag->getString("sslprofile", tag->getString("ssl")).empty() ? 0 : 3;
+       int timeout = tag->getDuration("defer", timeoutdef, 0, 60);
        if (timeout && !rv)
        {
 #if defined TCP_DEFER_ACCEPT
@@ -104,7 +130,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 
 ListenSocket::~ListenSocket()
 {
-       if (this->GetFd() > -1)
+       if (this->HasFd())
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd);
                SocketEngine::Shutdown(this, 2);
@@ -182,7 +208,7 @@ void ListenSocket::OnEventHandlerRead()
        FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server));
        if (res == MOD_RES_PASSTHRU)
        {
-               std::string type = bind_tag->getString("type", "clients");
+               const std::string type = bind_tag->getString("type", "clients", 1);
                if (stdalgo::string::equalsci(type, "clients"))
                {
                        ServerInstance->Users->AddUser(incomingSockfd, this, &client, &server);
@@ -215,10 +241,10 @@ void ListenSocket::ResetIOHookProvider()
                        curr.SetProvider(std::string());
        }
 
-       std::string provname = bind_tag->getString("ssl");
+       std::string provname = bind_tag->getString("sslprofile",  bind_tag->getString("ssl"));
        if (!provname.empty())
                provname.insert(0, "ssl/");
 
-       // SSL should be the last
+       // TLS (SSL) should be the last
        iohookprovs.back().SetProvider(provname);
 }