X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=e97e1b02f82c60a2d8de790e8097051ae210256d;hb=f471083cd0519d47c7c7a09029813ede41994f7b;hp=3ac333b37caebe99680e8dc2bbd37293c3a5407f;hpb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 3ac333b37..e97e1b02f 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -1,27 +1,89 @@ -/* +------------------------------------+ - * | 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) 2012 Shawn Smith + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2006, 2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis * - * 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 . */ + #include "inspircd.h" -#include "account.h" +#include "modules/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(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { } + + 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_LOCAL(source)) + { + // Only change the mode if it's not redundant + if ((adding != channel->IsModeSet(this))) + { + channel->SetMode(this, adding); + return MODEACTION_ALLOW; + } + } + else + { + source->WriteNumeric(500, "Only a server may modify the +r channel mode"); + } + return MODEACTION_DENY; + } +}; + +/** User mode +r - mark a user as identified + */ +class User_r : public ModeHandler +{ + + public: + 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 (!IS_LOCAL(source)) + { + if ((adding != dest->IsModeSet(this))) + { + dest->SetMode(this, adding); + return MODEACTION_ALLOW; + } + } + else + { + source->WriteNumeric(500, "Only a server may modify the +r user mode"); + } + return MODEACTION_DENY; + } +}; /** Channel mode +R - unidentified users cannot join */ 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 @@ -29,7 +91,7 @@ class AChannel_R : public SimpleChannelModeHandler 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 @@ -37,235 +99,192 @@ class AUser_R : public SimpleUserModeHandler 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 +class AccountExtItemImpl : public AccountExtItem { - - AChannel_R* m1; - AChannel_M* m2; - AUser_R* m3; + Events::ModuleEventProvider eventprov; + public: - ModuleServicesAccount(InspIRCd* Me) : Module(Me) + AccountExtItemImpl(Module* mod) + : AccountExtItem("accountname", ExtensionItem::EXT_USER, mod) + , eventprov(mod, "event/account") { - - m1 = new AChannel_R(ServerInstance); - m2 = new AChannel_M(ServerInstance); - m3 = new AUser_R(ServerInstance); - if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3)) - throw ModuleException("Could not add new modes!"); + } + + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + { + User* user = static_cast(container); + + StringExtItem::unserialize(format, container, value); + + // If we are being reloaded then don't send the numeric or run the event + if (format == FORMAT_INTERNAL) + return; + + if (!value.empty()) + { + // Logged in + if (IS_LOCAL(user)) + { + user->WriteNumeric(900, user->GetFullHost(), value, InspIRCd::Format("You are now logged in as %s", value.c_str())); + } + } + // If value is empty then logged out + + FOREACH_MOD_CUSTOM(eventprov, AccountEventListener, OnAccountChange, (user, value)); + } +}; - Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, - I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData }; +class ModuleServicesAccount : public Module, public Whois::EventListener +{ + AChannel_R m1; + AChannel_M m2; + AUser_R m3; + Channel_r m4; + User_r m5; + AccountExtItemImpl accountname; + bool checking_ban; + public: + ModuleServicesAccount() + : Whois::EventListener(this) + , m1(this), m2(this), m3(this), m4(this), m5(this) + , accountname(this) + , checking_ban(false) + { + } - ServerInstance->Modules->Attach(eventlist, this, 8); + void On005Numeric(std::map& 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(Whois::Context& whois) CXX11_OVERRIDE { - std::string *account; - dest->GetExt("accountname", account); + std::string* account = accountname.get(whois.GetTarget()); if (account) { - ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick, dest->nick, account->c_str()); + whois.SendLine(330, *account, "is logged in as"); } - } + if (whois.GetTarget()->IsModeSet(m5)) + { + /* user is registered */ + whois.SendLine(307, "is a registered nick"); + } + } - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE { - std::string *account; + /* On nickchange, if they have +r, remove it */ + if ((user->IsModeSet(m5)) && (ServerInstance->FindNickOnly(oldnick) != user)) + m5.RemoveMode(user); + } + ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE + { 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(m2) && !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; + user->WriteNumeric(477, 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(m3) && !is_registered) + { // user messaging a +R user and is not registered - user->WriteNumeric(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, u->nick, "You need to be identified to a registered account to message this user"); + 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) CXX11_OVERRIDE { - std::string *account; - user->GetExt("accountname", account); - - if (chan) + if (checking_ban) + 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->WriteNumeric(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_ban = true; + bool result = chan->CheckBan(user, mask.substr(2)); + checking_ban = 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) - { - User* user = (User*)item; - std::string* account; - user->GetExt("accountname", account); - if (account) - { - user->Shrink("accountname"); - delete account; - } - } - } + std::string *account = accountname.get(user); + bool is_registered = account && !account->empty(); - // Whenever the linking module receives metadata from another server and doesnt know what - // to do with it (of course, hence the 'meta') it calls this method, and it is up to each - // module in turn to figure out if this metadata key belongs to them, and what they want - // to do with it. - // 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) - { - // 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()) - { - std::string* account; - dest->GetExt("accountname", account); - if (account) - { - dest->Shrink("accountname"); - delete account; - } - } - else + if (chan) + { + if (chan->IsModeSet(m1)) { - // if they dont already have an accountname field, accept the remote server's - std::string* text; - if (!dest->GetExt("accountname", text)) + if (!is_registered) { - 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, dest->GetFullHost(), text->c_str(), text->c_str()); - - AccountData ac; - ac.user = dest; - ac.account = *text; - Event n((char*)&ac, this, "account_login"); - n.Send(ServerInstance); + // joining a +R channel and not identified + user->WriteNumeric(477, chan->name, "You need to be identified to a registered account to join this channel"); + return MOD_RES_DENY; } } } + return MOD_RES_PASSTHRU; } - 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,2,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); } };