X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=fd9e329cd17ad6f235d9a65ef7ab316a5e85dd25;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=6c50191e856ea927876e0503f03420b8623cc4f7;hpb=778cac65effc6698cb158069e487ed9e2379fed1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 6c50191e8..fd9e329cd 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -1,13 +1,16 @@
- /* m_dccallow - Jamie Penman-Smithson <jamie@silverdream.org> - September 2006 */
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-using namespace std;
-
-#include <stdio.h>
-#include <vector>
-#include <string.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Povides support for the /DCCALLOW command */
@@ -31,7 +34,7 @@ class DCCAllow
 
 	DCCAllow() { }
 
-	DCCAllow(std::string nick, std::string hm, time_t so, long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
+	DCCAllow(const std::string &nick, const std::string &hm, const time_t so, const long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
 };
 
 typedef std::vector<userrec *> userlist;
@@ -47,7 +50,8 @@ class cmd_dccallow : public command_t
 	cmd_dccallow(InspIRCd* Me) : command_t(Me, "DCCALLOW", 0, 0)
 	{
 		this->source = "m_dccallow.so";
-		syntax = "{[+|-]<nick> <time>}";
+		syntax = "{[+|-]<nick> <time>|HELP|LIST}";
+		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
 	}
 
 	CmdResult Handle(const char **parameters, int pcnt, userrec *user)
@@ -57,7 +61,7 @@ class cmd_dccallow : public command_t
 		{
 			// display current DCCALLOW list
 			DisplayDCCAllowList(user);
-			return CMD_SUCCESS;
+			return CMD_FAILURE;
 		}
 		else if (pcnt > 0)
 		{
@@ -70,13 +74,13 @@ class cmd_dccallow : public command_t
 				{
 					// list current DCCALLOW list
 					DisplayDCCAllowList(user);
-					return CMD_SUCCESS;
+					return CMD_FAILURE;
 				} 
 				else if (!strcasecmp(parameters[0], "HELP"))
 				{
 					// display help
 					DisplayHelp(user);
-					return CMD_SUCCESS;
+					return CMD_FAILURE;
 				}
 			}
 			
@@ -85,7 +89,6 @@ class cmd_dccallow : public command_t
 	
 			if (target)
 			{
-				ServerInstance->Log(DEBUG, "m_dccallow.so: got target %s and action %c", target->nick, action);
 				
 				if (action == '-')
 				{
@@ -109,7 +112,7 @@ class cmd_dccallow : public command_t
 					}
 					else
 					{
-						DELETE(dl);
+						delete  dl;
 						user->Shrink("dccallow_list");
 				
 						// remove from userlist
@@ -132,7 +135,7 @@ class cmd_dccallow : public command_t
 					if (!dl)
 					{
 						dl = new dccallowlist;
-						user->Extend(std::string("dccallow_list"), dl);
+						user->Extend("dccallow_list", dl);
 						// add this user to the userlist
 						ul.push_back(user);
 					}
@@ -141,19 +144,24 @@ class cmd_dccallow : public command_t
 						if (k->nickname == target->nick)
 						{
 							user->WriteServ("996 %s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick);
-							return CMD_SUCCESS;
+							return CMD_FAILURE;
+						}
+						else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask))
+						{
+							user->WriteServ("996 %s %s :You cannot add yourself to your own DCCALLOW list!", user->nick, user->nick);
+							return CMD_FAILURE;
 						}
 					}
 				
 					std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
-					std::string default_length = Conf->ReadValue("dccallow", "length", 0).c_str();
+					std::string default_length = Conf->ReadValue("dccallow", "length", 0);
 		
 					long length;
-					if (pcnt == 1 || ServerInstance->Duration(parameters[1]) < 1)
+					if (pcnt < 2)
 					{
-						length = ServerInstance->Duration(default_length.c_str());
+						length = ServerInstance->Duration(default_length);
 					} 
-					else if (parameters[1] == 0)
+					else if (!atoi(parameters[1]))
 					{
 						length = 0;
 					}
@@ -177,7 +185,8 @@ class cmd_dccallow : public command_t
 					{
 						user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
 					}
-				
+
+					/* route it. */
 					return CMD_SUCCESS;
 				}
 			}
