* 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) 2014 satmd <satmd@lain.at>
- * Copyright (C) 2013-2014, 2016-2019 Sadie Powell <sadie@witchery.services>
+ * 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) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
* Copyright (C) 2008 John Brooks <special@inspircd.org>
- * Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2006-2009 Craig Edwards <brain@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
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();
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"));
- const std::string umodes = tag->getString("usermodes");
- for (std::string::const_iterator c = umodes.begin(); c != umodes.end(); ++c)
- {
- const char& chr = *c;
- if (chr == '*')
- this->AllowedUserModes.set();
- else if (ModeParser::IsModeChar(chr))
- this->AllowedUserModes[chr - 'A'] = true;
- }
-
- const std::string cmodes = tag->getString("chanmodes");
- for (std::string::const_iterator c = cmodes.begin(); c != cmodes.end(); ++c)
- {
- const char& chr = *c;
- if (chr == '*')
- this->AllowedChanModes.set();
- else if (ModeParser::IsModeChar(chr))
- this->AllowedChanModes[chr - 'A'] = true;
- }
-
- const std::string snomasks = tag->getString("snomasks", "*");
- for (std::string::const_iterator c = snomasks.begin(); c != snomasks.end(); ++c)
- {
- const char& chr = *c;
- if (chr == '*')
- this->AllowedSnomasks.set();
- else if (ModeParser::IsModeChar(chr))
- this->AllowedSnomasks[chr - '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()
/*
* 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;
FIRST_MOD_RESULT(OnPreChangeRealName, MOD_RESULT, (IS_LOCAL(this), real));
if (MOD_RESULT == MOD_RES_DENY)
return false;
- FOREACH_MOD(OnChangeRealName, (this, real));
}
+ FOREACH_MOD(OnChangeRealName, (this, real));
this->realname.assign(real, 0, ServerInstance->Config->Limits.MaxReal);
return true;
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->server_sa.port()))
- {
- 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->password.empty())
+ if (regdone && !c->password.empty() && !ServerInstance->PassCompare(this, c->password, password, c->passwordhash))
{
- if (!ServerInstance->PassCompare(this, c->password, password, c->passwordhash))
- {
- 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;
}
projects / user / henk / code / inspircd.git / blobdiff