X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=aac0b9ce079d7f3fff6264a8d8d57512e16d1780;hb=8c71a2a6304f0d77aa7738e04a44f366a158cadd;hp=30baccadf0db10aaa6b008af4386875d8cb6d145;hpb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 30baccadf..aac0b9ce0 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -1,48 +1,54 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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" -/* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */ +#include "inspircd.h" +#include "modules/account.h" /** 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(this))) { - channel->SetMode('r',adding); + channel->SetMode(this, 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; + source->WriteNumeric(500, ":Only a server may modify the +r channel mode"); } + return MODEACTION_DENY; } }; @@ -52,24 +58,23 @@ class User_r : public ModeHandler { 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 servermode) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (servermode || 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(this))) { - dest->SetMode('r',adding); + dest->SetMode(this, 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; + source->WriteNumeric(500, ":Only a server may modify the +r user mode"); } + return MODEACTION_DENY; } }; @@ -78,7 +83,7 @@ class User_r : public ModeHandler 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 @@ -86,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 @@ -94,7 +99,39 @@ 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 AccountExtItemImpl : public AccountExtItem +{ + public: + AccountExtItemImpl(Module* mod) + : AccountExtItem("accountname", ExtensionItem::EXT_USER, mod) + { + } + + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + { + User* user = static_cast(container); + + StringExtItem::unserialize(format, container, value); + if (!value.empty()) + { + // Logged in + if (IS_LOCAL(user)) + { + user->WriteNumeric(900, "%s %s :You are now logged in as %s", + user->GetFullHost().c_str(), value.c_str(), value.c_str()); + } + + AccountEvent(creator, user, value).Send(); + } + else + { + // Logged out + AccountEvent(creator, user, "").Send(); + } + } }; class ModuleServicesAccount : public Module @@ -104,252 +141,145 @@ class ModuleServicesAccount : public Module AUser_R m3; Channel_r m4; User_r m5; + AccountExtItemImpl accountname; + bool checking_ban; public: - ModuleServicesAccount(InspIRCd* Me) : Module(Me), - m1(Me), m2(Me), m3(Me), m4(Me), m5(Me) + ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this), + accountname(this) + , checking_ban(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!"); - - Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan, - I_OnSyncUser, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick }; - - ServerInstance->Modules->Attach(eventlist, this, 10); } - virtual void On005Numeric(std::string &t) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - ServerInstance->AddExtBanChar('R'); - ServerInstance->AddExtBanChar('M'); + 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.c_str(), dest->nick.c_str(), account->c_str()); + ServerInstance->SendWhoisLine(source, dest, 330, "%s %s :is logged in as", dest->nick.c_str(), account->c_str()); } - if (dest->IsModeSet('r')) + if (dest->IsModeSet(m5)) { /* user is registered */ - ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick.c_str(), dest->nick.c_str()); + ServerInstance->SendWhoisLine(source, dest, 307, "%s :is a registered nick", dest->nick.c_str()); } } - virtual void OnUserPostNick(User* user, const std::string &oldnick) + void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE { /* On nickchange, if they have +r, remove it */ - if (user->IsModeSet('r') && assign(user->nick) != oldnick) - { - std::vector modechange; - modechange.push_back(user->nick); - modechange.push_back("-r"); - ServerInstance->SendMode(modechange, user); - } + if (user->IsModeSet(m5) && assign(user->nick) != oldnick) + m5.RemoveMode(user); } - 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 { if (!IS_LOCAL(user)) - return 0; + return MOD_RES_PASSTHRU; - std::string *account; - bool is_registered = user->GetExt("accountname", account); - is_registered = is_registered && !account->empty(); - - 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(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; - } - - if (account) - { - if (c->GetExtBanStatus(*account, 'M') < 0) - { - // 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, 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* u = (User*)dest; - if (u->IsModeSet('R') && !is_registered) + if (u->IsModeSet(m3) && !is_registered) { // 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; + user->WriteNumeric(477, 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 OnCheckBan(User* user, Channel* chan) + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE { - std::string* account; - if (!user->GetExt("accountname", account)) - return 0; - return chan->GetExtBanStatus(*account, 'R'); - } + if (checking_ban) + 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, const std::string &keygiven) - { - if (!IS_LOCAL(user)) - return 0; - - std::string *account; - bool is_registered = user->GetExt("accountname", account); - is_registered = is_registered && !account->empty(); - - 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; - } + std::string *account = accountname.get(user); + /* If the user is registered we don't care. */ + if (account) + return MOD_RES_PASSTHRU; + + /* 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; } } - 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 OnSyncUser(User* user, Module* proto, void* opaque) - { - // 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); - - // 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,user,"accountname",*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; } - // when a user quits, tidy up their metadata - virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - std::string* account; - user->GetExt("accountname", account); - if (account) - { - user->Shrink("accountname"); - delete account; - } - } - - // if the module is unloaded, tidy up all our dangling metadata - virtual void OnCleanup(int target_type, void* item) - { - 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(Extensible* target, const std::string &extname, const std::string &extdata) - { - User* dest = dynamic_cast(target); - // check if its our metadata key, and its associated with a user - if (dest && (extname == "accountname")) + if (chan) { - std::string* account; - if (dest->GetExt("accountname", account)) { - // remove old account so that we can set new (or leave unset) - dest->Shrink("accountname"); - delete account; - } - - if (!extdata.empty()) + if (chan->IsModeSet(m1)) { - account = new std::string(extdata); - // remove any accidental leading/trailing spaces - trim(*account); - dest->Extend("accountname", 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()); - - AccountData ac; - ac.user = dest; - ac.account = *account; - Event n((char*)&ac, this, "account_login"); - n.Send(ServerInstance); + if (!is_registered) + { + // 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); - ServerInstance->Modes->DelMode(&m4); - ServerInstance->Modes->DelMode(&m5); + 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("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR); } };