pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-25 04:56:39 +02:00
Code Activity

Allow a different badpasslimit for partially connected users.

Browse Source 
Closes #455.
This commit is contained in:
Sadie Powell
2025-08-21 10:12:13 +01:00
parent 6864bc6171
commit dd13846cad
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/nickserv.example.conf
+16
View File
@@ -605,6 +605,22 @@ module
* The nick of the client which operates as the SASL agent.
*/
#agent = "NickServ"
/*
* Sets the number of invalid SASL authentication attempts before services
* removes a partially-connected user from the network. If not defined then
* the value specified in options:badpasslimit will be used instead.
*/
#badpasslimit = 1
/*
* Sets the time after which invalid SASL authentication attempts are
* forgotten about. If a user does not fail to authenticate in this amount
* of time, the incorrect password count will reset to zero. If not defined
* then the value specified in options:badpasstimeout will be used instead.
*/
#badpasstimeout = 15m
}
/*
modules/nickserv/ns_sasl.cpp
+15 -3
View File
@@ -239,6 +239,9 @@ private:
Anope::map<SASL::Session *> sessions;
public:
unsigned badpasslimit;
unsigned badpasstimeout;
SASLService(Module *o)
: SASL::Service(o)
, Timer(o, 60, true)
@@ -403,7 +406,6 @@ public:
return;
}
const auto badpasslimit = Config->GetBlock("options").Get<unsigned>("badpasslimit");
if (!badpasslimit)
return;
@@ -412,7 +414,6 @@ public:
it = badpasswords.emplace(session->uid, std::make_pair(0, 0)).first;
auto &[invalid_pw_time, invalid_pw_count] = it->second;
const auto badpasstimeout = Config->GetBlock("options").Get<time_t>("badpasstimeout");
if (badpasstimeout > 0 && invalid_pw_time > 0 && invalid_pw_time < Anope::CurTime - badpasstimeout)
invalid_pw_count = 0;
@@ -437,7 +438,6 @@ public:
void Tick() override
{
const auto badpasstimeout = Config->GetBlock("options").Get<time_t>("badpasstimeout");
for (auto it = badpasswords.begin(); it != badpasswords.end(); )
{
if (it->second.first + badpasstimeout < Anope::CurTime)
@@ -500,6 +500,18 @@ public:
catch (ModuleException &) { }
}
void OnReload(Configuration::Conf &conf) override
{
const auto &modconf = conf.GetModule(this);
const auto &options = conf.GetBlock("options");
sasl.badpasslimit = modconf.Get<unsigned>("badpasslimit");
if(!sasl.badpasslimit)
sasl.badpasslimit = options.Get<unsigned>("badpasslimit");
sasl.badpasstimeout = options.Get<time_t>("badpasstimeout");
}
~ModuleSASL() override
{
delete external;