Fix the cloaking module on C++98 compilers.

[user/henk/code/inspircd.git] / src / modules / m_passforward.cpp

diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index 589fc06a6e0586c42de4d04657dd337313b8554a..e373068b859f4762577811098fb380a2bd7dc6af 100644 (file)
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -1,6 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2014 Googolplexed <googol@googolplexed.net>
+ *   Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Boleslaw Tokarski <boleslaw.tokarski@tieto.com>
  *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -18,6 +24,7 @@
 
 
 #include "inspircd.h"
+#include "modules/account.h"
 
 class ModulePassForward : public Module
 {
@@ -26,7 +33,7 @@ class ModulePassForward : public Module
  public:
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Sends server password to NickServ", VF_VENDOR);
+               return Version("Allows the /PASS password to be forwarded to a services pseudoclient such as NickServ.", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -34,7 +41,7 @@ class ModulePassForward : public Module
                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", "PRIVMSG $nickrequired :IDENTIFY $pass");
+               forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $pass", 1);
        }
 
        void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
@@ -44,22 +51,22 @@ class ModulePassForward : public Module
                        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.substr(i, 5) == "$user")
+                               else if (!format.compare(i, 5, "$user", 5))
                                {
                                        result.append(user->ident);
                                        i += 4;
                                }
-                               else if (format.substr(i,5) == "$pass")
+                               else if (!format.compare(i, 5, "$pass", 5))
                                {
                                        result.append(user->password);
                                        i += 4;
@@ -78,21 +85,35 @@ class ModulePassForward : public Module
                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);
-                       if (!u || !ServerInstance->ULine(u->server))
+                       if (!u || !u->server->IsULine())
                                return;
                }
 
                std::string tmp;
-               FormatStr(tmp,forwardmsg, user);
-               user->WriteServ(tmp);
+               if (!forwardmsg.empty())
+               {
+                       FormatStr(tmp, forwardmsg, user);
+                       ServerInstance->Parser.ProcessBuffer(user, tmp);
+                       tmp.clear();
+               }
 
-               tmp.clear();
-               FormatStr(tmp,forwardcmd, user);
-               ServerInstance->Parser->ProcessBuffer(tmp,user);
+               FormatStr(tmp, forwardcmd, user);
+               ServerInstance->Parser.ProcessBuffer(user, tmp);
        }
 };