/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2006-2009 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2006-2007, 2009 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2008 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2018 systocrat <systocrat@outlook.com>
+ * Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
+ * Copyright (C) 2013, 2016-2021 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ * Copyright (C) 2013 ChrisTX <xpipe@hotmail.de>
+ * Copyright (C) 2013 Adam <Adam@anope.org>
+ * Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2012 DjSlash <djslash@djslash.org>
+ * Copyright (C) 2011 jackmcbarn <jackmcbarn@inspircd.org>
+ * 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) 2008 Oliver Lupton <oliverlupton@gmail.com>
- * Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 John Brooks <special@inspircd.org>
+ * Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2004, 2006-2009 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
#include "inspircd.h"
#include "xline.h"
+ClientProtocol::MessageList LocalUser::sendmsglist;
+
bool User::IsNoticeMaskSet(unsigned char sm)
{
if (!isalpha(sm))
std::string ret(1, '+');
std::string params;
- for (unsigned char i = 'A'; i < 'z'; i++)
+ for (unsigned char i = 'A'; i <= 'z'; i++)
{
const ModeHandler* const mh = ServerInstance->Modes.FindMode(i, MODETYPE_USER);
if ((!mh) || (!IsModeSet(mh)))
return ret;
}
-User::User(const std::string& uid, Server* srv, int type)
+User::User(const std::string& uid, Server* srv, UserType type)
: age(ServerInstance->Time())
, signon(0)
, uuid(uid)
ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New UUID for user: %s", uuid.c_str());
+ if (srv->IsULine())
+ ServerInstance->Users.all_ulines.push_back(this);
+
// Do not insert FakeUsers into the uuidlist so FindUUID() won't return them which is the desired behavior
if (type != USERTYPE_SERVER)
{
LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
: User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL)
, eh(this)
+ , serializer(NULL)
, bytes_in(0)
, bytes_out(0)
, cmds_in(0)
, quitting_sendq(false)
, lastping(true)
, exempt(false)
- , nping(0)
+ , nextping(0)
, idle_lastmsg(0)
, CommandFloodPenalty(0)
, already_sent(0)
signon = ServerInstance->Time();
// The user's default nick is their UUID
nick = uuid;
- ident = "unknown";
+ ident = uuid;
eh.SetFd(myfd);
memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
ChangeRealHost(GetIPString(), true);
}
+LocalUser::LocalUser(int myfd, const std::string& uid, Serializable::Data& data)
+ : User(uid, ServerInstance->FakeClient->server, USERTYPE_LOCAL)
+ , eh(this)
+ , already_sent(0)
+{
+ eh.SetFd(myfd);
+ Deserialize(data);
+}
+
User::~User()
{
}
if (!this->cached_makehost.empty())
return this->cached_makehost;
- // XXX: Is there really a need to cache this?
this->cached_makehost = ident + "@" + GetRealHost();
return this->cached_makehost;
}
if (!this->cached_hostip.empty())
return this->cached_hostip;
- // XXX: Is there really a need to cache this?
this->cached_hostip = ident + "@" + this->GetIPString();
return this->cached_hostip;
}
if (!this->cached_fullhost.empty())
return this->cached_fullhost;
- // XXX: Is there really a need to cache this?
this->cached_fullhost = nick + "!" + ident + "@" + GetDisplayedHost();
return this->cached_fullhost;
}
if (!this->cached_fullrealhost.empty())
return this->cached_fullrealhost;
- // XXX: Is there really a need to cache this?
this->cached_fullrealhost = nick + "!" + ident + "@" + GetRealHost();
return this->cached_fullrealhost;
}
return false;
const unsigned char mode = mh->GetModeChar();
- if (mode < 'A' || mode > ('A' + 64)) return false;
+ if (!ModeParser::IsModeChar(mode))
+ return false;
return ((mh->GetModeType() == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[(mode - 'A')];
* allowing remote kills, etc - but if they have access to the src, they most likely have
* access to the conf - so it's an end to a means either way.
*/
-bool User::HasPermission(const std::string&)
+bool User::HasCommandPermission(const std::string&)
{
return true;
}
-bool LocalUser::HasPermission(const std::string &command)
+bool LocalUser::HasCommandPermission(const std::string& command)
{
// are they even an oper at all?
if (!this->IsOper())
return oper->AllowedOperCommands.Contains(command);
}
-bool User::HasPrivPermission(const std::string &privstr, bool noisy)
+bool User::HasPrivPermission(const std::string& privstr)
{
return true;
}
-bool LocalUser::HasPrivPermission(const std::string &privstr, bool noisy)
+bool LocalUser::HasPrivPermission(const std::string& privstr)
{
if (!this->IsOper())
- {
- if (noisy)
- this->WriteNotice("You are not an oper");
return false;
- }
- if (oper->AllowedPrivs.Contains(privstr))
- return true;
+ return oper->AllowedPrivs.Contains(privstr);
+}
- if (noisy)
- this->WriteNotice("Oper type " + oper->name + " does not have access to priv " + privstr);
+bool User::HasSnomaskPermission(char chr) const
+{
+ return true;
+}
- return false;
+bool LocalUser::HasSnomaskPermission(char chr) const
+{
+ if (!this->IsOper() || !ModeParser::IsModeChar(chr))
+ return false;
+
+ return this->oper->AllowedSnomasks[chr - 'A'];
}
void UserIOHandler::OnDataReady()
user->nick.c_str(), (unsigned long)recvq.length(), user->MyClass->GetRecvqMax());
return;
}
+
unsigned long sendqmax = ULONG_MAX;
if (!user->HasPrivPermission("users/flood/increased-buffers"))
sendqmax = user->MyClass->GetSendqSoftMax();
+
unsigned long penaltymax = ULONG_MAX;
if (!user->HasPrivPermission("users/flood/no-fakelag"))
penaltymax = user->MyClass->GetPenaltyThreshold() * 1000;
+ // The cleaned message sent by the user or empty if not found yet.
+ std::string line;
+
+ // The position of the most \n character or npos if not found yet.
+ std::string::size_type eolpos;
+
+ // The position within the recvq of the current character.
+ std::string::size_type qpos;
+
while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
{
- std::string line;
- line.reserve(ServerInstance->Config->Limits.MaxLine);
- std::string::size_type qpos = 0;
- while (qpos < recvq.length())
+ // Check the newly received data for an EOL.
+ eolpos = recvq.find('\n', checked_until);
+ if (eolpos == std::string::npos)
{
- char c = recvq[qpos++];
+ checked_until = recvq.length();
+ return;
+ }
+
+ // We've found a line! Clean it up and move it to the line buffer.
+ line.reserve(eolpos);
+ for (qpos = 0; qpos < eolpos; ++qpos)
+ {
+ char c = recvq[qpos];
switch (c)
{
- case '\0':
- c = ' ';
- break;
- case '\r':
- continue;
- case '\n':
- goto eol_found;
+ case '\0':
+ c = ' ';
+ break;
+ case '\r':
+ continue;
}
- if (line.length() < ServerInstance->Config->Limits.MaxLine - 2)
- line.push_back(c);
+
+ line.push_back(c);
}
- // if we got here, the recvq ran out before we found a newline
- return;
-eol_found:
+
// just found a newline. Terminate the string, and pull it out of recvq
- recvq.erase(0, qpos);
+ recvq.erase(0, eolpos + 1);
+ checked_until = 0;
// TODO should this be moved to when it was inserted in recvq?
ServerInstance->stats.Recv += qpos;
user->bytes_in += qpos;
user->cmds_in++;
- ServerInstance->Parser.ProcessBuffer(line, user);
+ ServerInstance->Parser.ProcessBuffer(user, line);
if (user->quitting)
return;
+
+ // clear() does not reclaim memory associated with the string, so our .reserve() call is safe
+ line.clear();
}
+
if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag)
ServerInstance->Users->QuitUser(user, "Excess Flood");
}
WriteData(data);
}
-void UserIOHandler::OnError(BufferedSocketError)
+void UserIOHandler::SwapInternals(UserIOHandler& other)
+{
+ StreamSocket::SwapInternals(other);
+ std::swap(checked_until, other.checked_until);
+}
+
+bool UserIOHandler::OnSetEndPoint(const irc::sockets::sockaddrs& server, const irc::sockets::sockaddrs& client)
{
- ServerInstance->Users->QuitUser(user, getError());
+ memcpy(&user->server_sa, &server, sizeof(irc::sockets::sockaddrs));
+ user->SetClientIP(client);
+ return !user->quitting;
+}
+
+void UserIOHandler::OnError(BufferedSocketError sockerr)
+{
+ ModResult res;
+ FIRST_MOD_RESULT(OnConnectionFail, res, (user, sockerr));
+ if (res != MOD_RES_ALLOW)
+ ServerInstance->Users->QuitUser(user, getError());
}
CullResult User::cull()
if (!quitting)
ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
- if (client_sa.sa.sa_family != AF_UNSPEC)
+ if (client_sa.family() != AF_UNSPEC)
ServerInstance->Users->RemoveCloneCounts(this);
+ if (server->IsULine())
+ stdalgo::erase(ServerInstance->Users->all_ulines, this);
+
return Extensible::cull();
}
void User::Oper(OperInfo* info)
{
ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
- if (this->IsModeSet(opermh))
- this->UnOper();
-
- this->SetMode(opermh, true);
+ if (opermh)
+ {
+ if (this->IsModeSet(opermh))
+ this->UnOper();
+ this->SetMode(opermh, true);
+ }
this->oper = info;
- this->WriteCommand("MODE", "+o");
+
+ LocalUser* localuser = IS_LOCAL(this);
+ if (localuser)
+ {
+ Modes::ChangeList changelist;
+ changelist.push_add(opermh);
+ ClientProtocol::Events::Mode modemsg(ServerInstance->FakeClient, NULL, localuser, changelist);
+ localuser->Send(modemsg);
+ }
+
FOREACH_MOD(OnOper, (this, info->name));
std::string opername;
if (info->oper_block)
opername = info->oper_block->getString("name");
- if (IS_LOCAL(this))
- {
- LocalUser* l = IS_LOCAL(this);
- std::string vhost = oper->getConfig("vhost");
- if (!vhost.empty())
- l->ChangeDisplayedHost(vhost);
- std::string opClass = oper->getConfig("class");
- if (!opClass.empty())
- l->SetClass(opClass);
- }
-
- ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",
+ ServerInstance->SNO->WriteToSnoMask('o', "%s (%s@%s) is now a server operator of type %s (using oper '%s')",
nick.c_str(), ident.c_str(), GetRealHost().c_str(), oper->name.c_str(), opername.c_str());
this->WriteNumeric(RPL_YOUAREOPER, InspIRCd::Format("You are now %s %s", strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->name.c_str()));
- ServerInstance->Logs->Log("OPER", LOG_DEFAULT, "%s opered as type: %s", GetFullRealHost().c_str(), oper->name.c_str());
ServerInstance->Users->all_opers.push_back(this);
// Expand permissions from config for faster lookup
- if (IS_LOCAL(this))
+ if (localuser)
oper->init();
FOREACH_MOD(OnPostOper, (this, oper->name, opername));
}
+namespace
+{
+ bool ParseModeList(std::bitset<64>& modeset, ConfigTag* tag, const std::string& field)
+ {
+ std::string modes;
+ bool hasmodes = tag->readString(field, modes);
+ for (std::string::const_iterator iter = modes.begin(); iter != modes.end(); ++iter)
+ {
+ const char& chr = *iter;
+ if (chr == '*')
+ modeset.set();
+ else if (ModeParser::IsModeChar(chr))
+ modeset.set(chr - 'A');
+ else
+ ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "'%c' is not a valid value for <class:%s>, ignoring...", chr, field.c_str());
+ }
+ return hasmodes;
+ }
+}
+
void OperInfo::init()
{
AllowedOperCommands.Clear();
AllowedPrivs.Clear();
AllowedUserModes.reset();
AllowedChanModes.reset();
+ AllowedSnomasks.reset();
AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
+ bool defaultsnomasks = true;
for(std::vector<reference<ConfigTag> >::iterator iter = class_blocks.begin(); iter != class_blocks.end(); ++iter)
{
ConfigTag* tag = *iter;
AllowedOperCommands.AddList(tag->getString("commands"));
AllowedPrivs.AddList(tag->getString("privs"));
- std::string modes = tag->getString("usermodes");
- for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
- {
- if (*c == '*')
- {
- this->AllowedUserModes.set();
- }
- else if (*c >= 'A' && *c <= 'z')
- {
- this->AllowedUserModes[*c - 'A'] = true;
- }
- }
-
- modes = tag->getString("chanmodes");
- for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
- {
- if (*c == '*')
- {
- this->AllowedChanModes.set();
- }
- else if (*c >= 'A' && *c <= 'z')
- {
- this->AllowedChanModes[*c - 'A'] = true;
- }
- }
+ ParseModeList(AllowedChanModes, tag, "chanmodes");
+ ParseModeList(AllowedUserModes, tag, "usermodes");
+ if (ParseModeList(AllowedSnomasks, tag, "snomasks"))
+ defaultsnomasks = false;
}
+
+ // Compatibility for older configs that don't have the snomasks field.
+ if (defaultsnomasks)
+ AllowedSnomasks.set();
}
void User::UnOper()
*/
oper = NULL;
+ // Remove the user from the oper list
+ stdalgo::vector::swaperase(ServerInstance->Users->all_opers, this);
+
+ // If the user is quitting we shouldn't remove any modes as it results in
+ // mode messages being broadcast across the network.
+ if (quitting)
+ return;
/* Remove all oper only modes from the user when the deoper - Bug #466*/
Modes::ChangeList changelist;
ServerInstance->Modes->Process(this, NULL, this, changelist);
- // Remove the user from the oper list
- stdalgo::vector::swaperase(ServerInstance->Users->all_opers, this);
-
ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
- this->SetMode(opermh, false);
+ if (opermh)
+ this->SetMode(opermh, false);
+ FOREACH_MOD(OnPostDeoper, (this));
}
/*
}
else if (a->type == CC_DENY)
{
- ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection"));
+ ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection", 1));
return;
}
else if (clone_count)
{
ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
if (a->maxconnwarn)
- ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString().c_str());
+ {
+ ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum local connections for the %s class (%ld) exceeded by %s",
+ a->name.c_str(), a->GetMaxLocal(), this->GetIPString().c_str());
+ }
return;
}
else if ((a->GetMaxGlobal()) && (clonecounts.global > a->GetMaxGlobal()))
{
ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
if (a->maxconnwarn)
- ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString().c_str());
+ {
+ ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum global connections for the %s class (%ld) exceeded by %s",
+ a->name.c_str(), a->GetMaxGlobal(), this->GetIPString().c_str());
+ }
return;
}
}
- this->nping = ServerInstance->Time() + a->GetPingTime();
+ this->nextping = ServerInstance->Time() + a->GetPingTime();
}
bool LocalUser::CheckLines(bool doZline)
/*
* You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT.
* At the time AddClient is called, we don't have a resolved host, by here we probably do - which
- * may put the user into a totally seperate class with different restrictions! so we *must* check again.
+ * may put the user into a totally separate class with different restrictions! so we *must* check again.
* Don't remove this! -- w00t
*/
MyClass = NULL;
if (quitting)
return;
- this->WriteNumeric(RPL_WELCOME, InspIRCd::Format("Welcome to the %s IRC Network %s", ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str()));
- this->WriteNumeric(RPL_YOURHOSTIS, InspIRCd::Format("Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH));
- this->WriteNumeric(RPL_SERVERCREATED, InspIRCd::TimeString(ServerInstance->startup_time, "This server was created %H:%M:%S %b %d %Y"));
-
- const TR1NS::array<std::string, 3>& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
- this->WriteNumeric(RPL_SERVERVERSION, ServerInstance->Config->ServerName, INSPIRCD_BRANCH, modelist[0], modelist[1], modelist[2]);
-
- ServerInstance->ISupport.SendTo(this);
-
- /* Now registered */
- if (ServerInstance->Users->unregistered_count)
- ServerInstance->Users->unregistered_count--;
-
- /* Trigger MOTD and LUSERS output, give modules a chance too */
- ModResult MOD_RESULT;
- std::string command("LUSERS");
- std::vector<std::string> parameters;
- FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
- if (!MOD_RESULT)
- ServerInstance->Parser.CallHandler(command, parameters, this);
-
- MOD_RESULT = MOD_RES_PASSTHRU;
- command = "MOTD";
- FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
- if (!MOD_RESULT)
- ServerInstance->Parser.CallHandler(command, parameters, this);
-
- if (ServerInstance->Config->RawLog)
- WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
-
/*
* We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
* for a user that doesn't exist yet.
*/
FOREACH_MOD(OnUserConnect, (this));
+ /* Now registered */
+ if (ServerInstance->Users->unregistered_count)
+ ServerInstance->Users->unregistered_count--;
this->registered = REG_ALL;
FOREACH_MOD(OnPostConnect, (this));
ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]",
- this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->fullname.c_str());
+ this->server_sa.port(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->GetRealName().c_str());
ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding NEGATIVE hit for " + this->GetIPString());
ServerInstance->BanCache.AddHit(this->GetIPString(), "", "");
// reset the flood penalty (which could have been raised due to things like auto +x)
}
if (this->registered == REG_ALL)
- this->WriteCommon("NICK %s",newnick.c_str());
- std::string oldnick = nick;
+ {
+ ClientProtocol::Messages::Nick nickmsg(this, newnick);
+ ClientProtocol::Event nickevent(ServerInstance->GetRFCEvents().nick, nickmsg);
+ this->WriteCommonRaw(nickevent, true);
+ }
+ const std::string oldnick = nick;
nick = newnick;
InvalidateCache();
void LocalUser::OverruleNick()
{
- this->WriteFrom(this, "NICK %s", this->uuid.c_str());
+ {
+ ClientProtocol::Messages::Nick nickmsg(this, this->uuid);
+ this->Send(ServerInstance->GetRFCEvents().nick, nickmsg);
+ }
this->WriteNumeric(ERR_NICKNAMEINUSE, this->nick, "Nickname overruled.");
// Clear the bit before calling ChangeNick() to make it NOT run the OnUserPostNick() hook
this->ChangeNick(this->uuid);
}
-int LocalUser::GetServerPort()
-{
- switch (this->server_sa.sa.sa_family)
- {
- case AF_INET6:
- return htons(this->server_sa.in6.sin6_port);
- case AF_INET:
- return htons(this->server_sa.in4.sin_port);
- }
- return 0;
-}
-
const std::string& User::GetIPString()
{
if (cachedip.empty())
return realhost;
}
+const std::string& User::GetRealName() const
+{
+ return realname;
+}
+
irc::sockets::cidr_mask User::GetCIDRMask()
{
- int range = 0;
- switch (client_sa.sa.sa_family)
+ unsigned char range = 0;
+ switch (client_sa.family())
{
case AF_INET6:
range = ServerInstance->Config->c_ipv6_range;
return irc::sockets::cidr_mask(client_sa, range);
}
-bool User::SetClientIP(const std::string& address, bool recheck_eline)
+bool User::SetClientIP(const std::string& address)
{
- this->InvalidateCache();
- return irc::sockets::aptosa(address, 0, client_sa);
+ irc::sockets::sockaddrs sa;
+ if (!irc::sockets::aptosa(address, client_sa.port(), sa))
+ return false;
+
+ User::SetClientIP(sa);
+ return true;
}
-void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
+void User::SetClientIP(const irc::sockets::sockaddrs& sa)
{
- this->InvalidateCache();
+ const std::string oldip(GetIPString());
memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
+ this->InvalidateCache();
+
+ // If the users hostname was their IP then update it.
+ if (GetRealHost() == oldip)
+ ChangeRealHost(GetIPString(), false);
+ if (GetDisplayedHost() == oldip)
+ ChangeDisplayedHost(GetIPString());
}
-bool LocalUser::SetClientIP(const std::string& address, bool recheck_eline)
+bool LocalUser::SetClientIP(const std::string& address)
{
irc::sockets::sockaddrs sa;
- if (!irc::sockets::aptosa(address, 0, sa))
- // Invalid
+ if (!irc::sockets::aptosa(address, client_sa.port(), sa))
return false;
- LocalUser::SetClientIP(sa, recheck_eline);
+ LocalUser::SetClientIP(sa);
return true;
}
-void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
+void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa)
{
- if (sa != client_sa)
- {
- User::SetClientIP(sa);
- if (recheck_eline)
- this->exempt = (ServerInstance->XLines->MatchesLine("E", this) != NULL);
-
- FOREACH_MOD(OnSetUserIP, (this));
- }
-}
+ if (sa == client_sa)
+ return;
-static std::string wide_newline("\r\n");
+ ServerInstance->Users->RemoveCloneCounts(this);
+ User::SetClientIP(sa);
+ ServerInstance->Users->AddClone(this);
-void User::Write(const std::string& text)
-{
-}
+ // Recheck the connect class.
+ this->MyClass = NULL;
+ this->SetClass();
+ this->CheckClass();
-void User::Write(const char *text, ...)
-{
+ if (!quitting)
+ FOREACH_MOD(OnSetUserIP, (this));
}
-void LocalUser::Write(const std::string& text)
+void LocalUser::Write(const ClientProtocol::SerializedMessage& text)
{
if (!SocketEngine::BoundsCheckFd(&eh))
return;
- if (text.length() > ServerInstance->Config->Limits.MaxLine - 2)
+ if (ServerInstance->Config->RawLog)
{
- // this should happen rarely or never. Crop the string at 512 and try again.
- std::string try_again(text, 0, ServerInstance->Config->Limits.MaxLine - 2);
- Write(try_again);
- return;
- }
+ if (text.empty())
+ return;
+
+ std::string::size_type nlpos = text.find_first_of("\r\n", 0, 2);
+ if (nlpos == std::string::npos)
+ nlpos = text.length(); // TODO is this ok, test it
- ServerInstance->Logs->Log("USEROUTPUT", LOG_RAWIO, "C[%s] O %s", uuid.c_str(), text.c_str());
+ ServerInstance->Logs->Log("USEROUTPUT", LOG_RAWIO, "C[%s] O %.*s", uuid.c_str(), (int) nlpos, text.c_str());
+ }
eh.AddWriteBuf(text);
- eh.AddWriteBuf(wide_newline);
- ServerInstance->stats.Sent += text.length() + 2;
- this->bytes_out += text.length() + 2;
+ const size_t bytessent = text.length() + 2;
+ ServerInstance->stats.Sent += bytessent;
+ this->bytes_out += bytessent;
this->cmds_out++;
}
-/** Write()
- */
-void LocalUser::Write(const char *text, ...)
-{
- std::string textbuffer;
- VAFORMAT(textbuffer, text, text);
- this->Write(textbuffer);
-}
-
-void User::WriteServ(const std::string& text)
+void LocalUser::Send(ClientProtocol::Event& protoev)
{
- this->Write(":%s %s",ServerInstance->Config->ServerName.c_str(),text.c_str());
-}
-
-/** WriteServ()
- * Same as Write(), except `text' is prefixed with `:server.name '.
- */
-void User::WriteServ(const char* text, ...)
-{
- std::string textbuffer;
- VAFORMAT(textbuffer, text, text);
- this->WriteServ(textbuffer);
-}
+ if (!serializer)
+ {
+ ServerInstance->Logs->Log("USERS", LOG_DEBUG, "BUG: LocalUser::Send() called on %s who does not have a serializer!",
+ GetFullRealHost().c_str());
+ return;
+ }
-void User::WriteCommand(const char* command, const std::string& text)
-{
- this->WriteServ(command + (this->registered & REG_NICK ? " " + this->nick : " *") + " " + text);
+ // In the most common case a static LocalUser field, sendmsglist, is passed to the event to be
+ // populated. The list is cleared before returning.
+ // To handle re-enters, if sendmsglist is non-empty upon entering the method then a temporary
+ // list is used instead of the static one.
+ if (sendmsglist.empty())
+ {
+ Send(protoev, sendmsglist);
+ sendmsglist.clear();
+ }
+ else
+ {
+ ClientProtocol::MessageList msglist;
+ Send(protoev, msglist);
+ }
}
-namespace
+void LocalUser::Send(ClientProtocol::Event& protoev, ClientProtocol::MessageList& msglist)
{
- std::string BuildNumeric(const std::string& source, User* targetuser, unsigned int num, const std::vector<std::string>& params)
+ // Modules can personalize the messages sent per user for the event
+ protoev.GetMessagesForUser(this, msglist);
+ for (ClientProtocol::MessageList::const_iterator i = msglist.begin(); i != msglist.end(); ++i)
{
- const char* const target = (targetuser->registered & REG_NICK ? targetuser->nick.c_str() : "*");
- std::string raw = InspIRCd::Format(":%s %03u %s", source.c_str(), num, target);
- if (!params.empty())
- {
- for (std::vector<std::string>::const_iterator i = params.begin(); i != params.end()-1; ++i)
- raw.append(1, ' ').append(*i);
- raw.append(" :").append(params.back());
- }
- return raw;
+ ClientProtocol::Message& curr = **i;
+ ModResult res;
+ FIRST_MOD_RESULT(OnUserWrite, res, (this, curr));
+ if (res != MOD_RES_DENY)
+ Write(serializer->SerializeForUser(this, curr));
}
}
void User::WriteNumeric(const Numeric::Numeric& numeric)
{
+ LocalUser* const localuser = IS_LOCAL(this);
+ if (!localuser)
+ return;
+
ModResult MOD_RESULT;
FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric));
if (MOD_RESULT == MOD_RES_DENY)
return;
- const std::string& servername = (numeric.GetServer() ? numeric.GetServer()->GetName() : ServerInstance->Config->ServerName);
- this->Write(BuildNumeric(servername, this, numeric.GetNumeric(), numeric.GetParams()));
-}
-
-void User::WriteFrom(User *user, const std::string &text)
-{
- const std::string message = ":" + user->GetFullHost() + " " + text;
- this->Write(message);
-}
-
-
-/* write text from an originating user to originating user */
-
-void User::WriteFrom(User *user, const char* text, ...)
-{
- std::string textbuffer;
- VAFORMAT(textbuffer, text, text);
- this->WriteFrom(user, textbuffer);
+ ClientProtocol::Messages::Numeric numericmsg(numeric, localuser);
+ localuser->Send(ServerInstance->GetRFCEvents().numeric, numericmsg);
}
void User::WriteRemoteNotice(const std::string& text)
{
- ServerInstance->PI->SendUserNotice(this, text);
+ ServerInstance->PI->SendMessage(this, text, MSG_NOTICE);
}
void LocalUser::WriteRemoteNotice(const std::string& text)
{
class WriteCommonRawHandler : public User::ForEachNeighborHandler
{
- const std::string& msg;
+ ClientProtocol::Event& ev;
void Execute(LocalUser* user) CXX11_OVERRIDE
{
- user->Write(msg);
+ user->Send(ev);
}
public:
- WriteCommonRawHandler(const std::string& message)
- : msg(message)
+ WriteCommonRawHandler(ClientProtocol::Event& protoev)
+ : ev(protoev)
{
}
};
}
-void User::WriteCommon(const char* text, ...)
+void User::WriteCommonRaw(ClientProtocol::Event& protoev, bool include_self)
{
- std::string textbuffer;
- VAFORMAT(textbuffer, text, text);
- textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
- this->WriteCommonRaw(textbuffer, true);
-}
-
-void User::WriteCommonRaw(const std::string &line, bool include_self)
-{
- WriteCommonRawHandler handler(line);
+ WriteCommonRawHandler handler(protoev);
ForEachNeighbor(handler, include_self);
}
return false;
}
-bool User::ChangeName(const std::string& gecos)
+bool User::ChangeRealName(const std::string& real)
{
- if (!this->fullname.compare(gecos))
+ if (!this->realname.compare(real))
return true;
if (IS_LOCAL(this))
{
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(OnChangeLocalUserGECOS, MOD_RESULT, (IS_LOCAL(this),gecos));
+ FIRST_MOD_RESULT(OnPreChangeRealName, MOD_RESULT, (IS_LOCAL(this), real));
if (MOD_RESULT == MOD_RES_DENY)
return false;
- FOREACH_MOD(OnChangeName, (this,gecos));
}
- this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
+ FOREACH_MOD(OnChangeRealName, (this, real));
+ this->realname.assign(real, 0, ServerInstance->Config->Limits.MaxReal);
return true;
}
if (GetDisplayedHost() == shost)
return true;
- if (IS_LOCAL(this))
+ LocalUser* luser = IS_LOCAL(this);
+ if (luser)
{
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (IS_LOCAL(this),shost));
+ FIRST_MOD_RESULT(OnPreChangeHost, MOD_RESULT, (luser, shost));
if (MOD_RESULT == MOD_RES_DENY)
return false;
}
this->InvalidateCache();
- if (IS_LOCAL(this))
+ if (IS_LOCAL(this) && this->registered != REG_NONE)
this->WriteNumeric(RPL_YOURDISPLAYEDHOST, this->GetDisplayedHost(), "is now your displayed host");
return true;
void User::ChangeRealHost(const std::string& host, bool resetdisplay)
{
- if (displayhost == host)
+ // If the real host is the new host and we are not resetting the
+ // display host then we have nothing to do.
+ const bool changehost = (realhost != host);
+ if (!changehost && !resetdisplay)
return;
-
+
+ // If the displayhost is not set and we are not resetting it then
+ // we need to copy it to the displayhost field.
if (displayhost.empty() && !resetdisplay)
displayhost = realhost;
+ // If the displayhost is the new host or we are resetting it then
+ // we clear its contents to save memory.
else if (displayhost == host || resetdisplay)
displayhost.clear();
+ // If we are just resetting the display host then we don't need to
+ // do anything else.
+ if (!changehost)
+ return;
+
+ // Don't call the OnChangeRealHost event when initialising a user.
+ if (!realhost.empty())
+ FOREACH_MOD(OnChangeRealHost, (this, host));
+
realhost = host;
this->InvalidateCache();
}
*/
void LocalUser::SetClass(const std::string &explicit_name)
{
- ConnectClass *found = NULL;
-
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Setting connect class for UID %s", this->uuid.c_str());
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Setting connect class for %s (%s) ...",
+ this->uuid.c_str(), this->GetFullRealHost().c_str());
+ ConnectClass *found = NULL;
if (!explicit_name.empty())
{
for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); ++i)
if (explicit_name == c->name)
{
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Explicitly set to %s", explicit_name.c_str());
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Connect class explicitly set to %s",
+ explicit_name.c_str());
found = c;
}
}
for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); ++i)
{
ConnectClass* c = *i;
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Checking %s", c->GetName().c_str());
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Checking the %s connect class ...",
+ c->GetName().c_str());
ModResult MOD_RESULT;
FIRST_MOD_RESULT(OnSetConnectClass, MOD_RESULT, (this,c));
if (MOD_RESULT == MOD_RES_DENY)
continue;
+
if (MOD_RESULT == MOD_RES_ALLOW)
{
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class forced by module to %s", c->GetName().c_str());
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class was explicitly chosen by a module",
+ c->GetName().c_str());
found = c;
break;
}
if (c->type == CC_NAMED)
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as neither <connect:allow> nor <connect:deny> are set",
+ c->GetName().c_str());
continue;
+ }
bool regdone = (registered != REG_NONE);
if (c->config->getBool("registered", regdone) != regdone)
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires that the user is %s",
+ c->GetName().c_str(), regdone ? "not fully connected" : "fully connected");
continue;
+ }
/* check if host matches.. */
if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
- !InspIRCd::MatchCIDR(this->GetRealHost(), c->GetHost(), NULL))
+ !InspIRCd::MatchCIDR(this->GetRealHost(), c->GetHost(), NULL))
{
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "No host match (for %s)", c->GetHost().c_str());
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as neither the host (%s) nor the IP (%s) matches %s",
+ c->GetName().c_str(), this->GetRealHost().c_str(), this->GetIPString().c_str(), c->GetHost().c_str());
continue;
}
*/
if (c->limit && (c->GetReferenceCount() >= c->limit))
{
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it has reached its user limit (%lu)",
+ c->GetName().c_str(), c->limit);
continue;
}
- /* if it requires a port ... */
- if (!c->ports.empty())
+ /* if it requires a port and our port doesn't match, fail */
+ if (!c->ports.empty() && !c->ports.count(this->server_sa.port()))
{
- /* and our port doesn't match, fail. */
- if (!c->ports.count(this->GetServerPort()))
- {
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Requires a different port, skipping");
- continue;
- }
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as the connection port (%d) is not any of %s",
+ c->GetName().c_str(), this->server_sa.port(), stdalgo::string::join(c->ports).c_str());
+ continue;
}
- if (regdone && !c->config->getString("password").empty())
+ if (regdone && !c->password.empty() && !ServerInstance->PassCompare(this, c->password, password, c->passwordhash))
{
- if (!ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash")))
- {
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Bad password, skipping");
- continue;
- }
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as requires a password and %s",
+ c->GetName().c_str(), password.empty() ? "one was not provided" : "the provided password was incorrect");
+ continue;
}
/* we stop at the first class that meets ALL critera. */
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is suitable for %s (%s)",
+ c->GetName().c_str(), this->uuid.c_str(), this->GetFullRealHost().c_str());
found = c;
break;
}
++i;
c->DelUser(this);
}
+}
+
+void User::WriteNotice(const std::string& text)
+{
+ LocalUser* const localuser = IS_LOCAL(this);
+ if (!localuser)
+ return;
- this->UnOper();
+ ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, localuser, text, MSG_NOTICE);
+ localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg);
}
const std::string& FakeUser::GetFullHost()
{
- if (!ServerInstance->Config->HideWhoisServer.empty())
- return ServerInstance->Config->HideWhoisServer;
+ if (!ServerInstance->Config->HideServer.empty())
+ return ServerInstance->Config->HideServer;
return server->GetName();
}
const std::string& FakeUser::GetFullRealHost()
{
- if (!ServerInstance->Config->HideWhoisServer.empty())
- return ServerInstance->Config->HideWhoisServer;
+ if (!ServerInstance->Config->HideServer.empty())
+ return ServerInstance->Config->HideServer;
return server->GetName();
}
ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
- : config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask),
- pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0),
- penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(ServerInstance->Config->MaxChans),
- limit(0), resolvehostnames(true)
+ : config(tag)
+ , type(t)
+ , fakelag(true)
+ , name("unnamed")
+ , registration_timeout(0)
+ , host(mask)
+ , pingtime(0)
+ , softsendqmax(0)
+ , hardsendqmax(0)
+ , recvqmax(0)
+ , penaltythreshold(0)
+ , commandrate(0)
+ , maxlocal(0)
+ , maxglobal(0)
+ , maxconnwarn(true)
+ , maxchans(0)
+ , limit(0)
+ , resolvehostnames(true)
{
}
Update(&parent);
name = "unnamed";
type = t;
- config = tag;
+ host = mask;
+
+ // Connect classes can inherit from each other but this is problematic for modules which can't use
+ // ConnectClass::Update so we build a hybrid tag containing all of the values set on this class as
+ // well as the parent class.
+ ConfigItems* items = NULL;
+ config = ConfigTag::create(tag->tag, tag->src_name, tag->src_line, items);
+
+ const ConfigItems& parentkeys = parent.config->getItems();
+ for (ConfigItems::const_iterator piter = parentkeys.begin(); piter != parentkeys.end(); ++piter)
+ {
+ // The class name and parent name are not inherited
+ if (stdalgo::string::equalsci(piter->first, "name") || stdalgo::string::equalsci(piter->first, "parent"))
+ continue;
+
+ // Store the item in the config tag. If this item also
+ // exists in the child it will be overwritten.
+ (*items)[piter->first] = piter->second;
+ }
+
+ const ConfigItems& childkeys = tag->getItems();
+ for (ConfigItems::const_iterator citer = childkeys.begin(); citer != childkeys.end(); ++citer)
+ {
+ // This will overwrite the parent value if present.
+ (*items)[citer->first] = citer->second;
+ }
}
void ConnectClass::Update(const ConnectClass* src)
limit = src->limit;
resolvehostnames = src->resolvehostnames;
ports = src->ports;
+ password = src->password;
+ passwordhash = src->passwordhash;
}
projects / user / henk / code / inspircd.git / blobdiff