ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert passforward to use the new template system.

Browse Source
This commit is contained in:
Sadie Powell 2022-06-15 12:56:42 +01:00
parent 429b973af6
commit 72ecbb3285
2 changed files with 17 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/conf/modules.conf.example
View File

@ -1647,14 +1647,14 @@
# forwardmsg: Message to send to users when forwarding their
# password. You can use the following variables in this message:
#
# $nick The nickname of the authenticating user.
# $nickrequired The nickname of the service to forward to (see above).
# $pass The password to forward to services.
# $user The username (ident) of the authenticating user.
forwardmsg="NOTICE $nick :*** Forwarding password to $nickrequired"
# %nick% The nickname of the authenticating user.
# %nickrequired% The nickname of the service to forward to (see above).
# %pass% The password to forward to services.
# %user% The username (ident) of the authenticating user.
forwardmsg="NOTICE %nick% :*** Forwarding password to %nickrequired%"
# cmd: The message to send to forward passwords to services.
cmd="SQUERY $nickrequired :IDENTIFY $nick $pass">
cmd="SQUERY %nickrequired% :IDENTIFY %nick% %pass%">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Password hash module: Allows hashed passwords to be used.

53
src/modules/m_passforward.cpp
View File

@ -44,43 +44,18 @@ public:
{
auto tag = ServerInstance->Config->ConfValue("passforward");
nickrequired = tag->getString("nick", "NickServ");
forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding password to $nickrequired");
forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $nick $pass", 1);
forwardmsg = tag->getString("forwardmsg", "NOTICE %nick% :*** Forwarding password to %nickrequired%");
forwardcmd = tag->getString("cmd", "SQUERY %nickrequired% :IDENTIFY %nick% %pass%", 1);
}
void FormatStr(const LocalUser* user, const std::string& format, const std::string& pass, std::string& result)
std::string FormatStr(const LocalUser* user, const std::string& format, const std::string& pass)
{
for (unsigned int i = 0; i < format.length(); i++)
{
char c = format[i];
if (c == '$')
{
if (!format.compare(i, 13, "$nickrequired", 13))
{
result.append(nickrequired);
i += 12;
}
else if (!format.compare(i, 5, "$nick", 5))
{
result.append(user->nick);
i += 4;
}
else if (!format.compare(i, 5, "$user", 5))
{
result.append(user->ident);
i += 4;
}
else if (!format.compare(i, 5, "$pass", 5))
{
result.append(pass);
i += 4;
}
else
result.push_back(c);
}
else
result.push_back(c);
}
return Template::Replace(format, {
{ "nick", user->nick, },
{ "nickrequired", nickrequired, },
{ "pass", pass, },
{ "user", user->ident, },
});
}
void OnPostConnect(User* ruser) override
@ -118,16 +93,10 @@ public:
return;
}
std::string tmp;
if (!forwardmsg.empty())
{
FormatStr(user, forwardmsg, pass, tmp);
ServerInstance->Parser.ProcessBuffer(user, tmp);
tmp.clear();
}
ServerInstance->Parser.ProcessBuffer(user, FormatStr(user, forwardmsg, pass));
FormatStr(user, forwardcmd, pass, tmp);
ServerInstance->Parser.ProcessBuffer(user, tmp);
ServerInstance->Parser.ProcessBuffer(user, FormatStr(user, forwardcmd, pass));
}
};