/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2019 iwalkalone <iwalkalone69@gmail.com>
+ * Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ * Copyright (C) 2013-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013, 2015 Adam <Adam@anope.org>
+ * Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ * Copyright (C) 2008-2010 Craig Edwards <brain@inspircd.org>
* Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
*
* 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
void CheckPingTimeout(LocalUser* user)
{
// Check if it is time to ping the user yet.
- if (ServerInstance->Time() < user->nping)
+ if (ServerInstance->Time() < user->nextping)
return;
// This user didn't answer the last ping, remove them.
if (!user->lastping)
{
- time_t secs = ServerInstance->Time() - (user->nping - user->MyClass->GetPingTime());
+ ModResult res;
+ FIRST_MOD_RESULT(OnConnectionFail, res, (user, I_ERR_TIMEOUT));
+ if (res == MOD_RES_ALLOW)
+ {
+ // A module is preventing this user from being timed out.
+ user->lastping = 1;
+ user->nextping = ServerInstance->Time() + user->MyClass->GetPingTime();
+ return;
+ }
+
+ time_t secs = ServerInstance->Time() - (user->nextping - user->MyClass->GetPingTime());
const std::string message = "Ping timeout: " + ConvToStr(secs) + (secs != 1 ? " seconds" : " second");
ServerInstance->Users.QuitUser(user, message);
return;
ClientProtocol::Messages::Ping ping;
user->Send(ServerInstance->GetRFCEvents().ping, ping);
user->lastping = 0;
- user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+ user->nextping = ServerInstance->Time() + user->MyClass->GetPingTime();
}
void CheckRegistrationTimeout(LocalUser* user)
{
ListenSocket::IOHookProvRef& iohookprovref = *i;
if (!iohookprovref)
+ {
+ if (!iohookprovref.GetProvider().empty())
+ {
+ ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Non-existent I/O hook '%s' in <bind:%s> tag at %s",
+ iohookprovref.GetProvider().c_str(),
+ i == via->iohookprovs.begin() ? "hook" : "sslprofile",
+ via->bind_tag->getTagLocation().c_str());
+ this->QuitUser(New, "Internal error handling connection");
+ return;
+ }
continue;
+ }
iohookprovref->OnAccept(eh, client, server);
- // IOHook could have encountered a fatal error, e.g. if the TLS ClientHello was already in the queue and there was no common TLS version
+
+ // IOHook could have encountered a fatal error, e.g. if the TLS ClientHello
+ // was already in the queue and there was no common TLS version.
if (!eh->getError().empty())
{
QuitUser(New, eh->getError());
New->WriteNotice("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
FOREACH_MOD(OnSetUserIP, (New));
- if (New->quitting)
- return;
+ if (!New->quitting)
+ FOREACH_MOD(OnUserPostInit, (New));
}
-void UserManager::QuitUser(User* user, const std::string& quitreason, const std::string* operreason)
+void UserManager::QuitUser(User* user, const std::string& quitmessage, const std::string* operquitmessage)
{
if (user->quitting)
{
return;
}
- user->quitting = true;
+ std::string quitmsg(quitmessage);
+ std::string operquitmsg;
+ if (operquitmessage)
+ operquitmsg.assign(*operquitmessage);
- ServerInstance->Logs->Log("USERS", LOG_DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str());
LocalUser* const localuser = IS_LOCAL(user);
if (localuser)
{
- ClientProtocol::Messages::Error errormsg(InspIRCd::Format("Closing link: (%s@%s) [%s]", user->ident.c_str(), user->GetRealHost().c_str(), operreason ? operreason->c_str() : quitreason.c_str()));
- localuser->Send(ServerInstance->GetRFCEvents().error, errormsg);
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(OnUserPreQuit, MOD_RESULT, (localuser, quitmsg, operquitmsg));
+ if (MOD_RESULT == MOD_RES_DENY)
+ return;
}
- std::string reason;
- reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit);
- if (!operreason)
- operreason = &reason;
+ if (quitmsg.length() > ServerInstance->Config->Limits.MaxQuit)
+ quitmsg.erase(ServerInstance->Config->Limits.MaxQuit + 1);
+
+ if (operquitmsg.empty())
+ operquitmsg.assign(quitmsg);
+ else if (operquitmsg.length() > ServerInstance->Config->Limits.MaxQuit)
+ operquitmsg.erase(ServerInstance->Config->Limits.MaxQuit + 1);
+
+ user->quitting = true;
+ ServerInstance->Logs->Log("USERS", LOG_DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitmessage.c_str());
+ if (localuser)
+ {
+ ClientProtocol::Messages::Error errormsg(InspIRCd::Format("Closing link: (%s@%s) [%s]", user->ident.c_str(), user->GetRealHost().c_str(), operquitmsg.c_str()));
+ localuser->Send(ServerInstance->GetRFCEvents().error, errormsg);
+ }
ServerInstance->GlobalCulls.AddItem(user);
if (user->registered == REG_ALL)
{
- FOREACH_MOD(OnUserQuit, (user, reason, *operreason));
- WriteCommonQuit(user, reason, *operreason);
+ FOREACH_MOD(OnUserQuit, (user, quitmsg, operquitmsg));
+ WriteCommonQuit(user, quitmsg, operquitmsg);
}
else
unregistered_count--;
lu->eh.Close();
if (lu->registered == REG_ALL)
- ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), user->GetIPString().c_str(), operreason->c_str());
+ ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), user->GetIPString().c_str(), operquitmsg.c_str());
local_users.erase(lu);
}
{
std::string message;
VAFORMAT(message, text, text);
- ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, ServerInstance->Config->ServerName, message, MSG_NOTICE);
+ ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, ServerInstance->Config->GetServerName(), message, MSG_NOTICE);
ClientProtocol::Event msgevent(ServerInstance->GetRFCEvents().privmsg, msg);
for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)
projects / user / henk / code / inspircd.git / blobdiff