X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=fe381f64cc60d34f78695a0cb59083232eae0733;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=62e9baf17f8429b94b64dab762db821ffda212cf;hpb=bf58f3140ebe17652e30a0d01d3b4bc367ee6c32;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 62e9baf17..fe381f64c 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -2,170 +2,194 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include -#include "helperfuncs.h" -#include "hashcomp.h" +#include "inspircd.h" +#include "account.h" /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */ +/** Channel mode +R - unidentified users cannot join + */ +class AChannel_R : public SimpleChannelModeHandler +{ + public: + AChannel_R(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'R') { } +}; + +/** User mode +R - unidentified users cannot message + */ +class AUser_R : public SimpleUserModeHandler +{ + public: + AUser_R(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'R') { } +}; + +/** 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 { - Server *Srv; + AChannel_R* m1; + AChannel_M* m2; + AUser_R* m3; public: - ModuleServicesAccount(Server* Me) : Module::Module(Me) + ModuleServicesAccount(InspIRCd* Me) : Module(Me) { - Srv = Me; - Srv->AddExtendedMode('R',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('R',MT_CLIENT,false,0,0); - Srv->AddExtendedMode('M',MT_CHANNEL,false,0,0); + 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("You cannot load m_services.so and m_services_account.so at the same time (or 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 }; + + ServerInstance->Modules->Attach(eventlist, this, 9); } - virtual void On005Numeric(std::string &output) + virtual void On005Numeric(std::string &t) { - InsertMode(output, "RM", 4); + ServerInstance->AddExtBanChar('R'); + ServerInstance->AddExtBanChar('M'); } /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ - virtual void OnWhois(userrec* source, userrec* dest) + virtual void OnWhois(User* source, User* dest) { - char *account = dest->GetExt("accountname"); + std::string *account; + dest->GetExt("accountname", account); if (account) { - std::string* accountn = (std::string*)account; - WriteServ(source->fd, "330 %s %s %s :is logged in as", source->nick, dest->nick, accountn->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()); } } - void Implements(char* List) - { - List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; - List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1; - } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - if (modechar == 'R') + std::string *account; + + if (!IS_LOCAL(user)) + return 0; + + user->GetExt("accountname", account); + + if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) { - return 1; + // user is ulined, can speak regardless + return 0; } - else if (modechar == 'M') + + if (target_type == TYPE_CHANNEL) { - if (type == MT_CHANNEL) + Channel* c = (Channel*)dest; + + if ((c->IsModeSet('M')) && (!account)) { + // 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 0; - } - - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) - { - char *account = user->GetExt("accountname"); - - if (target_type == TYPE_CHANNEL) - { - chanrec* c = (chanrec*)dest; - - if ((c->IsModeSet('M')) && (!account)) + if (account) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,""))) + if (c->IsExtBanned(*account, 'M')) { - // user is ulined, can speak regardless - return 0; + // may not speak + user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You may not speak in this channel"); + return 1; } - - // user messaging a +M channel and is not registered - Srv->SendServ(user->fd,"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) { - userrec* u = (userrec*)dest; - - if ((strchr(u->modes,'R')) && (!account)) - { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) - { - // user is ulined, can speak regardless - return 0; - } + User* u = (User*)dest; + if ((u->modes['R'-65]) && (!account)) + { // user messaging a +R user and is not registered - Srv->SendServ(user->fd,"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 OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) + + 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); + return OnUserPreMessage(user, dest, target_type, text, status, exempt_list); } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { - char *account = user->GetExt("accountname"); - + std::string *account; + user->GetExt("accountname", account); + if (chan) { if (chan->IsModeSet('R')) { if (!account) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) + 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 - Srv->SendServ(user->fd,"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; + } + } + + if (account) + { + if (chan->IsExtBanned(*account, 'R')) + { + // may not join + user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(), chan->name.c_str()); 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 userrec or chanrec by a module) then + // 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(userrec* user, Module* proto, void* opaque, const std::string &extname) + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { // check if the linking module wants to know about OUR metadata if (extname == "accountname") { // check if this user has an swhois field to send - char* field = user->GetExt("accountname"); - if (field) + std::string* account; + user->GetExt("accountname", account); + if (account) { - // get our extdata out with a cast - std::string* account = (std::string*)field; + // 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); @@ -174,12 +198,12 @@ class ModuleServicesAccount : public Module } // when a user quits, tidy up their metadata - virtual void OnUserQuit(userrec* user, const std::string &message) + virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { - char* field = user->GetExt("accountname"); - if (field) + std::string* account; + user->GetExt("accountname", account); + if (account) { - std::string* account = (std::string*)field; user->Shrink("accountname"); delete account; } @@ -190,11 +214,11 @@ class ModuleServicesAccount : public Module { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; - char* field = user->GetExt("accountname"); - if (field) + User* user = (User*)item; + std::string* account; + user->GetExt("accountname", account); + if (account) { - std::string* account = (std::string*)field; user->Shrink("accountname"); delete account; } @@ -212,15 +236,16 @@ class ModuleServicesAccount : public Module { // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "accountname")) - { - userrec* dest = (userrec*)target; + { + User* dest = (User*)target; + /* logging them out? */ - if (extdata == "") + if (extdata.empty()) { - char* field = dest->GetExt("accountname"); - if (field) + std::string* account; + dest->GetExt("accountname", account); + if (account) { - std::string* account = (std::string*)field; dest->Shrink("accountname"); delete account; } @@ -228,10 +253,22 @@ class ModuleServicesAccount : public Module else { // if they dont already have an accountname field, accept the remote server's - if (!dest->GetExt("accountname")) + std::string* text; + if (!dest->GetExt("accountname", text)) { - std::string* text = new std::string(extdata); - dest->Extend("accountname",(char*)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); } } } @@ -239,35 +276,18 @@ class ModuleServicesAccount : public Module virtual ~ModuleServicesAccount() { + ServerInstance->Modes->DelMode(m1); + ServerInstance->Modes->DelMode(m2); + ServerInstance->Modes->DelMode(m3); + delete m1; + delete m2; + delete m3; } - - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); - } -}; - -class ModuleServicesAccountFactory : public ModuleFactory -{ - public: - ModuleServicesAccountFactory() - { - } - - ~ModuleServicesAccountFactory() - { - } - - virtual Module * CreateModule(Server* Me) + virtual Version GetVersion() { - return new ModuleServicesAccount(Me); + return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleServicesAccountFactory; -} +MODULE_INIT(ModuleServicesAccount)