X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_dccallow.cpp;h=edf9d012f72277171a5803713d0341c5dd666279;hb=c46f8a368c42f64284244f3d2dfc022a383294fa;hp=e5c8df6aa9ab8f2bba0e3fd519ed5818e2e80c4b;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index e5c8df6aa..edf9d012f 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -25,6 +25,29 @@
 
 #include "inspircd.h"
 
+static const char* const helptext[] =
+{
+	"DCCALLOW [(+|-)<nick> [<time>]]|[LIST|HELP]",
+	"You may allow DCCs from specific users by specifying a",
+	"DCC allow for the user you want to receive DCCs from.",
+	"For example, to allow the user Brain to send you inspircd.exe",
+	"you would type:",
+	"/DCCALLOW +Brain",
+	"Brain would then be able to send you files. They would have to",
+	"resend the file again if the server gave them an error message",
+	"before you added them to your DCCALLOW list.",
+	"DCCALLOW entries will be temporary by default, if you want to add",
+	"them to your DCCALLOW list until you leave IRC, type:",
+	"/DCCALLOW +Brain 0",
+	"To remove the user from your DCCALLOW list, type:",
+	"/DCCALLOW -Brain",
+	"To see the users in your DCCALLOW list, type:",
+	"/DCCALLOW LIST",
+	"NOTE: If the user leaves IRC or changes their nickname",
+	"  they will be removed from your DCCALLOW list.",
+	"  your DCCALLOW list will be deleted when you leave IRC."
+};
+
 class BannedFileList
 {
  public:
@@ -58,11 +81,12 @@ class CommandDccallow : public Command
 	DCCAllowExt& ext;
 
  public:
+	unsigned int maxentries;
 	CommandDccallow(Module* parent, DCCAllowExt& Ext)
 		: Command(parent, "DCCALLOW", 0)
 		, ext(Ext)
 	{
-		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 */
 	}
 
@@ -96,15 +120,15 @@ class CommandDccallow : public Command
 				}
 				else
 				{
-					user->WriteNumeric(998, ":DCCALLOW command not understood. For help on DCCALLOW, type /DCCALLOW HELP");
+					user->WriteNumeric(998, "DCCALLOW command not understood. For help on DCCALLOW, type /DCCALLOW HELP");
 					return CMD_FAILURE;
 				}
 			}
 
-			std::string nick = parameters[0].substr(1);
+			std::string nick(parameters[0], 1);
 			User *target = ServerInstance->FindNickOnly(nick);
 
-			if ((target) && (!IS_SERVER(target)) && (!target->quitting) && (target->registered == REG_ALL))
+			if ((target) && (!target->quitting) && (target->registered == REG_ALL))
 			{
 
 				if (action == '-')
@@ -119,7 +143,7 @@ class CommandDccallow : public Command
 							if (i->nickname == target->nick)
 							{
 								dl->erase(i);
-								user->WriteNumeric(995, "%s :Removed %s from your DCCALLOW list", user->nick.c_str(), target->nick.c_str());
+								user->WriteNumeric(995, user->nick, InspIRCd::Format("Removed %s from your DCCALLOW list", target->nick.c_str()));
 								break;
 							}
 						}
@@ -129,7 +153,7 @@ class CommandDccallow : public Command
 				{
 					if (target == user)
 					{
-						user->WriteNumeric(996, "%s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str());
+						user->WriteNumeric(996, user->nick, "You cannot add yourself to your own DCCALLOW list!");
 						return CMD_FAILURE;
 					}
 
@@ -142,11 +166,17 @@ class CommandDccallow : public Command
 						ul.push_back(user);
 					}
 
+					if (dl->size() >= maxentries)
+					{
+						user->WriteNumeric(996, user->nick, "Too many nicks on DCCALLOW list");
+						return CMD_FAILURE;
+					}
+
 					for (dccallowlist::const_iterator k = dl->begin(); k != dl->end(); ++k)
 					{
 						if (k->nickname == target->nick)
 						{
-							user->WriteNumeric(996, "%s :%s is already on your DCCALLOW list", user->nick.c_str(), target->nick.c_str());
+							user->WriteNumeric(996, user->nick, InspIRCd::Format("%s is already on your DCCALLOW list", target->nick.c_str()));
 							return CMD_FAILURE;
 						}
 					}
@@ -168,7 +198,7 @@ class CommandDccallow : public Command
 						length = InspIRCd::Duration(parameters[1]);
 					}
 
