X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_services_account.cpp;h=d6cf0b1e772960b6a77fa3ef7d122e2f357eb1dc;hb=6e85701ecb09604f2c87010683638ec0446cc515;hp=4bb6f9268139a70c2f46ac5b81faaa9adcda55f1;hpb=dde67b9765bc485d807f181bba108c00f4c44dba;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 4bb6f9268..d6cf0b1e7 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,116 +16,114 @@ /* $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(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) { - 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(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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode) { - if (adding) + if (servermode || 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(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, '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(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'R') { } +}; - return MODEACTION_DENY; - } +/** Channel mode +M - unidentified users cannot message channel + */ +class AChannel_M : public SimpleChannelModeHandler +{ + public: + AChannel_M(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, '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; 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!"); - 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); + Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan, + I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick }; + + ServerInstance->Modules->Attach(eventlist, this, 10); + } + + virtual void On005Numeric(std::string &t) + { + ServerInstance->AddExtBanChar('R'); + ServerInstance->AddExtBanChar('M'); } /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ @@ -136,87 +134,121 @@ class ModuleServicesAccount : public Module 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 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) { + if (!IS_LOCAL(user)) + return 0; + std::string *account; + bool is_registered = user->GetExt("accountname", account); + is_registered = is_registered && !account->empty(); - if (!IS_LOCAL(user)) + if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) + { + // user is ulined, can speak regardless return 0; + } - 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->WriteServ("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, ""+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel"); return 1; } - } - if (target_type == TYPE_USER) - { - User* u = (User*)dest; - - if ((u->modes['R'-65]) && (!account)) + + if (account) { - if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) + if (c->GetExtBanStatus(*account, 'M') < 0) { - // user is ulined, can speak regardless - return 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; } + } + } + else if (target_type == TYPE_USER) + { + User* u = (User*)dest; + if (u->IsModeSet('R') && !is_registered) + { // user messaging a +R user and is not registered - user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user"); + user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user"); return 1; } } 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); } - - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) + + 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 ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) + { + // user is ulined, won't be stopped from joining + return 0; + } + if (chan->IsModeSet('R')) { - if (!account) + if (!is_registered) { - 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->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel"); + user->WriteNumeric(477, user->nick + " " + chan->name + " :You need to be identified to a registered account to join this channel"); return 1; } } } 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 @@ -281,57 +313,48 @@ class ModuleServicesAccount : public Module { // 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; - } + + 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->WriteServ("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); - } + 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,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); } };