X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=6e950f4386ec16b3a0a288724f0c778013d42aa5;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;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..6e950f438 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -22,9 +22,9 @@ 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, '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)) @@ -52,11 +52,11 @@ 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, '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_REMOTE(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server)) { if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r'))) { @@ -78,7 +78,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, 'R') { } }; /** User mode +R - unidentified users cannot message @@ -86,7 +86,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, 'R') { } }; /** Channel mode +M - unidentified users cannot message channel @@ -94,7 +94,7 @@ class AUser_R : public SimpleUserModeHandler class AChannel_M : public SimpleChannelModeHandler { public: - AChannel_M(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'M') { } + AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, 'M') { } }; class ModuleServicesAccount : public Module @@ -104,9 +104,10 @@ class ModuleServicesAccount : public Module AUser_R m3; Channel_r m4; User_r m5; + StringExtItem accountname; 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("accountname", this) { if (!ServerInstance->Modes->AddMode(&m1) || !ServerInstance->Modes->AddMode(&m2) || @@ -114,23 +115,22 @@ class ModuleServicesAccount : public Module !ServerInstance->Modes->AddMode(&m5)) throw ModuleException("Some other module has claimed our modes!"); + Extensible::Register(&accountname); 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::string &t) { ServerInstance->AddExtBanChar('R'); - ServerInstance->AddExtBanChar('M'); } /* <- :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) { @@ -144,7 +144,7 @@ class ModuleServicesAccount : public Module } } - 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) @@ -156,19 +156,18 @@ class ModuleServicesAccount : public Module } } - 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; + return MOD_RES_PASSTHRU; - std::string *account; - bool is_registered = user->GetExt("accountname", account); - is_registered = is_registered && !account->empty(); + 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 0; + return MOD_RES_PASSTHRU; } if (target_type == TYPE_CHANNEL) @@ -179,17 +178,7 @@ class ModuleServicesAccount : public Module { // 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; - } + return MOD_RES_DENY; } } else if (target_type == TYPE_USER) @@ -200,40 +189,42 @@ class ModuleServicesAccount : public Module { // 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; + return MOD_RES_PASSTHRU; } - virtual int OnCheckBan(User* user, Channel* chan) + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) { - std::string* account; - if (!user->GetExt("accountname", account)) - return 0; - return chan->GetExtBanStatus(*account, 'R'); + if (mask[0] == 'R' && mask[1] == ':') + { + std::string *account = accountname.get(user); + if (account && InspIRCd::Match(*account, mask.substr(2))) + return MOD_RES_DENY; + } + return MOD_RES_PASSTHRU; } - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + 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); } - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { 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(); + 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 0; + return MOD_RES_PASSTHRU; } if (chan->IsModeSet('R')) @@ -242,60 +233,11 @@ class ModuleServicesAccount : public Module { // 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; + 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); - } - } - - // 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 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; - } - } + return MOD_RES_PASSTHRU; } // Whenever the linking module receives metadata from another server and doesnt know what @@ -305,25 +247,16 @@ class ModuleServicesAccount : public Module // 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) + 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; - 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()) + std::string *account = accountname.get(dest); + if (account && !account->empty()) { - 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", @@ -333,12 +266,12 @@ class ModuleServicesAccount : public Module ac.user = dest; ac.account = *account; Event n((char*)&ac, this, "account_login"); - n.Send(ServerInstance); + n.Send(); } } } - virtual ~ModuleServicesAccount() + ~ModuleServicesAccount() { ServerInstance->Modes->DelMode(&m1); ServerInstance->Modes->DelMode(&m2); @@ -347,9 +280,9 @@ class ModuleServicesAccount : public Module ServerInstance->Modes->DelMode(&m5); } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Povides support for ircu-style services accounts, including chmode +R, etc.",VF_COMMON|VF_VENDOR,API_VERSION); } };