-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
+#include "modules/account.h"
class ModulePassForward : public Module
{
- private:
std::string nickrequired, forwardmsg, forwardcmd;
public:
- ModulePassForward()
- {
- OnRehash(NULL);
- Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 2);
- }
-
- Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
return Version("Sends server password to NickServ", VF_VENDOR);
}
- void OnRehash(User* user)
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- ConfigReader Conf;
- nickrequired = Conf.ReadValue("passforward", "nick", "NickServ", 0);
- forwardmsg = Conf.ReadValue("passforward", "forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired", 0);
- forwardcmd = Conf.ReadValue("passforward", "cmd", "PRIVMSG $nickrequired :IDENTIFY $pass", 0);
+ ConfigTag* tag = ServerInstance->Config->ConfValue("passforward");
+ nickrequired = tag->getString("nick", "NickServ");
+ forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired");
+ forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $pass");
}
- void FormatStr(std::string& result, const std::string& format, const std::string &nick, const std::string &pass)
+ void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
{
for (unsigned int i = 0; i < format.length(); i++)
{
char c = format[i];
if (c == '$')
{
- if (format.substr(i, 13) == "$nickrequired")
+ if (!format.compare(i, 13, "$nickrequired", 13))
{
result.append(nickrequired);
i += 12;
}
- else if (format.substr(i, 5) == "$nick")
+ else if (!format.compare(i, 5, "$nick", 5))
+ {
+ result.append(user->nick);
+ i += 4;
+ }
+ else if (!format.compare(i, 5, "$user", 5))
{
- result.append(nick);
+ result.append(user->ident);
i += 4;
}
- else if (format.substr(i,5) == "$pass")
+ else if (!format.compare(i, 5, "$pass", 5))
{
- result.append(pass);
+ result.append(user->password);
i += 4;
}
else
}
}
- virtual void OnPostConnect(User* ruser)
+ void OnPostConnect(User* ruser) CXX11_OVERRIDE
{
LocalUser* user = IS_LOCAL(ruser);
if (!user || user->password.empty())
return;
+ // If the connect class requires a password, don't forward it
+ if (!user->MyClass->config->getString("password").empty())
+ return;
+
+ AccountExtItem* actext = GetAccountExtItem();
+ if (actext && actext->get(user))
+ {
+ // User is logged in already (probably via SASL) don't forward the password
+ return;
+ }
+
if (!nickrequired.empty())
{
/* Check if nick exists and its server is ulined */
- User* u = ServerInstance->FindNick(nickrequired.c_str());
- if (!u || !ServerInstance->ULine(u->server))
+ User* u = ServerInstance->FindNick(nickrequired);
+ if (!u || !u->server->IsULine())
return;
}
std::string tmp;
- FormatStr(tmp,forwardmsg, user->nick, user->password);
- user->WriteServ(tmp);
+ FormatStr(tmp, forwardmsg, user);
+ ServerInstance->Parser.ProcessBuffer(user, tmp);
tmp.clear();
- FormatStr(tmp,forwardcmd, user->nick, user->password);
- ServerInstance->Parser->ProcessBuffer(tmp,user);
+ FormatStr(tmp,forwardcmd, user);
+ ServerInstance->Parser.ProcessBuffer(user, tmp);
}
};
MODULE_INIT(ModulePassForward)
-