-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 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/>.
*/
+
+/* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
+
#include "inspircd.h"
#include "account.h"
-/* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
-
/** Channel mode +r - mark a channel as identified
*/
class Channel_r : public ModeHandler
{
-
public:
- Channel_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, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
// only a u-lined server may add or remove the +r mode.
- if (IS_REMOTE(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
+ if (!IS_LOCAL(source))
{
// Only change the mode if it's not redundant
- if ((adding && !channel->IsModeSet('r')) || (!adding && channel->IsModeSet('r')))
+ if ((adding != channel->IsModeSet('r')))
{
channel->SetMode('r',adding);
return MODEACTION_ALLOW;
}
-
- return MODEACTION_DENY;
}
else
{
source->WriteNumeric(500, "%s :Only a server may modify the +r channel mode", source->nick.c_str());
- return MODEACTION_DENY;
}
+ return MODEACTION_DENY;
}
};
{
public:
- User_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, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- if (IS_REMOTE(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
+ if (!IS_LOCAL(source))
{
- if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r')))
+ if ((adding != dest->IsModeSet('r')))
{
dest->SetMode('r',adding);
return MODEACTION_ALLOW;
}
- return MODEACTION_DENY;
}
else
{
source->WriteNumeric(500, "%s :Only a server may modify the +r user mode", source->nick.c_str());
- return MODEACTION_DENY;
}
+ return MODEACTION_DENY;
}
};
class AChannel_R : public SimpleChannelModeHandler
{
public:
- AChannel_R(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'R') { }
+ AChannel_R(Module* Creator) : SimpleChannelModeHandler(Creator, "reginvite", 'R') { }
};
/** User mode +R - unidentified users cannot message
class AUser_R : public SimpleUserModeHandler
{
public:
- AUser_R(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'R') { }
+ AUser_R(Module* Creator) : SimpleUserModeHandler(Creator, "regdeaf", 'R') { }
};
/** Channel mode +M - unidentified users cannot message channel
class AChannel_M : public SimpleChannelModeHandler
{
public:
- AChannel_M(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'M') { }
+ AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { }
};
class ModuleServicesAccount : public Module
{
- AChannel_R* m1;
- AChannel_M* m2;
- AUser_R* m3;
- Channel_r *m4;
- User_r *m5;
- public:
- ModuleServicesAccount(InspIRCd* Me) : Module(Me)
+ AChannel_R m1;
+ AChannel_M m2;
+ AUser_R m3;
+ Channel_r m4;
+ User_r m5;
+ AccountExtItem accountname;
+ bool checking_ban;
+
+ static bool ReadCGIIRCExt(const char* extname, User* user, const std::string*& out)
{
- m1 = new AChannel_R(ServerInstance);
- m2 = new AChannel_M(ServerInstance);
- m3 = new AUser_R(ServerInstance);
- m4 = new Channel_r(ServerInstance);
- m5 = new User_r(ServerInstance);
+ ExtensionItem* wiext = ServerInstance->Extensions.GetItem(extname);
+ if (!wiext)
+ return false;
+
+ if (wiext->creator->ModuleSourceFile != "m_cgiirc.so")
+ return false;
+
+ StringExtItem* stringext = static_cast<StringExtItem*>(wiext);
+ std::string* addr = stringext->get(user);
+ if (!addr)
+ return false;
- if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3) || !ServerInstance->Modes->AddMode(m4) || !ServerInstance->Modes->AddMode(m5))
- throw ModuleException("Some other module has claimed our modes!");
+ out = addr;
+ return true;
+ }
- Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin,
- I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
+ public:
+ ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
+ accountname("accountname", this), checking_ban(false)
+ {
+ }
- ServerInstance->Modules->Attach(eventlist, this, 10);
+ void init()
+ {
+ ServiceProvider* providerlist[] = { &m1, &m2, &m3, &m4, &m5, &accountname };
+ ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
+ Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
+ I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
+
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- virtual void On005Numeric(std::string &t)
+ void On005Numeric(std::string &t)
{
ServerInstance->AddExtBanChar('R');
- ServerInstance->AddExtBanChar('M');
+ ServerInstance->AddExtBanChar('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)
{
- std::string *account;
- dest->GetExt("accountname", account);
+ std::string *account = accountname.get(dest);
if (account)
{
}
}
- virtual void OnUserPostNick(User* user, const std::string &oldnick)
+ void OnUserPostNick(User* user, const std::string &oldnick)
{
/* 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->SendMode(modechange, user);
+ ServerInstance->SendMode(modechange, ServerInstance->FakeClient);
}
}
- 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)
{
if (!IS_LOCAL(user))
- return 0;
-
- std::string *account;
- bool is_registered = user->GetExt("accountname", account);
- is_registered = is_registered && !account->empty();
+ return MOD_RES_PASSTHRU;
- if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
- {
- // user is ulined, can speak regardless
- return 0;
- }
+ std::string *account = accountname.get(user);
+ bool is_registered = account && !account->empty();
if (target_type == TYPE_CHANNEL)
{
Channel* c = (Channel*)dest;
+ ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated");
- if (c->IsModeSet('M') && !is_registered)
+ if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
{
// user messaging a +M channel and is not registered
- user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
- return 1;
- }
-
- if (account)
- {
- if (c->IsExtBanned(*account, 'M'))
- {
- // may not speak (text is deliberately vague, so they don't know which restriction to evade)
- user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You may not speak in 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;
}
}
else if (target_type == TYPE_USER)
{
// user messaging a +R user and is not registered
user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
- return 1;
+ return MOD_RES_DENY;
}
}
- return 0;
- }
-
- 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);
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+ ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
{
- if (!IS_LOCAL(user))
- return 0;
-
- std::string *account;
- bool is_registered = user->GetExt("accountname", account);
- is_registered = is_registered && !account->empty();
+ if (checking_ban)
+ return MOD_RES_PASSTHRU;
- if (chan)
+ if ((mask.length() > 2) && (mask[1] == ':'))
{
- if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
+ if (mask[0] == 'R')
{
- // user is ulined, won't be stopped from joining
- return 0;
+ std::string *account = accountname.get(user);
+ if (account && InspIRCd::Match(*account, mask.substr(2)))
+ return MOD_RES_DENY;
}
-
- if (chan->IsModeSet('R'))
+ else if (mask[0] == 'U')
{
- 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 1;
- }
- }
-
- if (account)
- {
- if (chan->IsExtBanned(*account, 'R'))
- {
- // may not join
- user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(), chan->name.c_str());
- return 1;
- }
- }
- }
- return 0;
- }
+ std::string *account = accountname.get(user);
+ /* If the user is registered we don't care. */
+ if (account)
+ return MOD_RES_PASSTHRU;
- // 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)
- {
- // remove any accidental leading/trailing spaces
- trim(*account);
+ /* If we made it this far we know the user isn't registered
+ so just deny if it matches */
+ checking_ban = true;
+ bool result = chan->CheckBan(user, mask.substr(2));
+ checking_ban = false;
- // 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 (result)
+ return MOD_RES_DENY;
}
}
+
+ /* 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;
}
- // when a user quits, tidy up their metadata
- virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
+ ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
- std::string* account;
- user->GetExt("accountname", account);
- if (account)
- {
- user->Shrink("accountname");
- delete account;
- }
+ return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
}
- // if the module is unloaded, tidy up all our dangling metadata
- virtual void OnCleanup(int target_type, void* item)
+ ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
- if (target_type == TYPE_USER)
+ if (!IS_LOCAL(user))
+ return MOD_RES_PASSTHRU;
+
+ 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)
{
+ 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"))
+ if (dest && (extname == "accountname"))
{
- User* dest = (User*)target;
-
- /* logging them out? */
- if (extdata.empty())
+ std::string *account = accountname.get(dest);
+ if (account && !account->empty())
{
- std::string* account;
- dest->GetExt("accountname", account);
- if (account)
+ trim(*account);
+
+ if (IS_LOCAL(dest))
{
- dest->Shrink("accountname");
- delete account;
+ const std::string* host = &dest->dhost;
+ if (dest->registered != REG_ALL)
+ {
+ if (!ReadCGIIRCExt("cgiirc_webirc_hostname", dest, host))
+ {
+ ReadCGIIRCExt("cgiirc_webirc_ip", dest, host);
+ }
+ }
+
+ dest->WriteNumeric(900, "%s %s!%s@%s %s :You are now logged in as %s",
+ dest->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), host->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);
-
- 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(), text->c_str(), text->c_str());
-
- AccountData ac;
- ac.user = dest;
- ac.account = *text;
- Event n((char*)&ac, this, "account_login");
- n.Send(ServerInstance);
- }
+ AccountEvent(this, dest, "").Send();
}
}
}
- virtual ~ModuleServicesAccount()
+ ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
{
- ServerInstance->Modes->DelMode(m1);
- ServerInstance->Modes->DelMode(m2);
- ServerInstance->Modes->DelMode(m3);
- ServerInstance->Modes->DelMode(m4);
- ServerInstance->Modes->DelMode(m5);
- delete m1;
- delete m2;
- delete m3;
- delete m4;
- delete m5;
+ if (myclass->config->getBool("requireaccount") && !accountname.get(user))
+ return MOD_RES_DENY;
+ return MOD_RES_PASSTHRU;
}
- virtual Version GetVersion()
+ Version GetVersion()
{
- return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR);
}
};