#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
#include "inspircd.h"
-#include "commands.h"
/* $ModDesc: Provides channel modes +a and +q */
+/* $ModDep: ../../include/u_listmode.h */
-
+#define PROTECT_VALUE 40000
+#define FOUNDER_VALUE 50000
const char* fakevalue = "on";
-class ChanFounder : public ModeHandler
+/* When this is set to true, no restrictions apply to setting or
+ * removal of +qa. This is used while unloading so that the server
+ * can freely clear all of its users of the modes.
+ */
+bool unload_kludge = false;
+
+/** Handles basic operation of +qa channel modes
+ */
+class FounderProtectBase
{
+ private:
+ InspIRCd* MyInstance;
+ std::string extend;
+ std::string type;
+ int list;
+ int end;
char* dummyptr;
+ protected:
+ bool remove_own_privs;
public:
- ChanFounder(InspIRCd* Instance) : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false) { }
+ FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool remove_own) :
+ MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own)
+ {
+ }
ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
{
- userrec* x = ServerInstance->FindNick(parameter);
+ userrec* x = MyInstance->FindNick(parameter);
if (x)
{
if (!channel->HasUser(x))
}
else
{
- std::string founder = "cm_founder_"+std::string(channel->name);
- if (x->GetExt(founder,dummyptr))
+ std::string item = extend+std::string(channel->name);
+ if (x->GetExt(item,dummyptr))
{
return std::make_pair(true, x->nick);
}
return std::make_pair(false, parameter);
}
-
- ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+ void RemoveMode(chanrec* channel, char mc)
{
- userrec* theuser = ServerInstance->FindNick(parameter);
+ unload_kludge = true;
+ CUList* cl = channel->GetUsers();
+ std::string item = extend + std::string(channel->name);
+ const char* mode_junk[MAXMODES+1];
+ userrec* n = new userrec(MyInstance);
+ n->SetFd(FD_MAGIC_NUMBER);
+ mode_junk[0] = channel->name;
+ irc::modestacker modestack(false);
+ std::deque<std::string> stackresult;
+ for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+ {
+ if (i->second->GetExt(item, dummyptr))
+ {
+ modestack.Push(mc, i->second->nick);
+ }
+ }
- ServerInstance->Log(DEBUG,"ChanFounder::OnModeChange");
+ while (modestack.GetStackedLine(stackresult))
+ {
+ for (size_t j = 0; j < stackresult.size(); j++)
+ {
+ mode_junk[j+1] = stackresult[j].c_str();
+ }
+ MyInstance->SendMode(mode_junk, stackresult.size() + 1, n);
+ }
+
+ delete n;
+ unload_kludge = false;
+ }
- // cant find the user given as the parameter, eat the mode change.
- if (!theuser)
+ void DisplayList(userrec* user, chanrec* channel)
+ {
+ CUList* cl = channel->GetUsers();
+ std::string item = extend+std::string(channel->name);
+ for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
{
- ServerInstance->Log(DEBUG,"No such user in ChanFounder");
- parameter = "";
- return MODEACTION_DENY;
+ if (i->second->GetExt(item, dummyptr))
+ {
+ user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->second->nick);
+ }
}
+ user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str());
+ }
- // given user isnt even on the channel, eat the mode change
- if (!channel->HasUser(theuser))
+ userrec* FindAndVerify(std::string ¶meter, chanrec* channel)
+ {
+ userrec* theuser = MyInstance->FindNick(parameter);
+ if ((!theuser) || (!channel->HasUser(theuser)))
{
- ServerInstance->Log(DEBUG,"Channel doesn't have user in ChanFounder");
parameter = "";
- return MODEACTION_DENY;
+ return NULL;
}
+ return theuser;
+ }
- std::string protect = "cm_protect_"+std::string(channel->name);
- std::string founder = "cm_founder_"+std::string(channel->name);
+ ModeAction HandleChange(userrec* source, userrec* theuser, bool adding, chanrec* channel, std::string ¶meter)
+ {
+ std::string item = extend+std::string(channel->name);
- // source is a server, or ulined, we'll let them +-q the user.
- if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source)))
+ if (adding)
{
- ServerInstance->Log(DEBUG,"Allowing remote mode change in ChanFounder");
- if (adding)
+ if (!theuser->GetExt(item, dummyptr))
{
- if (!theuser->GetExt(founder,dummyptr))
- {
- ServerInstance->Log(DEBUG,"Does not have the ext item in ChanFounder");
- if (!theuser->Extend(founder,fakevalue))
- ServerInstance->Log(DEBUG,"COULD NOT EXTEND!!!");
- // Tidy the nickname (make case match etc)
- parameter = theuser->nick;
- if (theuser->GetExt(founder, dummyptr))
- ServerInstance->Log(DEBUG,"Extended!");
- else
- ServerInstance->Log(DEBUG,"Not extended :(");
- return MODEACTION_ALLOW;
- }
+ theuser->Extend(item, fakevalue);
+ parameter = theuser->nick;
+ return MODEACTION_ALLOW;
}
- else
+ }
+ else
+ {
+ if (theuser->GetExt(item, dummyptr))
{
- if (theuser->GetExt(founder, dummyptr))
- {
- theuser->Shrink(founder);
- // Tidy the nickname (make case match etc)
- parameter = theuser->nick;
- return MODEACTION_ALLOW;
- }
+ theuser->Shrink(item);
+ parameter = theuser->nick;
+ return MODEACTION_ALLOW;
}
+ }
+ return MODEACTION_DENY;
+ }
+};
+
+/** Abstraction of FounderProtectBase for channel mode +q
+ */
+class ChanFounder : public ModeHandler, public FounderProtectBase
+{
+ char* dummyptr;
+ public:
+ ChanFounder(InspIRCd* Instance, bool using_prefixes, bool depriv_self)
+ : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0),
+ FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self) { }
+
+ unsigned int GetPrefixRank()
+ {
+ return FOUNDER_VALUE;
+ }
+
+ ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
+ {
+ return FounderProtectBase::ModeSet(source, dest, channel, parameter);
+ }
+
+ void RemoveMode(chanrec* channel)
+ {
+ FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+ }
+
+ void RemoveMode(userrec* user)
+ {
+ }
+
+ ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+ {
+ userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+
+ if (!theuser)
+ {
return MODEACTION_DENY;
}
+
+ // source is a server, or ulined, we'll let them +-q the user.
+ if ((unload_kludge) || ((source == theuser) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source)))
+ {
+ return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
+ }
else
{
// whoops, someones being naughty!
void DisplayList(userrec* user, chanrec* channel)
{
- CUList* cl = channel->GetUsers();
- std::string founder = "cm_founder_"+std::string(channel->name);
- for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
- {
- if (i->second->GetExt(founder, dummyptr))
- {
- user->WriteServ("386 %s %s %s",user->nick, channel->name,i->second->nick);
- }
- }
- user->WriteServ("387 %s %s :End of channel founder list",user->nick, channel->name);
+ FounderProtectBase::DisplayList(user,channel);
}
-
};
-class ChanProtect : public ModeHandler
+/** Abstraction of FounderProtectBase for channel mode +a
+ */
+class ChanProtect : public ModeHandler, public FounderProtectBase
{
char* dummyptr;
public:
- ChanProtect(InspIRCd* Instance) : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false) { }
+ ChanProtect(InspIRCd* Instance, bool using_prefixes, bool depriv_self)
+ : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0),
+ FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self) { }
+
+ unsigned int GetPrefixRank()
+ {
+ return PROTECT_VALUE;
+ }
ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
{
- userrec* x = ServerInstance->FindNick(parameter);
- if (x)
- {
- if (!channel->HasUser(x))
- {
- return std::make_pair(false, parameter);
- }
- else
- {
- std::string founder = "cm_protect_"+std::string(channel->name);
- if (x->GetExt(founder,dummyptr))
- {
- return std::make_pair(true, x->nick);
- }
- else
- {
- return std::make_pair(false, parameter);
- }
- }
- }
- return std::make_pair(false, parameter);
+ return FounderProtectBase::ModeSet(source, dest, channel, parameter);
+ }
+
+ void RemoveMode(chanrec* channel)
+ {
+ FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+ }
+
+ void RemoveMode(userrec* user)
+ {
}
ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
{
- userrec* theuser = ServerInstance->FindNick(parameter);
+ userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
- // cant find the user given as the parameter, eat the mode change.
if (!theuser)
- {
- parameter = "";
- return MODEACTION_DENY;
- }
-
- // given user isnt even on the channel, eat the mode change
- if (!channel->HasUser(theuser))
- {
- parameter = "";
return MODEACTION_DENY;
- }
- std::string protect = "cm_protect_"+std::string(channel->name);
std::string founder = "cm_founder_"+std::string(channel->name);
// source has +q, is a server, or ulined, we'll let them +-a the user.
- if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source)))
+ if ((unload_kludge) || ((source == theuser) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source)))
{
- if (adding)
- {
- if (!theuser->GetExt(protect,dummyptr))
- {
- theuser->Extend(protect,fakevalue);
- // Tidy the nickname (make case match etc)
- parameter = theuser->nick;
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (theuser->GetExt(protect,dummyptr))
- {
- theuser->Shrink(protect);
- // Tidy the nickname (make case match etc)
- parameter = theuser->nick;
- return MODEACTION_ALLOW;
- }
- }
- return MODEACTION_DENY;
+ return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
else
{
virtual void DisplayList(userrec* user, chanrec* channel)
{
- CUList* cl = channel->GetUsers();
- std::string protect = "cm_protect_"+std::string(channel->name);
- for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
- {
- if (i->second->GetExt(protect,dummyptr))
- {
- user->WriteServ("388 %s %s %s",user->nick, channel->name,i->second->nick);
- }
- }
- user->WriteServ("389 %s %s :End of channel protected user list",user->nick, channel->name);
+ FounderProtectBase::DisplayList(user, channel);
}
};
{
bool FirstInGetsFounder;
+ bool QAPrefixes;
+ bool DeprivSelf;
+ bool booting;
ChanProtect* cp;
ChanFounder* cf;
char* dummyptr;
public:
- ModuleChanProtect(InspIRCd* Me) : Module::Module(Me)
+ ModuleChanProtect(InspIRCd* Me)
+ : Module::Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), booting(true)
{
+ /* Load config stuff */
+ OnRehash("");
+ booting = false;
+
/* Initialise module variables */
- cp = new ChanProtect(ServerInstance);
- cf = new ChanFounder(ServerInstance);
+ cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf);
+ cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf);
ServerInstance->AddMode(cp, 'a');
ServerInstance->AddMode(cf, 'q');
-
- /* Load config stuff */
- OnRehash("");
}
void Implements(char* List)
{
- List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
- }
-
- virtual void On005Numeric(std::string &output)
- {
- ServerInstance->Modes->InsertMode(output,"qa",1);
+ List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
}
virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
* stack-allocate it locally.
*/
ConfigReader Conf(ServerInstance);
-
+
+ bool old_qa = QAPrefixes;
+
FirstInGetsFounder = Conf.ReadFlag("options","noservices",0);
+ QAPrefixes = Conf.ReadFlag("options","qaprefixes",0);
+ DeprivSelf = Conf.ReadFlag("options","deprotectself",0);
+
+ /* Did the user change the QA prefixes on the fly?
+ * If so, remove all instances of the mode, and reinit
+ * the module with prefixes enabled.
+ */
+ if ((old_qa != QAPrefixes) && (!booting))
+ {
+ ServerInstance->Modes->DelMode(cp);
+ ServerInstance->Modes->DelMode(cf);
+ DELETE(cp);
+ DELETE(cf);
+ cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf);
+ cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf);
+ ServerInstance->AddMode(cp, 'a');
+ ServerInstance->AddMode(cf, 'q');
+ ServerInstance->WriteOpers("*** WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
+ }
}
virtual void OnUserJoin(userrec* user, chanrec* channel)
// without any access checks, we're not worthy :p
if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
{
+ ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns ALLOW");
return ACR_ALLOW;
}
}
// we dont know what this access check is, or dont care. just carry on, nothing to see here.
+ ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns DEFAULT");
return ACR_DEFAULT;
}
virtual ~ModuleChanProtect()
{
+ ServerInstance->Modes->DelMode(cp);
+ ServerInstance->Modes->DelMode(cf);
DELETE(cp);
DELETE(cf);
}
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+ return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
{
- // this is called when the server is linking into a net and wants to sync channel data.
- // we should send our mode changes for the channel here to ensure that other servers
- // know whos +q/+a on the channel.
- CUList* cl = chan->GetUsers();
- string_list commands;
- std::string founder = "cm_founder_"+std::string(chan->name);
- std::string protect = "cm_protect_"+std::string(chan->name);
- for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+ /* NOTE: If +qa prefix is on, this is propogated by the channel join,
+ * so we dont need to propogate it manually
+ */
+ if (!QAPrefixes)
{
- if (i->second->GetExt(founder,dummyptr))
+ // this is called when the server is linking into a net and wants to sync channel data.
+ // we should send our mode changes for the channel here to ensure that other servers
+ // know whos +q/+a on the channel.
+ CUList* cl = chan->GetUsers();
+ string_list commands;
+ std::string founder = "cm_founder_"+std::string(chan->name);
+ std::string protect = "cm_protect_"+std::string(chan->name);
+ irc::modestacker modestack(true);
+ std::deque<std::string> stackresult;
+ for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
{
- proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(i->second->nick));
+ if (i->second->GetExt(founder,dummyptr))
+ {
+ modestack.Push('q',i->second->nick);
+ }
+ if (i->second->GetExt(protect,dummyptr))
+ {
+ modestack.Push('a',i->second->nick);
+ }
}
- if (i->second->GetExt(protect,dummyptr))
+ while (modestack.GetStackedLine(stackresult))
{
- proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(i->second->nick));
+ irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
+ std::string line = mode_join.GetJoined();
+ proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan, line);
}
}
}