@@ -188,7 +197,7 @@ class cmd_dccallow : public command_t
 				return CMD_FAILURE;
 			}
 		}
-		return CMD_SUCCESS;
+		return CMD_FAILURE;
 	}
 
 	void DisplayHelp(userrec* user)
@@ -240,7 +249,7 @@ class ModuleDCCAllow : public Module
  public:
 
 	ModuleDCCAllow(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		Conf = new ConfigReader(ServerInstance);
 		mycommand = new cmd_dccallow(ServerInstance);
@@ -253,13 +262,13 @@ class ModuleDCCAllow : public Module
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
 		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason)
+	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
 	{
 		dccallowlist* dl;
 	
@@ -267,7 +276,7 @@ class ModuleDCCAllow : public Module
 		user->GetExt("dccallow_list", dl);
 		if (dl)
 		{
-			DELETE(dl);
+			delete dl;
 			user->Shrink("dccallow_list");
 			RemoveFromUserlist(user);
 		}
@@ -284,21 +293,28 @@ class ModuleDCCAllow : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status)
+	virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreNotice(user, dest, target_type, text, status);
+		return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
 	}
 
-	virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		Expire();
-	
+		if (!IS_LOCAL(user))
+			return 0;
+
 		if (target_type == TYPE_USER)
 		{
 			userrec* u = (userrec*)dest;
+
+			/* Always allow a user to dcc themselves (although... why?) */
+			if (user == u)
+				return 0;
 		
 			if ((text.length()) && (text[0] == '\1'))
 			{
+				Expire();
+
 				// :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :DCC SEND m_dnsbl.cpp 3232235786 52650 9676
 				// :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION
 					
@@ -306,30 +322,22 @@ class ModuleDCCAllow : public Module
 				{
 					u->GetExt("dccallow_list", dl);
 		
-					if (dl)
+					if (dl && dl->size())
 					{
-						if (dl->size())
-						{
-							for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
-							{
-								if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
-								{
-									return 0;
-								}
-							}
-						}
+						for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
+							if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
+								return 0;
 					}
 		
 					// tokenize
-					stringstream ss(text);
+					std::stringstream ss(text);
 					std::string buf;
-					vector<string> tokens;
+					std::vector<std::string> tokens;
 		
 					while (ss >> buf)
 						tokens.push_back(buf);
 		
 					irc::string type = tokens[1].c_str();
-					ServerInstance->Log(DEBUG, "m_dccallow.so: got DCC type %s", type.c_str());
 		
 					bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
 		
@@ -339,29 +347,24 @@ class ModuleDCCAllow : public Module
 						std::string filename = tokens[2];
 					
 						if (defaultaction == "allow") 
-						{
 							return 0;
-						}
 				
 						for (unsigned int i = 0; i < bfl.size(); i++)
 						{
 							if (ServerInstance->MatchText(filename, bfl[i].filemask))
 							{
-								if (strcmp(bfl[i].action.c_str(), "allow") == 0)
-								{
+								if (bfl[i].action == "allow")
 									return 0;
-								}
 							}
 							else
 							{
 								if (defaultaction == "allow")
-								{
 									return 0;
-								}
 							}
 							user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
 							u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
 							u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+							return 1;
 						}
 					}
 					else if ((type == "CHAT") && (blockchat))
@@ -369,8 +372,8 @@ class ModuleDCCAllow : public Module
 						user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
 						u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
 						u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+						return 1;
 					}
-					return 1;
 				}
 			}
 		}
@@ -406,7 +409,6 @@ class ModuleDCCAllow : public Module
 			else
 			{
 				RemoveFromUserlist(u);
-				ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
 			}
 		}
 	}
@@ -478,29 +480,8 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON,API_VERSION);
-	}
-};
-
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
-	ModuleDCCAllowFactory()
-	{
-	}
-
-	~ModuleDCCAllowFactory()
-	{
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDCCAllow(Me);
-	}
-
 };
 
-extern "C" void * init_module( void )
-{
-	return new ModuleDCCAllowFactory;
-}
+MODULE_INIT(ModuleDCCAllow)