* | 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.
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 != '-')
{
// 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
{
delete dl;
user->Shrink("dccallow_list");
-
+
// remove from userlist
for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
{
}
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;
// 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 (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;
{
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);
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 : 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)
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;
}
- 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))
{
user->Shrink("dccallow_list");
RemoveFromUserlist(user);
}
-
+
// remove them from any DCCALLOW lists
// they are currently on
RemoveNick(user);
/* 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<std::string> 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))
{
}
return 0;
}
-
+
void Expire()
{
for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
}
}
}
-
+
void RemoveNick(User* user)
{
/* Iterate through all DCCALLOW lists and remove user */
{
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);
bf.action = action;
bfl.push_back(bf);
}
-
+
}
virtual ~ModuleDCCAllow()
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)
-
projects / user / henk / code / inspircd.git / blobdiff