X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=aac0b9ce079d7f3fff6264a8d8d57512e16d1780;hb=8c71a2a6304f0d77aa7738e04a44f366a158cadd;hp=cd34e955a596392a106085e54e0107e09a198e2f;hpb=0bdaa91b7a1982d494dbe999b9edbb7caab79d05;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index cd34e955a..aac0b9ce0 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2012 Shawn Smith * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2006-2008 Robin Burchell * Copyright (C) 2008 Pippijn van Steenhoven @@ -21,10 +22,8 @@ */ -/* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */ - #include "inspircd.h" -#include "account.h" +#include "modules/account.h" /** Channel mode +r - mark a channel as identified */ @@ -36,22 +35,20 @@ class Channel_r : public ModeHandler 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) || 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; } }; @@ -65,20 +62,19 @@ class User_r : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (!IS_LOCAL(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; } }; @@ -106,6 +102,38 @@ class AChannel_M : public SimpleChannelModeHandler 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 { AChannel_R m1; @@ -113,62 +141,46 @@ class ModuleServicesAccount : public Module AUser_R m3; Channel_r m4; User_r m5; - AccountExtItem accountname; + AccountExtItemImpl accountname; + bool checking_ban; public: ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this), - accountname("accountname", this) - { - } - - void init() + accountname(this) + , checking_ban(false) { - ServerInstance->Modules->AddService(m1); - ServerInstance->Modules->AddService(m2); - ServerInstance->Modules->AddService(m3); - ServerInstance->Modules->AddService(m4); - ServerInstance->Modules->AddService(m5); - ServerInstance->Modules->AddService(accountname); - 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, 9); } - void On005Numeric(std::string &t) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - ServerInstance->AddExtBanChar('R'); + tokens["EXTBAN"].push_back('R'); + tokens["EXTBAN"].push_back('U'); } /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ - void OnWhois(User* source, User* dest) + void OnWhois(User* source, User* dest) CXX11_OVERRIDE { 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()); } } - 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, ServerInstance->FakeClient); - } + if (user->IsModeSet(m5) && assign(user->nick) != oldnick) + m5.RemoveMode(user); } - ModResult 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 MOD_RES_PASSTHRU; @@ -176,21 +188,15 @@ class ModuleServicesAccount : public Module std::string *account = accountname.get(user); bool is_registered = account && !account->empty(); - if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) - { - // user is ulined, can speak regardless - return MOD_RES_PASSTHRU; - } - if (target_type == TYPE_CHANNEL) { Channel* c = (Channel*)dest; ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated"); - if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW) + 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"); + user->WriteNumeric(477, c->name+" :You need to be identified to a registered account to message this channel"); return MOD_RES_DENY; } } @@ -198,54 +204,65 @@ class ModuleServicesAccount : public Module { 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"); + user->WriteNumeric(477, u->nick +" :You need to be identified to a registered account to message this user"); return MOD_RES_DENY; } } return MOD_RES_PASSTHRU; } - ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE { - if (mask[0] == 'R' && mask[1] == ':') + if (checking_ban) + return MOD_RES_PASSTHRU; + + if ((mask.length() > 2) && (mask[1] == ':')) { - std::string *account = accountname.get(user); - if (account && InspIRCd::Match(*account, mask.substr(2))) - return MOD_RES_DENY; + if (mask[0] == 'R') + { + std::string *account = accountname.get(user); + if (account && InspIRCd::Match(*account, mask.substr(2))) + return MOD_RES_DENY; + } + else if (mask[0] == 'U') + { + 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 MOD_RES_PASSTHRU; - } - ModResult 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); + /* 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; } - ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - if (!IS_LOCAL(user)) - return MOD_RES_PASSTHRU; - std::string *account = accountname.get(user); bool is_registered = account && !account->empty(); if (chan) { - if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) - { - // user is ulined, won't be stopped from joining - return MOD_RES_PASSTHRU; - } - - if (chan->IsModeSet('R')) + if (chan->IsModeSet(m1)) { 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"); + user->WriteNumeric(477, chan->name + " :You need to be identified to a registered account to join this channel"); return MOD_RES_DENY; } } @@ -253,45 +270,14 @@ class ModuleServicesAccount : public Module return MOD_RES_PASSTHRU; } - // 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. - 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")) - { - std::string *account = accountname.get(dest); - if (account && !account->empty()) - { - 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 - { - AccountEvent(this, dest, "").Send(); - } - } - } - - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE { if (myclass->config->getBool("requireaccount") && !accountname.get(user)) return MOD_RES_DENY; return MOD_RES_PASSTHRU; } - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR); }