-					if (!ServerInstance->IsValidMask(mask))
+					if (!InspIRCd::IsValidMask(mask))
 					{
 						return CMD_FAILURE;
 					}
@@ -177,11 +207,11 @@ class CommandDccallow : public Command
 
 					if (length > 0)
 					{
-						user->WriteNumeric(993, "%s :Added %s to DCCALLOW list for %ld seconds", user->nick.c_str(), target->nick.c_str(), length);
+						user->WriteNumeric(993, user->nick, InspIRCd::Format("Added %s to DCCALLOW list for %ld seconds", target->nick.c_str(), length));
 					}
 					else
 					{
-						user->WriteNumeric(994, "%s :Added %s to DCCALLOW list for this session", user->nick.c_str(), target->nick.c_str());
+						user->WriteNumeric(994, user->nick, InspIRCd::Format("Added %s to DCCALLOW list for this session", target->nick.c_str()));
 					}
 
 					/* route it. */
@@ -191,7 +221,7 @@ class CommandDccallow : public Command
 			else
 			{
 				// nick doesn't exist
-				user->WriteNumeric(401, "%s :No such nick/channel", nick.c_str());
+				user->WriteNumeric(Numerics::NoSuchNick(nick));
 				return CMD_FAILURE;
 			}
 		}
@@ -205,43 +235,30 @@ class CommandDccallow : public Command
 
 	void DisplayHelp(User* user)
 	{
-		user->WriteNumeric(998, ":DCCALLOW [<+|->nick [time]] [list] [help]");
-		user->WriteNumeric(998, ":You may allow DCCs from specific users by specifying a");
-		user->WriteNumeric(998, ":DCC allow for the user you want to receive DCCs from.");
-		user->WriteNumeric(998, ":For example, to allow the user Brain to send you inspircd.exe");
-		user->WriteNumeric(998, ":you would type:");
-		user->WriteNumeric(998, ":/DCCALLOW +Brain");
-		user->WriteNumeric(998, ":Brain would then be able to send you files. They would have to");
-		user->WriteNumeric(998, ":resend the file again if the server gave them an error message");
-		user->WriteNumeric(998, ":before you added them to your DCCALLOW list.");
-		user->WriteNumeric(998, ":DCCALLOW entries will be temporary by default, if you want to add");
-		user->WriteNumeric(998, ":them to your DCCALLOW list until you leave IRC, type:");
-		user->WriteNumeric(998, ":/DCCALLOW +Brain 0");
-		user->WriteNumeric(998, ":To remove the user from your DCCALLOW list, type:");
-		user->WriteNumeric(998, ":/DCCALLOW -Brain");
-		user->WriteNumeric(998, ":To see the users in your DCCALLOW list, type:");
-		user->WriteNumeric(998, ":/DCCALLOW LIST");
-		user->WriteNumeric(998, ":NOTE: If the user leaves IRC or changes their nickname");
-		user->WriteNumeric(998, ":  they will be removed from your DCCALLOW list.");
-		user->WriteNumeric(998, ":  your DCCALLOW list will be deleted when you leave IRC.");
-		user->WriteNumeric(999, ":End of DCCALLOW HELP");
+		for (size_t i = 0; i < sizeof(helptext)/sizeof(helptext[0]); i++)
+			user->WriteNumeric(998, helptext[i]);
+		user->WriteNumeric(999, "End of DCCALLOW HELP");
+
+		LocalUser* localuser = IS_LOCAL(user);
+		if (localuser)
+			localuser->CommandFloodPenalty += 4000;
 	}
 
 	void DisplayDCCAllowList(User* user)
 	{
 		 // display current DCCALLOW list
-		user->WriteNumeric(990, ":Users on your DCCALLOW list:");
+		user->WriteNumeric(990, "Users on your DCCALLOW list:");
 
 		dl = ext.get(user);
 		if (dl)
 		{
 			for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
 			{
-				user->WriteNumeric(991, "%s :%s (%s)", user->nick.c_str(), c->nickname.c_str(), c->hostmask.c_str());
+				user->WriteNumeric(991, user->nick, InspIRCd::Format("%s (%s)", c->nickname.c_str(), c->hostmask.c_str()));
 			}
 		}
 
-		user->WriteNumeric(992, ":End of DCCALLOW list");
+		user->WriteNumeric(992, "End of DCCALLOW list");
 	}
 
 };
