X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dccallow.cpp;h=56345932c56c0d3e92bd43b91a4cb3b0ad2a3815;hb=819147178db00008a215670992d0f532dd57f9e5;hp=a18979878ff6738a32c25713b05f8f800825d8c3;hpb=a8d0bb046a67ba41947738b02cb7705f5db9fe67;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index a18979878..56345932c 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -66,7 +66,7 @@ class CommandDccallow : public Command else if (parameters.size() > 0) { char action = *parameters[0].c_str(); - + // if they didn't specify an action, this is probably a command if (action != '+' && action != '-') { @@ -75,21 +75,26 @@ class CommandDccallow : public Command // list current DCCALLOW list DisplayDCCAllowList(user); return CMD_FAILURE; - } + } else if (!strcasecmp(parameters[0].c_str(), "HELP")) { // display help DisplayHelp(user); return CMD_FAILURE; } + else + { + user->WriteNumeric(998, "%s :DCCALLOW command not understood. For help on DCCALLOW, type /DCCALLOW HELP", user->nick.c_str()); + return CMD_FAILURE; + } } - + std::string nick = parameters[0].substr(1); User *target = ServerInstance->FindNick(nick); - + if (target) { - + if (action == '-') { // check if it contains any entries @@ -110,7 +115,7 @@ class CommandDccallow : public Command { delete dl; user->Shrink("dccallow_list"); - + // remove from userlist for (userlist::iterator j = ul.begin(); j != ul.end(); ++j) { @@ -125,6 +130,12 @@ class CommandDccallow : public Command } else if (action == '+') { + if (target == user) + { + user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str(), user->nick.c_str()); + return CMD_FAILURE; + } + if (!user->GetExt("dccallow_list", dl)) { dl = new dccallowlist; @@ -132,6 +143,7 @@ class CommandDccallow : public Command // add this user to the userlist ul.push_back(user); } + for (dccallowlist::const_iterator k = dl->begin(); k != dl->end(); ++k) { if (k->nickname == target->nick) @@ -139,21 +151,16 @@ class CommandDccallow : public Command user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str()); return CMD_FAILURE; } - else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask)) - { - user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str(), user->nick.c_str()); - 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); - + long length; if (parameters.size() < 2) { length = ServerInstance->Duration(default_length); - } + } else if (!atoi(parameters[1].c_str())) { length = 0; @@ -162,14 +169,14 @@ class CommandDccallow : public Command { length = ServerInstance->Duration(parameters[1]); } - + if (!ServerInstance->IsValidMask(mask.c_str())) { return CMD_FAILURE; } - + dl->push_back(DCCAllow(target->nick, mask, ServerInstance->Time(), length)); - + if (length > 0) { user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %ld seconds", user->nick.c_str(), user->nick.c_str(), target->nick.c_str(), length); @@ -195,7 +202,7 @@ class CommandDccallow : public Command void DisplayHelp(User* user) { - user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick.c_str() [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()); @@ -216,12 +223,12 @@ class CommandDccallow : public Command 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()); } - + void DisplayDCCAllowList(User* user) { // display current DCCALLOW list user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick.c_str()); - + if (user->GetExt("dccallow_list", dl)) { for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c) @@ -229,12 +236,12 @@ class CommandDccallow : public Command user->WriteNumeric(991, "%s %s :%s (%s)", user->nick.c_str(), user->nick.c_str(), c->nickname.c_str(), c->hostmask.c_str()); } } - + user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick.c_str()); - } + } }; - + class ModuleDCCAllow : public Module { CommandDccallow* mycommand; @@ -252,16 +259,17 @@ class ModuleDCCAllow : public Module } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { delete Conf; Conf = new ConfigReader(ServerInstance); + ReadFileConf(); } virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { dccallowlist* udl; - + // remove their DCCALLOW list if they have one if (user->GetExt("dccallow_list", udl)) { @@ -269,7 +277,7 @@ class ModuleDCCAllow : public Module user->Shrink("dccallow_list"); RemoveFromUserlist(user); } - + // remove them from any DCCALLOW lists // they are currently on RemoveNick(user); @@ -299,60 +307,64 @@ class ModuleDCCAllow : public Module /* 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 - + if (strncmp(text.c_str(), "\1DCC ", 5) == 0) - { + { if (u->GetExt("dccallow_list", dl) && dl->size()) { for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter) - if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask)) + if (InspIRCd::Match(user->GetFullHost(), iter->hostmask)) return 0; } - + // tokenize std::stringstream ss(text); std::string buf; std::vector tokens; - + while (ss >> buf) tokens.push_back(buf); - + irc::string type = tokens[1].c_str(); - + bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0); - + if (type == "SEND") { std::string defaultaction = Conf->ReadValue("dccallow", "action", 0); std::string filename = tokens[2]; - - if (defaultaction == "allow") - return 0; - + + bool found = false; for (unsigned int i = 0; i < bfl.size(); i++) { - if (ServerInstance->MatchText(filename, bfl[i].filemask)) + if (InspIRCd::Match(filename, bfl[i].filemask, ascii_case_insensitive_map)) { + /* We have a matching badfile entry, override whatever the default action is */ if (bfl[i].action == "allow") return 0; + else + { + found = true; + break; + } } - 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.c_str(), u->nick.c_str(), filename.c_str()); - u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), 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.c_str(), user->nick.c_str()); - return 1; } + + /* only follow the default action if no badfile matches were found above */ + if ((!found) && (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.c_str(), u->nick.c_str(), filename.c_str()); + u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), 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.c_str(), user->nick.c_str()); + return 1; } else if ((type == "CHAT") && (blockchat)) { @@ -366,7 +378,7 @@ class ModuleDCCAllow : public Module } return 0; } - + void Expire() { for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter) @@ -397,7 +409,7 @@ class ModuleDCCAllow : public Module } } } - + void RemoveNick(User* user) { /* Iterate through all DCCALLOW lists and remove user */ @@ -412,7 +424,7 @@ class ModuleDCCAllow : public Module { if (i->nickname == user->nick) { - + u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick.c_str(), i->nickname.c_str()); u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick.c_str(), u->nick.c_str(), i->nickname.c_str()); dl->erase(i); @@ -454,7 +466,7 @@ class ModuleDCCAllow : public Module bf.action = action; bfl.push_back(bf); } - + } virtual ~ModuleDCCAllow() @@ -463,9 +475,8 @@ class ModuleDCCAllow : public Module virtual Version GetVersion() { - return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } }; MODULE_INIT(ModuleDCCAllow) -