- /* m_dccallow - Jamie Penman-Smithson <jamie@silverdream.org> - September 2006 */
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
-using namespace std;
-
-#include <stdio.h>
-#include <vector>
-#include <string.h>
+#include "inspircd.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "inspircd.h"
/* $ModDesc: Povides support for the /DCCALLOW command */
DCCAllow() { }
- DCCAllow(std::string nick, std::string hm, time_t so, long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
+ DCCAllow(const std::string &nick, const std::string &hm, const time_t so, const long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
};
typedef std::vector<userrec *> userlist;
cmd_dccallow(InspIRCd* Me) : command_t(Me, "DCCALLOW", 0, 0)
{
this->source = "m_dccallow.so";
- syntax = "{[+|-]<nick> <time>}";
+ syntax = "{[+|-]<nick> <time>|HELP|LIST}";
}
CmdResult Handle(const char **parameters, int pcnt, userrec *user)
{
// display current DCCALLOW list
DisplayDCCAllowList(user);
- return CMD_SUCCESS;
+ return CMD_FAILURE;
}
else if (pcnt > 0)
{
{
// list current DCCALLOW list
DisplayDCCAllowList(user);
- return CMD_SUCCESS;
+ return CMD_FAILURE;
}
else if (!strcasecmp(parameters[0], "HELP"))
{
// display help
DisplayHelp(user);
- return CMD_SUCCESS;
+ return CMD_FAILURE;
}
}
if (target)
{
- ServerInstance->Log(DEBUG, "m_dccallow.so: got target %s and action %c", target->nick, action);
if (action == '-')
{
for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
{
userrec* u = (userrec*)(*j);
- if (u->nick == user->nick)
+ if (u == user)
{
ul.erase(j);
break;
if (!dl)
{
dl = new dccallowlist;
- user->Extend(std::string("dccallow_list"), dl);
+ user->Extend("dccallow_list", dl);
// add this user to the userlist
ul.push_back(user);
}
if (k->nickname == target->nick)
{
user->WriteServ("996 %s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick);
- return CMD_SUCCESS;
+ return CMD_FAILURE;
+ }
+ else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask))
+ {
+ user->WriteServ("996 %s %s :You cannot add yourself to your own DCCALLOW list!", user->nick, user->nick);
+ 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).c_str();
+ std::string default_length = Conf->ReadValue("dccallow", "length", 0);
long length;
- if (pcnt == 1 || ServerInstance->Duration(parameters[1]) < 1)
+ if (pcnt < 2)
{
- length = ServerInstance->Duration(default_length.c_str());
+ length = ServerInstance->Duration(default_length);
}
- else if (parameters[1] == 0)
+ else if (!atoi(parameters[1]))
{
length = 0;
}
{
user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
}
-
+
+ /* route it. */
return CMD_SUCCESS;
}
}
return CMD_FAILURE;
}
}
- return CMD_SUCCESS;
+ return CMD_FAILURE;
}
-void DisplayHelp(userrec* user)
-{
- user->WriteServ("998 %s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick);
- user->WriteServ("998 %s :You may allow DCCs from specific users by specifying a", user->nick);
- user->WriteServ("998 %s :DCC allow for the user you want to receive DCCs from.", user->nick);
- user->WriteServ("998 %s :For example, to allow the user Brain to send you inspircd.exe", user->nick);
- user->WriteServ("998 %s :you would type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW +Brain", user->nick);
- user->WriteServ("998 %s :Brain would then be able to send you files. They would have to", user->nick);
- user->WriteServ("998 %s :resend the file again if the server gave them an error message", user->nick);
- user->WriteServ("998 %s :before you added them to your DCCALLOW list.", user->nick);
- user->WriteServ("998 %s :DCCALLOW entries will be temporary by default, if you want to add", user->nick);
- user->WriteServ("998 %s :them to your DCCALLOW list until you leave IRC, type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW +Brain 0", user->nick);
- user->WriteServ("998 %s :To remove the user from your DCCALLOW list, type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW -Brain", user->nick);
- user->WriteServ("998 %s :To see the users in your DCCALLOW list, type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW LIST", user->nick);
- user->WriteServ("998 %s :NOTE: If the user leaves IRC or changes their nickname", user->nick);
- user->WriteServ("998 %s : they will be removed from your DCCALLOW list.", user->nick);
- user->WriteServ("998 %s : your DCCALLOW list will be deleted when you leave IRC.", user->nick);
- user->WriteServ("999 %s :End of DCCALLOW HELP", user->nick);
-}
-
-void DisplayDCCAllowList(userrec* user)
-{
- // display current DCCALLOW list
- user->WriteServ("990 %s :Users on your DCCALLOW list:", user->nick);
- user->GetExt("dccallow_list", dl);
+ void DisplayHelp(userrec* user)
+ {
+ user->WriteServ("998 %s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick);
+ user->WriteServ("998 %s :You may allow DCCs from specific users by specifying a", user->nick);
+ user->WriteServ("998 %s :DCC allow for the user you want to receive DCCs from.", user->nick);
+ user->WriteServ("998 %s :For example, to allow the user Brain to send you inspircd.exe", user->nick);
+ user->WriteServ("998 %s :you would type:", user->nick);
+ user->WriteServ("998 %s :/DCCALLOW +Brain", user->nick);
+ user->WriteServ("998 %s :Brain would then be able to send you files. They would have to", user->nick);
+ user->WriteServ("998 %s :resend the file again if the server gave them an error message", user->nick);
+ user->WriteServ("998 %s :before you added them to your DCCALLOW list.", user->nick);
+ user->WriteServ("998 %s :DCCALLOW entries will be temporary by default, if you want to add", user->nick);
+ user->WriteServ("998 %s :them to your DCCALLOW list until you leave IRC, type:", user->nick);
+ user->WriteServ("998 %s :/DCCALLOW +Brain 0", user->nick);
+ user->WriteServ("998 %s :To remove the user from your DCCALLOW list, type:", user->nick);
+ user->WriteServ("998 %s :/DCCALLOW -Brain", user->nick);
+ user->WriteServ("998 %s :To see the users in your DCCALLOW list, type:", user->nick);
+ user->WriteServ("998 %s :/DCCALLOW LIST", user->nick);
+ user->WriteServ("998 %s :NOTE: If the user leaves IRC or changes their nickname", user->nick);
+ user->WriteServ("998 %s : they will be removed from your DCCALLOW list.", user->nick);
+ user->WriteServ("998 %s : your DCCALLOW list will be deleted when you leave IRC.", user->nick);
+ user->WriteServ("999 %s :End of DCCALLOW HELP", user->nick);
+ }
- if (dl)
+ void DisplayDCCAllowList(userrec* user)
{
- for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
+ // display current DCCALLOW list
+ user->WriteServ("990 %s :Users on your DCCALLOW list:", user->nick);
+ user->GetExt("dccallow_list", dl);
+
+ if (dl)
{
- user->WriteServ("991 %s %s :%s (%s)", user->nick, user->nick, c->nickname.c_str(), c->hostmask.c_str());
+ for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
+ {
+ user->WriteServ("991 %s %s :%s (%s)", user->nick, user->nick, c->nickname.c_str(), c->hostmask.c_str());
+ }
}
- }
-
- user->WriteServ("992 %s :End of DCCALLOW list", user->nick);
-}
+
+ user->WriteServ("992 %s :End of DCCALLOW list", user->nick);
+ }
};
{
cmd_dccallow* mycommand;
public:
- ModuleDCCAllow(InspIRCd* Me)
- : Module::Module(Me)
-{
- Conf = new ConfigReader(ServerInstance);
- mycommand = new cmd_dccallow(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- ReadFileConf();
-}
-void Implements(char* List)
-{
- List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
-}
-
-virtual void OnRehash(const std::string ¶meter)
-{
- delete Conf;
- Conf = new ConfigReader(ServerInstance);
-}
+ ModuleDCCAllow(InspIRCd* Me)
+ : Module(Me)
+ {
+ Conf = new ConfigReader(ServerInstance);
+ mycommand = new cmd_dccallow(ServerInstance);
+ ServerInstance->AddCommand(mycommand);
+ ReadFileConf();
+ }
-virtual void OnUserQuit(userrec* user, const std::string &reason)
-{
- dccallowlist* dl;
+ void Implements(char* List)
+ {
+ List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
+ }
- // remove their DCCALLOW list if they have one
- user->GetExt("dccallow_list", dl);
- if (dl)
+ virtual void OnRehash(userrec* user, const std::string ¶meter)
{
- DELETE(dl);
- user->Shrink("dccallow_list");
- RemoveFromUserlist(user);
+ delete Conf;
+ Conf = new ConfigReader(ServerInstance);
}
-
- // remove them from any DCCALLOW lists
- // they are currently on
- RemoveNick(user);
-}
+ virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+ {
+ dccallowlist* dl;
+
+ // remove their DCCALLOW list if they have one
+ user->GetExt("dccallow_list", dl);
+ if (dl)
+ {
+ DELETE(dl);
+ user->Shrink("dccallow_list");
+ RemoveFromUserlist(user);
+ }
+
+ // remove them from any DCCALLOW lists
+ // they are currently on
+ RemoveNick(user);
+ }
-virtual int OnUserPreNick(userrec* user, const std::string &newnick)
-{
- RemoveNick(user);
- return 0;
-}
-virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status)
-{
- return OnUserPreNotice(user, dest, target_type, text, status);
-}
+ virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+ {
+ RemoveNick(user);
+ return 0;
+ }
-virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status)
-{
- Expire();
+ virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+ {
+ return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
+ }
- if (target_type == TYPE_USER)
+ virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
- userrec* u = (userrec*)dest;
-
- if ((text.length()) && (text[0] == '\1'))
+ if (!IS_LOCAL(user))
+ return 0;
+
+ if (target_type == TYPE_USER)
{
- // :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)
+ userrec* u = (userrec*)dest;
+
+ /* Always allow a user to dcc themselves (although... why?) */
+ if (user == u)
+ return 0;
+
+ if ((text.length()) && (text[0] == '\1'))
{
- u->GetExt("dccallow_list", dl);
-
- if (dl)
+ 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 (dl->size())
+ u->GetExt("dccallow_list", dl);
+
+ if (dl && dl->size())
{
for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
- {
if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
- {
return 0;
- }
- }
}
- }
-
- // tokenize
- stringstream ss(text);
- std::string buf;
- vector<string> tokens;
-
- while (ss >> buf)
- tokens.push_back(buf);
-
- irc::string type = tokens[1].c_str();
- ServerInstance->Log(DEBUG, "m_dccallow.so: got DCC type %s", type.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;
- }
-
- for (unsigned int i = 0; i < bfl.size(); i++)
+
+ // 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")
{
- if (ServerInstance->MatchText(filename, bfl[i].filemask))
+ std::string defaultaction = Conf->ReadValue("dccallow", "action", 0);
+ std::string filename = tokens[2];
+
+ if (defaultaction == "allow")
+ return 0;
+
+ for (unsigned int i = 0; i < bfl.size(); i++)
{
- if (strcmp(bfl[i].action.c_str(), "allow") == 0)
+ if (ServerInstance->MatchText(filename, bfl[i].filemask))
{
- return 0;
+ if (bfl[i].action == "allow")
+ return 0;
}
- }
- else
- {
- if (defaultaction == "allow")
+ else
{
- return 0;
+ 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, u->nick, filename.c_str());
+ u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, 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, user->nick);
+ return 1;
}
- user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
- u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
+ }
+ else if ((type == "CHAT") && (blockchat))
+ {
+ user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
+ u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
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, user->nick);
+ return 1;
}
}
- else if ((type == "CHAT") && (blockchat))
- {
- user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
- u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
- 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, user->nick);
- }
- return 1;
}
}
+ return 0;
}
- return 0;
-}
-
-void Expire()
-{
- for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+
+ void Expire()
{
- userrec* u = (userrec*)(*iter);
- u->GetExt("dccallow_list", dl);
-
- if (dl)
+ for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
{
- if (dl->size())
+ userrec* u = (userrec*)(*iter);
+ u->GetExt("dccallow_list", dl);
+
+ if (dl)
{
- dccallowlist::iterator iter = dl->begin();
- while (iter != dl->end())
+ if (dl->size())
{
- if ((iter->set_on + iter->length) <= ServerInstance->Time())
- {
- u->WriteServ("997 %s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter->nickname.c_str());
- iter = dl->erase(iter);
- }
- else
+ dccallowlist::iterator iter = dl->begin();
+ while (iter != dl->end())
{
- ++iter;
+ if ((iter->set_on + iter->length) <= ServerInstance->Time())
+ {
+ u->WriteServ("997 %s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter->nickname.c_str());
+ iter = dl->erase(iter);
+ }
+ else
+ {
+ ++iter;
+ }
}
}
}
- }
- else
- {
- DELETE(dl);
- u->Shrink("dccallow_list");
- RemoveFromUserlist(u);
- ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
+ else
+ {
+ RemoveFromUserlist(u);
+ }
}
}
-}
-
-void RemoveNick(userrec* user)
-{
- /* Iterate through all DCCALLOW lists and remove user */
- for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+
+ void RemoveNick(userrec* user)
{
- userrec *u = (userrec*)(*iter);
- u->GetExt("dccallow_list", dl);
-
- if (dl)
+ /* Iterate through all DCCALLOW lists and remove user */
+ for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
{
- if (dl->size())
+ userrec *u = (userrec*)(*iter);
+ u->GetExt("dccallow_list", dl);
+
+ if (dl)
{
- for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
+ if (dl->size())
{
- if (i->nickname == user->nick)
+ for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
{
-
- u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick, i->nickname.c_str());
- u->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str());
- dl->erase(i);
- break;
+ 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, i->nickname.c_str());
+ u->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str());
+ dl->erase(i);
+ break;
+ }
}
}
}
- }
- else
- {
- DELETE(dl);
- u->Shrink("dccallow_list");
- RemoveFromUserlist(u);
+ else
+ {
+ RemoveFromUserlist(u);
+ }
}
}
-}
void RemoveFromUserlist(userrec *user)
{
for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
{
userrec* u = (userrec*)(*j);
- if (u->nick == user->nick)
+ if (u == user)
{
- ul.erase(j);
+ ul.erase(j);
break;
}
}
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_COMMON,API_VERSION);
+ return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
}
};
};
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
{
return new ModuleDCCAllowFactory;
}
projects / user / henk / code / inspircd.git / blobdiff