-/* +------------------------------------+
- * | 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) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2005-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * 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: Gives /cban, aka C:lines. Think Q:lines, for channels. */
+#include "inspircd.h"
+#include "xline.h"
/** Holds a CBAN item
*/
-class CBan : public classbase
+class CBan : public XLine
{
+private:
+ std::string displaytext;
+ irc::string matchtext;
+
public:
- irc::string chname;
- std::string set_by;
- time_t set_on;
- long length;
- std::string reason;
+ CBan(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& ch)
+ : XLine(s_time, d, src, re, "CBAN")
+ {
+ this->displaytext = ch;
+ this->matchtext = ch.c_str();
+ }
+
+ // XXX I shouldn't have to define this
+ bool Matches(User *u)
+ {
+ return false;
+ }
- CBan()
+ bool Matches(const std::string &s)
{
+ if (matchtext == s)
+ return true;
+ return false;
}
- CBan(irc::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs)
+ const std::string& Displayable()
{
+ return displaytext;
}
};
-bool CBanComp(const CBan &ban1, const CBan &ban2);
+/** An XLineFactory specialized to generate cban pointers
+ */
+class CBanFactory : public XLineFactory
+{
+ public:
+ CBanFactory() : XLineFactory("CBAN") { }
-typedef std::vector<CBan> cbanlist;
+ /** Generate a CBAN
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ return new CBan(set_time, duration, source, reason, xline_specific_mask);
+ }
-/* cbans is declared here, as our type is right above. Don't try move it. */
-cbanlist cbans;
+ bool AutoApplyToUserList(XLine *x)
+ {
+ return false; // No, we apply to channels.
+ }
+};
/** Handle /CBAN
*/
-class CommandCban : public Command
+class CommandCBan : public Command
{
public:
- CommandCban(InspIRCd* Me) : Command(Me, "CBAN", "o", 1)
+ CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3)
{
- this->source = "m_cban.so";
- this->syntax = "<channel> [<duration> :<reason>]";
- TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END);
+ flags_needed = 'o'; this->syntax = "<channel> [<duration> :<reason>]";
}
- CmdResult Handle(const char* const* parameters, int pcnt, User *user)
+ CmdResult Handle(const std::vector<std::string> ¶meters, User *user)
{
/* syntax: CBAN #channel time :reason goes here */
/* 'time' is a human-readable timestring, like 2d3h2s. */
- if(pcnt == 1)
+ if (parameters.size() == 1)
{
- /* form: CBAN #channel removes a CBAN */
- for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
+ if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", user))
{
- if (parameters[0] == iter->chname)
- {
- long remaining = iter->length + ServerInstance->Time();
- user->WriteNumeric(386, "%s %s :Removed CBAN due to expire at %s (%s)", user->nick, iter->chname.c_str(), ServerInstance->TimeString(remaining).c_str(), iter->reason.c_str());
- cbans.erase(iter);
- break;
- }
+ ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str());
+ }
+ else
+ {
+ user->WriteNotice("*** CBan " + parameters[0] + " not found in list, try /stats C.");
+ return CMD_FAILURE;
}
}
- else if (pcnt >= 2)
+ else
{
- /* full form to add a CBAN */
- if (ServerInstance->IsChannel(parameters[0]))
+ // Adding - XXX todo make this respect <insane> tag perhaps..
+ unsigned long duration = InspIRCd::Duration(parameters[1]);
+ const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
+ CBan* r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
+
+ if (ServerInstance->XLines->AddLine(r, user))
{
- // parameters[0] = #channel
- // parameters[1] = 1h3m2s
- // parameters[2] = Tortoise abuser
- long length = ServerInstance->Duration(parameters[1]);
- std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied";
-
- cbans.push_back(CBan(parameters[0], user->nick, ServerInstance->Time(), length, reason));
-
- std::sort(cbans.begin(), cbans.end(), CBanComp);
-
- if(length > 0)
+ if (!duration)
{
- user->WriteNumeric(385, "%s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str());
- ServerInstance->SNO->WriteToSnoMask('A', "%s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str());
+ ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason);
}
else
{
- user->WriteNumeric(385, "%s %s :Added permanent channel ban (%s)", user->nick, parameters[0], reason.c_str());
- ServerInstance->SNO->WriteToSnoMask('A', "%s added permanent channel ban on %s (%s)", user->nick, parameters[0], reason.c_str());
+ time_t c_requires_crap = duration + ServerInstance->Time();
+ std::string timestr = ServerInstance->TimeString(c_requires_crap);
+ ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), reason);
}
}
else
{
- user->WriteNumeric(403, "%s %s :Invalid channel name", user->nick, parameters[0]);
+ delete r;
+ user->WriteNotice("*** CBan for " + parameters[0] + " already exists");
return CMD_FAILURE;
}
}
-
- /* we want this routed! */
return CMD_SUCCESS;
}
-};
-bool CBanComp(const CBan &ban1, const CBan &ban2)
-{
- return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length));
-}
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ if (IS_LOCAL(user))
+ return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
+ return ROUTE_BROADCAST;
+ }
+};
class ModuleCBan : public Module
{
- CommandCban* mycommand;
-
+ CommandCBan mycommand;
+ CBanFactory f;
public:
- ModuleCBan(InspIRCd* Me) : Module(Me)
+ ModuleCBan() : mycommand(this)
{
-
- mycommand = new CommandCban(Me);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnUserPreJoin, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
- ServerInstance->Modules->Attach(eventlist, this, 4);
}
-
- virtual int OnStats(char symbol, User* user, string_list &results)
+ void init() CXX11_OVERRIDE
{
- ExpireBans();
-
- if(symbol == 'C')
- {
- for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
- {
- unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time();
- results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+iter->chname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason);
- }
- }
-
- return 0;
+ ServerInstance->XLines->RegisterFactory(&f);
}
- virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs)
- {
- ExpireBans();
-
- /* check cbans in here, and apply as necessary. */
- for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
- {
- if(iter->chname == cname && !user->modes[UM_OPERATOR])
- {
- // Channel is banned.
- user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str());
- ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str());
- return 1;
- }
- }
- return 0;
- }
-
- virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable)
- {
- for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
- {
- proto->ProtoSendMetaData(opaque, TYPE_OTHER, NULL, "cban", EncodeCBan(*iter));
- }
- }
-
- virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+ ~ModuleCBan()
{
- if((target_type == TYPE_OTHER) && (extname == "cban"))
- {
- cbans.push_back(DecodeCBan(extdata));
- std::sort(cbans.begin(), cbans.end(), CBanComp);
- }
+ ServerInstance->XLines->DelAll("CBAN");
+ ServerInstance->XLines->UnregisterFactory(&f);
}
- virtual ~ModuleCBan()
+ ModResult OnStats(char symbol, User* user, string_list &out) CXX11_OVERRIDE
{
- }
-
- virtual Version GetVersion()
- {
- return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
- }
-
- std::string EncodeCBan(const CBan &ban)
- {
- std::ostringstream stream;
- stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " :" << ban.reason;
- return stream.str();
- }
+ if (symbol != 'C')
+ return MOD_RES_PASSTHRU;
- CBan DecodeCBan(const std::string &data)
- {
- CBan res;
- int set_on;
- irc::tokenstream tokens(data);
- tokens.GetToken(res.chname);
- tokens.GetToken(res.set_by);
- tokens.GetToken(set_on);
- res.set_on = set_on;
- tokens.GetToken(res.length);
- tokens.GetToken(res.reason);
- return res;
+ ServerInstance->XLines->InvokeStats("CBAN", 210, user, out);
+ return MOD_RES_DENY;
}
- void ExpireBans()
+ ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
- bool go_again = true;
+ XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
- while (go_again)
+ if (rl)
{
- go_again = false;
-
- for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
- {
- /* 0 == permanent, don't mess with them! -- w00t */
- if (iter->length != 0)
- {
- if (iter->set_on + iter->length <= ServerInstance->Time())
- {
- ServerInstance->SNO->WriteToSnoMask('A', "%li second CBAN on %s (%s) set on %s expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), ServerInstance->TimeString(iter->set_on).c_str());
- cbans.erase(iter);
- go_again = true;
- }
- }
-
- if (go_again == true)
- break;
- }
+ // Channel is banned.
+ user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname.c_str(), rl->reason.c_str());
+ ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)",
+ user->nick.c_str(), cname.c_str(), rl->reason.c_str());
+ return MOD_RES_DENY;
}
+
+ return MOD_RES_PASSTHRU;
+ }
+
+ Version GetVersion() CXX11_OVERRIDE
+ {
+ return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR);
}
};
MODULE_INIT(ModuleCBan)
-
projects / user / henk / code / inspircd.git / blobdiff