-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 Jamie ??? <???@???>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-/* $ModDesc: Povides support for the /DCCALLOW command */
+#include "inspircd.h"
-static ConfigReader *Conf;
+/* $ModDesc: Provides support for the /DCCALLOW command */
-class BannedFileList : public classbase
+class BannedFileList
{
public:
std::string filemask;
std::string action;
};
-class DCCAllow : public classbase
+class DCCAllow
{
public:
std::string nickname;
dccallowlist* dl;
typedef std::vector<BannedFileList> bannedfilelist;
bannedfilelist bfl;
+SimpleExtItem<dccallowlist>* ext;
class CommandDccallow : public Command
{
public:
- CommandDccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
+ CommandDccallow(Module* parent) : Command(parent, "DCCALLOW", 0)
{
- this->source = "m_dccallow.so";
- 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 */
}
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);
+ User *target = ServerInstance->FindNickOnly(nick);
- if (target)
+ if ((target) && (!IS_SERVER(target)) && (!target->quitting) && (target->registered == REG_ALL))
{
if (action == '-')
{
// check if it contains any entries
- if (user->GetExt("dccallow_list", dl))
+ dl = ext->get(user);
+ if (dl)
{
for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
{
}
}
}
- else
- {
- delete dl;
- user->Shrink("dccallow_list");
-
- // remove from userlist
- for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
- {
- User* u = (User*)(*j);
- if (u == user)
- {
- ul.erase(j);
- break;
- }
- }
- }
}
else if (action == '+')
{
- if (!user->GetExt("dccallow_list", dl))
+ 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;
+ }
+
+ dl = ext->get(user);
+ if (!dl)
{
dl = new dccallowlist;
- user->Extend("dccallow_list", dl);
+ ext->set(user, dl);
// 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)
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 (InspIRCd::Match(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);
+ 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)
length = ServerInstance->Duration(parameters[1]);
}
- if (!ServerInstance->IsValidMask(mask.c_str()))
+ if (!ServerInstance->IsValidMask(mask))
{
return CMD_FAILURE;
}
return CMD_FAILURE;
}
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ return ROUTE_BROADCAST;
+ }
+
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());
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)
// display current DCCALLOW list
user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick.c_str());
- if (user->GetExt("dccallow_list", dl))
+ dl = ext->get(user);
+ if (dl)
{
for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
{
class ModuleDCCAllow : public Module
{
- CommandDccallow* mycommand;
+ CommandDccallow cmd;
public:
- ModuleDCCAllow(InspIRCd* Me)
- : Module(Me)
+ ModuleDCCAllow()
+ : cmd(this)
{
- Conf = new ConfigReader(ServerInstance);
- mycommand = new CommandDccallow(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- 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);
+ ReadFileConf();
+ 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, 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;
+ dccallowlist* udl = ext->get(user);
// remove their DCCALLOW list if they have one
- if (user->GetExt("dccallow_list", udl))
+ if (udl)
{
- delete udl;
- user->Shrink("dccallow_list");
- 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
RemoveNick(user);
}
-
- virtual int OnUserPreNick(User* user, const std::string &newnick)
+ virtual void OnUserPostNick(User* user, const std::string &oldnick)
{
RemoveNick(user);
- return 0;
}
- virtual int OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
}
- virtual int OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual ModResult OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
if (!IS_LOCAL(user))
- return 0;
+ return MOD_RES_PASSTHRU;
if (target_type == TYPE_USER)
{
/* Always allow a user to dcc themselves (although... why?) */
if (user == u)
- return 0;
+ return MOD_RES_PASSTHRU;
if ((text.length()) && (text[0] == '\1'))
{
if (strncmp(text.c_str(), "\1DCC ", 5) == 0)
{
- if (u->GetExt("dccallow_list", dl) && dl->size())
+ dl = ext->get(u);
+ if (dl && dl->size())
{
for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
if (InspIRCd::Match(user->GetFullHost(), iter->hostmask))
- return 0;
+ return MOD_RES_PASSTHRU;
}
// tokenize
while (ss >> buf)
tokens.push_back(buf);
+ if (tokens.size() < 2)
+ return MOD_RES_PASSTHRU;
+
irc::string type = tokens[1].c_str();
- 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);
- std::string filename = tokens[2];
+ if (tokens.size() < 3)
+ return MOD_RES_PASSTHRU;
- if (defaultaction == "allow")
- return 0;
+ std::string defaultaction = conftag->getString("action");
+ std::string filename = tokens[2];
+ bool found = false;
for (unsigned int i = 0; i < bfl.size(); i++)
{
- if (InspIRCd::Match(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
- {
- if (defaultaction == "allow")
- return 0;
+ return MOD_RES_PASSTHRU;
+ else
+ {
+ found = true;
+ break;
+ }
}
- 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 MOD_RES_PASSTHRU;
+
+ 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 MOD_RES_DENY;
}
else if ((type == "CHAT") && (blockchat))
{
user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick.c_str(), u->nick.c_str());
u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.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;
+ return MOD_RES_DENY;
}
}
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
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);
- if (u->GetExt("dccallow_list", dl))
+ dl = ext->get(u);
+ if (dl)
{
if (dl->size())
{
}
}
}
+ ++iter;
}
else
{
- RemoveFromUserlist(u);
+ iter = ul.erase(iter);
}
}
}
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);
- if (u->GetExt("dccallow_list", dl))
+ dl = ext->get(u);
+ if (dl)
{
if (dl->size())
{
}
}
}
+ ++iter;
}
else
{
- RemoveFromUserlist(u);
+ iter = ul.erase(iter);
}
}
}
void ReadFileConf()
{
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()
{
+ delete ext;
}
virtual Version GetVersion()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Provides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR);
}
};
MODULE_INIT(ModuleDCCAllow)
-
projects / user / henk / code / inspircd.git / blobdiff