X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=30baccadf0db10aaa6b008af4386875d8cb6d145;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=0b842ce7c6924fc8bd50a90aa48239721c5f4a9f;hpb=f2408e7cc91708c33ceaec1e187e94b86580fd49;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 0b842ce7c..30baccadf 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,6 +16,63 @@ /* $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(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + { + // 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)) + { + // Only change the mode if it's not redundant + if ((adding && !channel->IsModeSet('r')) || (!adding && channel->IsModeSet('r'))) + { + channel->SetMode('r',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; + } + } +}; + +/** User mode +r - mark a user as identified + */ +class User_r : public ModeHandler +{ + + public: + User_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_USER, false) { } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode) + { + if (servermode || IS_REMOTE(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server)) + { + if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r'))) + { + dest->SetMode('r',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; + } + } +}; + /** Channel mode +R - unidentified users cannot join */ class AChannel_R : public SimpleChannelModeHandler @@ -42,24 +99,25 @@ class AChannel_M : public SimpleChannelModeHandler 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; public: - ModuleServicesAccount(InspIRCd* Me) : Module(Me) + ModuleServicesAccount(InspIRCd* Me) : Module(Me), + m1(Me), m2(Me), m3(Me), m4(Me), m5(Me) { - 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!"); + 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_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric }; + 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, 9); + ServerInstance->Modules->Attach(eventlist, this, 10); } virtual void On005Numeric(std::string &t) @@ -78,17 +136,34 @@ class ModuleServicesAccount : public Module { 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 void OnUserPostNick(User* user, const std::string &oldnick) + { + /* 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); + } + } virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - std::string *account; - if (!IS_LOCAL(user)) return 0; - user->GetExt("accountname", account); + 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))) { @@ -100,7 +175,7 @@ class ModuleServicesAccount : public Module { Channel* c = (Channel*)dest; - if ((c->IsModeSet('M')) && (!account)) + 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"); @@ -109,20 +184,19 @@ class ModuleServicesAccount : public Module if (account) { - if (c->IsExtBanned(*account, 'M')) + if (c->GetExtBanStatus(*account, 'M') < 0) { - // may not speak + // 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; } } } - - if (target_type == TYPE_USER) + else if (target_type == TYPE_USER) { User* u = (User*)dest; - if ((u->modes['R'-65]) && (!account)) + if (u->IsModeSet('R') && !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"); @@ -132,6 +206,14 @@ class ModuleServicesAccount : public Module return 0; } + virtual int OnCheckBan(User* user, Channel* chan) + { + std::string* account; + if (!user->GetExt("accountname", account)) + return 0; + return chan->GetExtBanStatus(*account, 'R'); + } + 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); @@ -139,32 +221,27 @@ class ModuleServicesAccount : public Module 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; - user->GetExt("accountname", account); + bool is_registered = user->GetExt("accountname", account); + is_registered = is_registered && !account->empty(); if (chan) { - if (chan->IsModeSet('R')) + if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) { - if (!account) - { - if ((ServerInstance->ULine(user->nick.c_str())) || (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, user->nick + " " + chan->name + " :You need to be identified to a registered account to join this channel"); - return 1; - } + // user is ulined, won't be stopped from joining + return 0; } - if (account) + if (chan->IsModeSet('R')) { - if (chan->IsExtBanned(*account, 'R')) + if (!is_registered) { - // may not join - user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(), c->name.c_str()); + // 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; } } @@ -177,23 +254,19 @@ class ModuleServicesAccount : public Module // 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) + virtual void OnSyncUser(User* user, Module* proto, void* opaque) { - // 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) { - // 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); + // 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); - } + // 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); } } @@ -232,61 +305,51 @@ 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) + 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 ((target_type == TYPE_USER) && (extname == "accountname")) + if (dest && (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; - } + 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; } - else + + if (!extdata.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.c_str(), dest->GetFullHost().c_str(), text->c_str(), text->c_str()); - - AccountData ac; - ac.user = dest; - ac.account = *text; - Event n((char*)&ac, this, "account_login"); - n.Send(ServerInstance); - } + 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); } } } virtual ~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() { - return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); } };