X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_passforward.cpp;h=2eaabe247c8393e835f9abe1c05ba2019f606073;hb=9ea8ecfaf395955a4e58c743c2f9e35a26528039;hp=c04b306b1b8482ed0155cd801d8b85a11e932f59;hpb=d87bfc277858543ff14cd43f4222c66362464094;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index c04b306b1..2eaabe247 100644
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -17,34 +17,25 @@
  */
 
 
-/* $ModDesc: Forwards a password users can send on connect (for example for NickServ identification). */
-
 #include "inspircd.h"
+#include "modules/account.h"
 
 class ModulePassForward : public Module
 {
- private:
 	std::string nickrequired, forwardmsg, forwardcmd;
 
  public:
-	void init()
-	{
-		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	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
 	{
 		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");
 	}
 
 	void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
@@ -54,22 +45,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;
@@ -82,27 +73,38 @@ class ModulePassForward : public Module
 		}
 	}
 
-	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);
-			if (!u || !ServerInstance->ULine(u->server))
+			if (!u || !u->server->IsULine())
 				return;
 		}
 
 		std::string tmp;
-		FormatStr(tmp,forwardmsg, user);
-		user->WriteServ(tmp);
+		FormatStr(tmp, forwardmsg, user);
+		ServerInstance->Parser.ProcessBuffer(user, tmp);
 
 		tmp.clear();
 		FormatStr(tmp,forwardcmd, user);
-		ServerInstance->Parser->ProcessBuffer(tmp,user);
+		ServerInstance->Parser.ProcessBuffer(user, tmp);
 	}
 };