@@ -253,7 +270,7 @@ class ModuleDCCAllow : public Module
 
  public:
 	ModuleDCCAllow()
-		: ext("dccallow", this)
+		: ext("dccallow", ExtensionItem::EXT_USER, this)
 		, cmd(this, ext)
 	{
 	}
@@ -264,11 +281,7 @@ class ModuleDCCAllow : public Module
 
 		// remove their DCCALLOW list if they have one
 		if (udl)
-		{
-			userlist::iterator it = std::find(ul.begin(), ul.end(), user);
-			if (it != ul.end())
-				ul.erase(it);
-		}
+			stdalgo::erase(ul, user);
 
 		// remove them from any DCCALLOW lists
 		// they are currently on
@@ -310,23 +323,43 @@ class ModuleDCCAllow : public Module
 								return MOD_RES_PASSTHRU;
 					}
 
-					// tokenize
-					std::stringstream ss(text);
-					std::string buf;
-					std::vector<std::string> tokens;
+					std::string buf = text.substr(5);
+					size_t s = buf.find(' ');
+					if (s == std::string::npos)
+						return MOD_RES_PASSTHRU;
 
-					while (ss >> buf)
-						tokens.push_back(buf);
-
-					irc::string type = tokens[1].c_str();
+					const std::string type = buf.substr(0, s);
 
 					ConfigTag* conftag = ServerInstance->Config->ConfValue("dccallow");
 					bool blockchat = conftag->getBool("blockchat");
 
-					if (type == "SEND")
+					if (stdalgo::string::equalsci(type, "SEND"))
 					{
+						size_t first;
+
+						buf = buf.substr(s + 1);
+
+						if (!buf.empty() && buf[0] == '"')
+						{
+							s = buf.find('"', 1);
+
+							if (s == std::string::npos || s <= 1)
+								return MOD_RES_PASSTHRU;
+
+							--s;
+							first = 1;
+						}
+						else
+						{
+							s = buf.find(' ');
+							first = 0;
+						}
+
+						if (s == std::string::npos)
+							return MOD_RES_PASSTHRU;
+
 						std::string defaultaction = conftag->getString("action");
-						std::string filename = tokens[2];
+						std::string filename = buf.substr(first, s);
 
 						bool found = false;
 						for (unsigned int i = 0; i < bfl.size(); i++)
@@ -353,7 +386,7 @@ class ModuleDCCAllow : public Module
 						u->WriteNotice("If you trust " + user->nick + " and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.");
 						return MOD_RES_DENY;
 					}
-					else if ((type == "CHAT") && (blockchat))
+					else if ((blockchat) && (stdalgo::string::equalsci(type, "CHAT")))
 					{
 						user->WriteNotice("The user " + u->nick + " is not accepting DCC CHAT requests from you.");
 						u->WriteNotice(user->nick + " (" + user->ident + "@" + user->dhost + ") attempted to initiate a DCC CHAT session, which was blocked.");
@@ -381,7 +414,7 @@ class ModuleDCCAllow : public Module
 					{
 						if (iter2->length != 0 && (iter2->set_on + iter2->length) <= ServerInstance->Time())
 						{
-							u->WriteNumeric(997, "%s :DCCALLOW entry for %s has expired", u->nick.c_str(), iter2->nickname.c_str());
+							u->WriteNumeric(997, u->nick, InspIRCd::Format("DCCALLOW entry for %s has expired", iter2->nickname.c_str()));
 							iter2 = dl->erase(iter2);
 						}
 						else
@@ -416,7 +449,7 @@ class ModuleDCCAllow : public Module
 						{
 
 							u->WriteNotice(i->nickname + " left the network or changed their nickname and has been removed from your DCCALLOW list");
-							u->WriteNumeric(995, "%s :Removed %s from your DCCALLOW list", u->nick.c_str(), i->nickname.c_str());
+							u->WriteNumeric(995, u->nick, InspIRCd::Format("Removed %s from your DCCALLOW list", i->nickname.c_str()));
 							dl->erase(i);
 							break;
 						}
@@ -447,6 +480,9 @@ class ModuleDCCAllow : public Module
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("dccallow");
+		cmd.maxentries = tag->getInt("maxentries", 20);
+
 		bfl.clear();
 		ConfigTagList tags = ServerInstance->Config->ConfTags("banfile");
 		for (ConfigIter i = tags.first; i != tags.second; ++i)