X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=e854b8d4e96f1f52d41322631c7dfb3e872ee1e2;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=f6437fe79330aed4dc0d44645d18127aee1f23c6;hpb=94afde43b086f092bf8128d76d418cb63840e8eb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index f6437fe79..e854b8d4e 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -40,6 +40,17 @@ public:
 };
 typedef std::vector<CGIhost> CGIHostlist;
 
+/*
+ * WEBIRC
+ *  This is used for the webirc method of CGIIRC auth, and is (really) the best way to do these things.
+ *  Syntax: WEBIRC password client hostname ip
+ *  Where password is a shared key, client is the name of the "client" and version (e.g. cgiirc), hostname
+ *  is the resolved host of the client issuing the command and IP is the real IP of the client.
+ *
+ * How it works:
+ *  To tie in with the rest of cgiirc module, and to avoid race conditions, /webirc is only processed locally
+ *  and simply sets metadata on the user, which is later decoded on full connect to give something meaningful.
+ */
 class CommandWebirc : public Command
 {
 	InspIRCd* Me;
@@ -65,7 +76,7 @@ class CommandWebirc : public Command
 						user->Extend("cgiirc_realhost", new std::string(user->host));
 						user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
 						if (notify)
-							ServerInstance->SNO->WriteToSnoMask('O', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], user->host);
+							ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], user->host);
 						user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
 						user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
 						return CMD_LOCALONLY;
@@ -98,7 +109,7 @@ class CGIResolver : public Resolver
 		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
 			if (notify)
-				ServerInstance->SNO->WriteToSnoMask('O', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str());
 
 			strlcpy(them->host, result.c_str(), 63);
 			strlcpy(them->dhost, result.c_str(), 63);
@@ -112,7 +123,7 @@ class CGIResolver : public Resolver
 		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
 		{
 			if (notify)
-				ServerInstance->SNO->WriteToSnoMask('O', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str());
 		}
 	}
 
@@ -134,7 +145,7 @@ public:
 		mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
 		ServerInstance->AddCommand(mycommand);
 
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserQuit, I_OnUserConnect };
+		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
 		ServerInstance->Modules->Attach(eventlist, this, 7);
 	}
 
@@ -240,7 +251,7 @@ public:
 		}
 	}
 
-	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserDisconnect(User* user)
 	{
 		OnCleanup(TYPE_USER, user);
 	}
@@ -344,7 +355,7 @@ public:
 			{
 				/* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */
 				if(NotifyOpers)
-					ServerInstance->SNO->WriteToSnoMask('O', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);
+					ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);
 			}
 			else
 			{
@@ -359,14 +370,14 @@ public:
 				catch (...)
 				{
 					if (NotifyOpers)
-						ServerInstance->SNO->WriteToSnoMask('O', "Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
+						ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
 				}
 			}
 			
 			*user->password = 0;
 
 			/*if(NotifyOpers)
-				ServerInstance->SNO->WriteToSnoMask('O', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/
+				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/
 
 			return true;
 		}
@@ -424,7 +435,7 @@ public:
 			user->InvalidateCache();
 
 			if(NotifyOpers)
-				 ServerInstance->SNO->WriteToSnoMask('O', "Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
+				 ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
 		}
 		/*strlcpy(user->host, newip, 16);
 		strlcpy(user->dhost, newip, 16);