X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=6e950f4386ec16b3a0a288724f0c778013d42aa5;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=5ec7d6db942b27d6f3f27f0511032f0e9f937b5a;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 5ec7d6db9..6e950f438 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -16,258 +16,228 @@ /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */ -/** Channel mode +R - unidentified users cannot join +/** Channel mode +r - mark a channel as identified */ -class AChannel_R : public ModeHandler +class Channel_r : public ModeHandler { + public: - AChannel_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) { - if (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 (!channel->IsModeSet('R')) + // Only change the mode if it's not redundant + if ((adding && !channel->IsModeSet('r')) || (!adding && channel->IsModeSet('r'))) { - channel->SetMode('R',true); + channel->SetMode('r',adding); return MODEACTION_ALLOW; } + + return MODEACTION_DENY; } else { - if (channel->IsModeSet('R')) - { - channel->SetMode('R',false); - return MODEACTION_ALLOW; - } + source->WriteNumeric(500, "%s :Only a server may modify the +r channel mode", source->nick.c_str()); + return MODEACTION_DENY; } - - return MODEACTION_DENY; } }; -/** User mode +R - unidentified users cannot message +/** User mode +r - mark a user as identified */ -class AUser_R : public ModeHandler +class User_r : public ModeHandler { + public: - AUser_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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (adding) + if (IS_REMOTE(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server)) { - if (!dest->IsModeSet('R')) + if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r'))) { - dest->SetMode('R',true); + dest->SetMode('r',adding); return MODEACTION_ALLOW; } + return MODEACTION_DENY; } else { - if (dest->IsModeSet('R')) - { - dest->SetMode('R',false); - return MODEACTION_ALLOW; - } + source->WriteNumeric(500, "%s :Only a server may modify the +r user mode", source->nick.c_str()); + return MODEACTION_DENY; } - - return MODEACTION_DENY; } }; -/** Channel mode +M - unidentified users cannot message channel +/** Channel mode +R - unidentified users cannot join */ -class AChannel_M : public ModeHandler +class AChannel_R : public SimpleChannelModeHandler { public: - AChannel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { } + AChannel_R(Module* Creator) : SimpleChannelModeHandler(Creator, 'R') { } +}; - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) - { - if (adding) - { - if (!channel->IsModeSet('M')) - { - channel->SetMode('M',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('M')) - { - channel->SetMode('M',false); - return MODEACTION_ALLOW; - } - } +/** User mode +R - unidentified users cannot message + */ +class AUser_R : public SimpleUserModeHandler +{ + public: + AUser_R(Module* Creator) : SimpleUserModeHandler(Creator, 'R') { } +}; - return MODEACTION_DENY; - } +/** Channel mode +M - unidentified users cannot message channel + */ +class AChannel_M : public SimpleChannelModeHandler +{ + public: + AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, 'M') { } }; class ModuleServicesAccount : public Module { - - AChannel_R* m1; - AChannel_M* m2; - AUser_R* m3; + AChannel_R m1; + AChannel_M m2; + AUser_R m3; + Channel_r m4; + User_r m5; + StringExtItem accountname; public: - ModuleServicesAccount(InspIRCd* Me) : Module(Me) + ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this), + accountname("accountname", this) { - - 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!"); - Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, - I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData }; + 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!"); - ServerInstance->Modules->Attach(eventlist, this, 8); + 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); + } + + void On005Numeric(std::string &t) + { + ServerInstance->AddExtBanChar('R'); } /* <- :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) { - ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick, dest->nick, account->c_str()); + ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick.c_str(), dest->nick.c_str(), account->c_str()); } - } + if (dest->IsModeSet('r')) + { + /* user is registered */ + ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick.c_str(), dest->nick.c_str()); + } + } - 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) { - std::string *account; + /* 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); + } + } + 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 = 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; + } - 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; - } + if (c->IsModeSet('M') && !is_registered) + { // 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; + 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; - } - // 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; - } - } - 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); - } - - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) - { - std::string *account; - user->GetExt("accountname", account); - - if (chan) - { - if (chan->IsModeSet('R')) + if (u->IsModeSet('R') && !is_registered) { - 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; - } + // 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 MOD_RES_DENY; } } - return 0; + 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) + + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) { - // check if the linking module wants to know about OUR metadata - if (extname == "accountname") + if (mask[0] == 'R' && mask[1] == ':') { - // 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,TYPE_USER,user,extname,*account); - } + std::string *account = accountname.get(user); + if (account && InspIRCd::Match(*account, mask.substr(2))) + return MOD_RES_DENY; } + 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 ((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')) { - 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 @@ -277,61 +247,42 @@ 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(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(target); // 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 (dest && (extname == "accountname")) + { + std::string *account = accountname.get(dest); + if (account && !account->empty()) { - // 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, 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); - } + 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()); + + AccountData ac; + ac.user = dest; + ac.account = *account; + Event n((char*)&ac, this, "account_login"); + n.Send(); } } } - virtual ~ModuleServicesAccount() + ~ModuleServicesAccount() { - ServerInstance->Modes->DelMode(m1); - ServerInstance->Modes->DelMode(m2); - ServerInstance->Modes->DelMode(m3); - delete m1; - delete m2; - delete m3; + ServerInstance->Modes->DelMode(&m1); + ServerInstance->Modes->DelMode(&m2); + ServerInstance->Modes->DelMode(&m3); + ServerInstance->Modes->DelMode(&m4); + ServerInstance->Modes->DelMode(&m5); } - - virtual Version GetVersion() + + Version GetVersion() { - return Version(1,1,0,0,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); } };