-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2012 Shawn Smith <shawn@inspircd.org>
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * 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: Povides support for ircu-style services accounts, including chmode +R, etc. */
+/* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
-/** Channel mode +R - unidentified users cannot join
+#include "inspircd.h"
+#include "modules/account.h"
+
+/** Channel mode +r - mark a channel as identified
*/
-class AChannel_R : public ModeHandler
+class Channel_r : public ModeHandler
{
public:
- AChannel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
+ Channel_r(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- if (adding)
+ // only a u-lined server may add or remove the +r mode.
+ if (!IS_LOCAL(source))
{
- if (!channel->IsModeSet('R'))
+ // Only change the mode if it's not redundant
+ if ((adding != channel->IsModeSet('r')))
{
- channel->SetMode('R',true);
+ channel->SetMode('r',adding);
return MODEACTION_ALLOW;
}
}
else
{
- if (channel->IsModeSet('R'))
- {
- channel->SetMode('R',false);
- return MODEACTION_ALLOW;
- }
+ source->WriteNumeric(500, "%s :Only a server may modify the +r channel mode", source->nick.c_str());
}
-
return MODEACTION_DENY;
}
};
-/** User mode +R - unidentified users cannot message
+/** User mode +r - mark a user as identified
*/
-class AUser_R : public ModeHandler
+class User_r : public ModeHandler
{
+
public:
- AUser_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
+ User_r(Module* Creator) : ModeHandler(Creator, "u_registered", 'r', PARAM_NONE, MODETYPE_USER) { }
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- if (adding)
+ if (!IS_LOCAL(source))
{
- if (!dest->IsModeSet('R'))
+ if ((adding != dest->IsModeSet('r')))
{
- dest->SetMode('R',true);
+ dest->SetMode('r',adding);
return MODEACTION_ALLOW;
}
}
else
{
- if (dest->IsModeSet('R'))
- {
- dest->SetMode('R',false);
- return MODEACTION_ALLOW;
- }
+ source->WriteNumeric(500, "%s :Only a server may modify the +r user mode", source->nick.c_str());
}
-
return MODEACTION_DENY;
}
};
-/** Channel mode +M - unidentified users cannot message channel
+/** Channel mode +R - unidentified users cannot join
*/
-class AChannel_M : public ModeHandler
+class AChannel_R : public SimpleChannelModeHandler
{
public:
- AChannel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
+ AChannel_R(Module* Creator) : SimpleChannelModeHandler(Creator, "reginvite", 'R') { }
+};
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
- {
- if (adding)
- {
- if (!channel->IsModeSet('M'))
- {
- channel->SetMode('M',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (channel->IsModeSet('M'))
- {
- channel->SetMode('M',false);
- return MODEACTION_ALLOW;
- }
- }
+/** User mode +R - unidentified users cannot message
+ */
+class AUser_R : public SimpleUserModeHandler
+{
+ public:
+ AUser_R(Module* Creator) : SimpleUserModeHandler(Creator, "regdeaf", 'R') { }
+};
- return MODEACTION_DENY;
- }
+/** Channel mode +M - unidentified users cannot message channel
+ */
+class AChannel_M : public SimpleChannelModeHandler
+{
+ public:
+ AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { }
};
class ModuleServicesAccount : public Module
{
-
- AChannel_R* m1;
- AChannel_M* m2;
- AUser_R* m3;
+ AChannel_R m1;
+ AChannel_M m2;
+ AUser_R m3;
+ Channel_r m4;
+ User_r m5;
+ AccountExtItem accountname;
public:
- ModuleServicesAccount(InspIRCd* Me) : Module(Me)
+ ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
+ accountname("accountname", this)
+ {
+ }
+
+ void init() CXX11_OVERRIDE
{
-
- m1 = new AChannel_R(ServerInstance);
- m2 = new AChannel_M(ServerInstance);
- m3 = new AUser_R(ServerInstance);
- if (!ServerInstance->AddMode(m1) || !ServerInstance->AddMode(m2) || !ServerInstance->AddMode(m3))
- throw ModuleException("Could not add new modes!");
+ ServiceProvider* providerlist[] = { &m1, &m2, &m3, &m4, &m5, &accountname };
+ ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
+ Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreJoin, I_OnCheckBan,
+ I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
- Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin,
- I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+ }
- ServerInstance->Modules->Attach(eventlist, this, 8);
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+ {
+ tokens["EXTBAN"].push_back('R');
+ tokens["EXTBAN"].push_back('U');
}
/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
- virtual void OnWhois(User* source, User* dest)
+ void OnWhois(User* source, User* dest) CXX11_OVERRIDE
{
- std::string *account;
- dest->GetExt("accountname", account);
+ std::string *account = accountname.get(dest);
if (account)
{
- ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
+ ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick.c_str(), dest->nick.c_str(), account->c_str());
+ }
+
+ if (dest->IsModeSet('r'))
+ {
+ /* user is registered */
+ ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick.c_str(), dest->nick.c_str());
}
}
- void Implements(char* List)
+ void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE
{
- List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
- List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1;
+ /* On nickchange, if they have +r, remove it */
+ if (user->IsModeSet('r') && assign(user->nick) != oldnick)
+ {
+ std::vector<std::string> modechange;
+ modechange.push_back(user->nick);
+ modechange.push_back("-r");
+ ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
+ }
}
- virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
{
- std::string *account;
-
if (!IS_LOCAL(user))
- return 0;
+ return MOD_RES_PASSTHRU;
+
+ std::string *account = accountname.get(user);
+ bool is_registered = account && !account->empty();
- user->GetExt("accountname", account);
-
if (target_type == TYPE_CHANNEL)
{
Channel* c = (Channel*)dest;
-
- if ((c->IsModeSet('M')) && (!account))
- {
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
- {
- // user is ulined, can speak regardless
- return 0;
- }
+ ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated");
+ if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
+ {
// user messaging a +M channel and is not registered
- user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
- return 1;
+ user->WriteNumeric(477, user->nick+" "+c->name+" :You need to be identified to a registered account to message this channel");
+ return MOD_RES_DENY;
}
}
- if (target_type == TYPE_USER)
+ else if (target_type == TYPE_USER)
{
User* u = (User*)dest;
-
- if ((u->modes['R'-65]) && (!account))
- {
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
- {
- // user is ulined, can speak regardless
- return 0;
- }
+ if (u->IsModeSet('R') && !is_registered)
+ {
// user messaging a +R user and is not registered
- user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
- return 1;
+ user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
+ return MOD_RES_DENY;
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
-
- virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
- {
- return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
- }
-
- virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+
+ ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
{
- std::string *account;
- user->GetExt("accountname", account);
-
- if (chan)
+ static bool checking = false;
+ if (checking)
+ return MOD_RES_PASSTHRU;
+
+ if ((mask.length() > 2) && (mask[1] == ':'))
{
- if (chan->IsModeSet('R'))
+ if (mask[0] == 'R')
{
- if (!account)
- {
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
- {
- // user is ulined, won't be stopped from joining
- return 0;
- }
- // joining a +R channel and not identified
- user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
- return 1;
- }
+ std::string *account = accountname.get(user);
+ if (account && InspIRCd::Match(*account, mask.substr(2)))
+ return MOD_RES_DENY;
}
- }
- return 0;
- }
-
- // Whenever the linking module wants to send out data, but doesnt know what the data
- // represents (e.g. it is metadata, added to a User or Channel by a module) then
- // this method is called. We should use the ProtoSendMetaData function after we've
- // corrected decided how the data should look, to send the metadata on its way if
- // it is ours.
- virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
- {
- // check if the linking module wants to know about OUR metadata
- if (extname == "accountname")
- {
- // check if this user has an swhois field to send
- std::string* account;
- user->GetExt("accountname", account);
- if (account)
+ else if (mask[0] == 'U')
{
- // remove any accidental leading/trailing spaces
- trim(*account);
+ std::string *account = accountname.get(user);
+ /* If the user is registered we don't care. */
+ if (account)
+ return MOD_RES_PASSTHRU;
- // call this function in the linking module, let it format the data how it
- // sees fit, and send it on its way. We dont need or want to know how.
- proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*account);
+ /* If we made it this far we know the user isn't registered
+ so just deny if it matches */
+ checking = true;
+ bool result = chan->CheckBan(user, mask.substr(2));
+ checking = false;
+
+ if (result)
+ return MOD_RES_DENY;
}
}
- }
- // when a user quits, tidy up their metadata
- virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
- {
- std::string* account;
- user->GetExt("accountname", account);
- if (account)
- {
- user->Shrink("accountname");
- delete account;
- }
+ /* If we made it this far then the ban wasn't an ExtBan
+ or the user we were checking for didn't match either ExtBan */
+ return MOD_RES_PASSTHRU;
}
- // if the module is unloaded, tidy up all our dangling metadata
- virtual void OnCleanup(int target_type, void* item)
+ ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
- if (target_type == TYPE_USER)
+ std::string *account = accountname.get(user);
+ bool is_registered = account && !account->empty();
+
+ if (chan)
{
- User* user = (User*)item;
- std::string* account;
- user->GetExt("accountname", account);
- if (account)
+ if (chan->IsModeSet('R'))
{
- user->Shrink("accountname");
- delete account;
+ if (!is_registered)
+ {
+ // joining a +R channel and not identified
+ user->WriteNumeric(477, user->nick + " " + chan->name + " :You need to be identified to a registered account to join this channel");
+ return MOD_RES_DENY;
+ }
}
}
+ return MOD_RES_PASSTHRU;
}
// Whenever the linking module receives metadata from another server and doesnt know what
// In our case we're only sending a single string around, so we just construct a std::string.
// Some modules will probably get much more complex and format more detailed structs and classes
// in a textual way for sending over the link.
- virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+ void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata) CXX11_OVERRIDE
{
+ User* dest = dynamic_cast<User*>(target);
// check if its our metadata key, and its associated with a user
- if ((target_type == TYPE_USER) && (extname == "accountname"))
- {
- User* dest = (User*)target;
-
- /* logging them out? */
- if (extdata.empty())
+ if (dest && (extname == "accountname"))
+ {
+ std::string *account = accountname.get(dest);
+ if (account && !account->empty())
{
- std::string* account;
- dest->GetExt("accountname", account);
- if (account)
- {
- dest->Shrink("accountname");
- delete account;
- }
+ trim(*account);
+
+ if (IS_LOCAL(dest))
+ dest->WriteNumeric(900, "%s %s %s :You are now logged in as %s",
+ dest->nick.c_str(), dest->GetFullHost().c_str(), account->c_str(), account->c_str());
+
+ AccountEvent(this, dest, *account).Send();
}
else
{
- // if they dont already have an accountname field, accept the remote server's
- std::string* text;
- if (!dest->GetExt("accountname", text))
- {
- text = new std::string(extdata);
- // remove any accidental leading/trailing spaces
- trim(*text);
- dest->Extend("accountname", text);
- }
+ AccountEvent(this, dest, "").Send();
}
}
}
- virtual ~ModuleServicesAccount()
+ ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
{
- ServerInstance->Modes->DelMode(m1);
- ServerInstance->Modes->DelMode(m2);
- ServerInstance->Modes->DelMode(m3);
- delete m1;
- delete m2;
- delete m3;
+ if (myclass->config->getBool("requireaccount") && !accountname.get(user))
+ return MOD_RES_DENY;
+ return MOD_RES_PASSTHRU;
}
-
- virtual Version GetVersion()
+
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR);
}
};
MODULE_INIT(ModuleServicesAccount)
+
projects / user / henk / code / inspircd.git / blobdiff