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 08d3533cd120dfe5cc2c920e67a408acf7f48b3a..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)
@@ -82,6 +89,13 @@ class ModulePassForward : public Module
                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 */
@@ -91,11 +105,14 @@ class ModulePassForward : public Module
                }
 
                std::string tmp;
-               FormatStr(tmp, forwardmsg, user);
-               ServerInstance->Parser.ProcessBuffer(user, tmp);
+               if (!forwardmsg.empty())
+               {
+                       FormatStr(tmp, forwardmsg, user);
+                       ServerInstance->Parser.ProcessBuffer(user, tmp);
+                       tmp.clear();
+               }
 
-               tmp.clear();
-               FormatStr(tmp,forwardcmd, user);
+               FormatStr(tmp, forwardcmd, user);
                ServerInstance->Parser.ProcessBuffer(user, tmp);
        }
 };