- /* 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;
{
// 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 == '-')
{
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)
+ if (pcnt < 2)
{
- length = ServerInstance->Duration(default_length.c_str());
+ length = ServerInstance->Duration(default_length);
}
else if (!atoi(parameters[1]))
{
{
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)
public:
ModuleDCCAllow(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
Conf = new ConfigReader(ServerInstance);
mycommand = new cmd_dccallow(ServerInstance);
List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(userrec* user, const std::string ¶meter)
{
delete Conf;
Conf = new ConfigReader(ServerInstance);
}
- virtual void OnUserQuit(userrec* user, const std::string &reason)
+ virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
{
dccallowlist* dl;
return 0;
}
- virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status)
+ 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);
+ return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
}
- virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status)
+ virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
- Expire();
-
+ if (!IS_LOCAL(user))
+ return 0;
+
if (target_type == TYPE_USER)
{
userrec* u = (userrec*)dest;
+
+ /* 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
{
u->GetExt("dccallow_list", dl);
- if (dl)
+ if (dl && dl->size())
{
- if (dl->size())
- {
- for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
- {
- if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
- {
- return 0;
- }
- }
- }
+ 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::stringstream ss(text);
std::string buf;
- vector<string> tokens;
+ std::vector<std::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);
std::string filename = tokens[2];
if (defaultaction == "allow")
- {
return 0;
- }
for (unsigned int i = 0; i < bfl.size(); i++)
{
if (ServerInstance->MatchText(filename, bfl[i].filemask))
{
- if (strcmp(bfl[i].action.c_str(), "allow") == 0)
- {
+ if (bfl[i].action == "allow")
return 0;
- }
}
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, 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;
}
}
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 1;
}
}
}
else
{
RemoveFromUserlist(u);
- ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
}
}
}
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);
}
};
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
- ModuleDCCAllowFactory()
- {
- }
-
- ~ModuleDCCAllowFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleDCCAllow(Me);
- }
-
-};
-
-extern "C" void * init_module( void )
-{
- return new ModuleDCCAllowFactory;
-}
+MODULE_INIT(ModuleDCCAllow)
projects / user / henk / code / inspircd.git / blobdiff