X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=043486283365bd3f6467c388eb8244f5989aea62;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=8c2a5f73e3e3e68c1167b33960631d39c8c8a83c;hpb=3af9c3f8950f864bcf9cdd56127cd4014827dece;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 8c2a5f73e..043486283 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -58,9 +58,10 @@ SimpleExtItem<dccallowlist>* ext;
 class CommandDccallow : public Command
 {
  public:
+	unsigned int maxentries;
 	CommandDccallow(Module* parent) : Command(parent, "DCCALLOW", 0)
 	{
-		syntax = "{[+|-]<nick> <time>|HELP|LIST}";
+		syntax = "[(+|-)<nick> [<time>]]|[LIST|HELP]";
 		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
 	}
 
@@ -102,7 +103,7 @@ class CommandDccallow : public Command
 			std::string nick = parameters[0].substr(1);
 			User *target = ServerInstance->FindNickOnly(nick);
 
-			if (target)
+			if ((target) && (!IS_SERVER(target)) && (!target->quitting) && (target->registered == REG_ALL))
 			{
 
 				if (action == '-')
@@ -140,6 +141,12 @@ class CommandDccallow : public Command
 						ul.push_back(user);
 					}
 
+					if (dl->size() >= maxentries)
+					{
+						user->WriteNumeric(996, "%s %s :Too many nicks on DCCALLOW list", user->nick.c_str(), user->nick.c_str());
+						return CMD_FAILURE;
+					}
+
 					for (dccallowlist::const_iterator k = dl->begin(); k != dl->end(); ++k)
 					{
 						if (k->nickname == target->nick)
@@ -149,9 +156,8 @@ class CommandDccallow : public Command
 						}
 					}
 
-					std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
-					ConfigReader Conf;
-					std::string default_length = Conf.ReadValue("dccallow", "length", 0);
+					std::string mask = target->nick+"!"+target->ident+"@"+target->dhost;
+					std::string default_length = ServerInstance->Config->ConfValue("dccallow")->getString("length");
 
 					long length;
 					if (parameters.size() < 2)
@@ -167,7 +173,7 @@ class CommandDccallow : public Command
 						length = ServerInstance->Duration(parameters[1]);
 					}
 
-					if (!ServerInstance->IsValidMask(mask.c_str()))
+					if (!ServerInstance->IsValidMask(mask))
 					{
 						return CMD_FAILURE;
 					}
@@ -204,7 +210,7 @@ class CommandDccallow : public Command
 
 	void DisplayHelp(User* user)
 	{
-		user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick.c_str());
+		user->WriteNumeric(998, "%s :DCCALLOW [(+|-)<nick> [<time>]]|[LIST|HELP]", user->nick.c_str());
 		user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick.c_str());
 		user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick.c_str());
 		user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick.c_str());
@@ -224,6 +230,10 @@ class CommandDccallow : public Command
 		user->WriteNumeric(998, "%s :  they will be removed from your DCCALLOW list.", user->nick.c_str());
 		user->WriteNumeric(998, "%s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick.c_str());
 		user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick.c_str());
+
+		LocalUser* localuser = IS_LOCAL(user);
+		if (localuser)
+			localuser->CommandFloodPenalty += 4000;
 	}
 
 	void DisplayDCCAllowList(User* user)
@@ -253,18 +263,24 @@ class ModuleDCCAllow : public Module
 	ModuleDCCAllow()
 		: cmd(this)
 	{
-		ext = new SimpleExtItem<dccallowlist>("dccallow", this);
-		ServerInstance->Extensions.Register(ext);
-		ServerInstance->AddCommand(&cmd);
-		ReadFileConf();
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		ext = NULL;
 	}
 
+	void init()
+	{
+		ext = new SimpleExtItem<dccallowlist>("dccallow", this);
+		ServerInstance->Modules->AddService(*ext);
+		ServerInstance->Modules->AddService(cmd);
+		OnRehash(NULL);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPostNick, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+	}
 
 	virtual void OnRehash(User* user)
 	{
 		ReadFileConf();
+		ConfigTag* tag = ServerInstance->Config->ConfValue("dccallow");
+		cmd.maxentries = tag->getInt("maxentries", 20);
 	}
 
 	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
@@ -274,7 +290,9 @@ class ModuleDCCAllow : public Module
 		// remove their DCCALLOW list if they have one
 		if (udl)
 		{
-			RemoveFromUserlist(user);
+			userlist::iterator it = std::find(ul.begin(), ul.end(), user);
+			if (it != ul.end())
+				ul.erase(it);
 		}
 
 		// remove them from any DCCALLOW lists
@@ -282,10 +300,9 @@ class ModuleDCCAllow : public Module
 		RemoveNick(user);
 	}
 
-	virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
+	virtual void OnUserPostNick(User* user, const std::string &oldnick)
 	{
 		RemoveNick(user);
-		return MOD_RES_PASSTHRU;
 	}
 
 	virtual ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
@@ -331,14 +348,20 @@ class ModuleDCCAllow : public Module
 					while (ss >> buf)
 						tokens.push_back(buf);
 
+					if (tokens.size() < 2)
+						return MOD_RES_PASSTHRU;
+
 					irc::string type = tokens[1].c_str();
 
-					ConfigReader Conf;
-					bool blockchat = Conf.ReadFlag("dccallow", "blockchat", 0);
+					ConfigTag* conftag = ServerInstance->Config->ConfValue("dccallow");
+					bool blockchat = conftag->getBool("blockchat");
 
 					if (type == "SEND")
 					{
-						std::string defaultaction = Conf.ReadValue("dccallow", "action", 0);
+						if (tokens.size() < 3)
+							return MOD_RES_PASSTHRU;
+
+						std::string defaultaction = conftag->getString("action");
 						std::string filename = tokens[2];
 
 						bool found = false;
@@ -381,7 +404,7 @@ class ModuleDCCAllow : public Module
 
 	void Expire()
 	{
-		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+		for (userlist::iterator iter = ul.begin(); iter != ul.end();)
 		{
 			User* u = (User*)(*iter);
 			dl = ext->get(u);
@@ -403,10 +426,11 @@ class ModuleDCCAllow : public Module
 						}
 					}
 				}
+				++iter;
 			}
 			else
 			{
-				RemoveFromUserlist(u);
+				iter = ul.erase(iter);
 			}
 		}
 	}
@@ -414,7 +438,7 @@ class ModuleDCCAllow : public Module
 	void RemoveNick(User* user)
 	{
 		/* Iterate through all DCCALLOW lists and remove user */
-		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+		for (userlist::iterator iter = ul.begin(); iter != ul.end();)
 		{
 			User *u = (User*)(*iter);
 			dl = ext->get(u);
@@ -434,10 +458,11 @@ class ModuleDCCAllow : public Module
 						}
 					}
 				}
+				++iter;
 			}
 			else
 			{
-				RemoveFromUserlist(u);
+				iter = ul.erase(iter);
 			}
 		}
 	}
@@ -458,18 +483,15 @@ class ModuleDCCAllow : public Module
 
 	void ReadFileConf()
 	{
-		ConfigReader Conf;
 		bfl.clear();
-		for (int i = 0; i < Conf.Enumerate("banfile"); i++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("banfile");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
 			BannedFileList bf;
-			std::string fileglob = Conf.ReadValue("banfile", "pattern", i);
-			std::string action = Conf.ReadValue("banfile", "action", i);
-			bf.filemask = fileglob;
-			bf.action = action;
+			bf.filemask = i->second->getString("pattern");
+			bf.action = i->second->getString("action");
 			bfl.push_back(bf);
 		}
-
 	}
 
 	virtual ~ModuleDCCAllow()