X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_invisible.cpp;h=d1fa5162a4b958716cb4af30274ba80c0155900d;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=9313c65da1b842a224b62586347f2f73fcc28179;hpb=513921effef52ef2820f02a02bbbbc90acba63b1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index 9313c65da..d1fa5162a 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -11,10 +11,8 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" +#include /* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */ @@ -31,7 +29,7 @@ class QuietOper : public VisData { } - virtual bool VisibleTo(userrec* user) + virtual bool VisibleTo(User* user) { return IS_OPER(user); } @@ -55,7 +53,7 @@ class InvisibleMode : public ModeHandler delete qo; } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (source != dest) return MODEACTION_DENY; @@ -82,9 +80,20 @@ class InvisibleMode : public ModeHandler dest->SetMode('Q', adding); + /* Fix for bug #379 reported by stealth. On +/-Q make m_watch think the user has signed on/off */ + Module* m = ServerInstance->Modules->Find("m_watch.so"); + + /* This must come before setting/unsetting the handler */ + if (m && adding) + m->OnUserQuit(dest, "Connection closed", "Connection closed"); + /* Set visibility handler object */ dest->Visibility = adding ? qo : NULL; + /* This has to come after setting/unsetting the handler */ + if (m && !adding) + m->OnPostConnect(dest); + /* User appears to vanish or appear from nowhere */ for (UCListIter f = dest->chans.begin(); f != dest->chans.end(); f++) { @@ -126,7 +135,7 @@ class InvisibleDeOper : public ModeWatcher { } - bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶m, bool adding, ModeType type) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type) { /* Users who are opers and have +Q get their +Q removed when they deoper */ if ((!adding) && (dest->IsModeSet('Q'))) @@ -146,15 +155,18 @@ class ModuleInvisible : public Module InvisibleDeOper* ido; public: ModuleInvisible(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { conf = new ConfigReader(ServerInstance); qm = new InvisibleMode(ServerInstance); - if (!ServerInstance->AddMode(qm, 'Q')) + if (!ServerInstance->AddMode(qm)) throw ModuleException("Could not add new modes!"); ido = new InvisibleDeOper(ServerInstance); if (!ServerInstance->AddModeWatcher(ido)) throw ModuleException("Could not add new mode watcher on usermode +o!"); + + /* Yeah i know people can take this out. I'm not about to obfuscate code just to be a pain in the ass. */ + ServerInstance->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible"); } virtual ~ModuleInvisible() @@ -173,43 +185,43 @@ class ModuleInvisible : public Module void Implements(char* List) { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1; + List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1; } - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + virtual void OnUserJoin(User* user, Channel* channel, bool &silent) { if (user->IsModeSet('Q')) { silent = true; /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ - user->WriteFrom(user, "JOIN %s", channel->name); + this->WriteCommonFrom(user, channel, "JOIN %s", channel->name); ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name); } } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { DELETE(conf); conf = new ConfigReader(ServerInstance); } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) + void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { if (user->IsModeSet('Q')) { silent = true; /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ - user->WriteFrom(user, "PART %s%s%s", channel->name, + this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name, partmessage.empty() ? "" : " :", partmessage.empty() ? "" : partmessage.c_str()); } } - void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { if (user->IsModeSet('Q')) { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); + Command* parthandler = ServerInstance->Parser->GetHandler("PART"); std::vector to_leave; const char* parameters[2]; if (parthandler) @@ -226,28 +238,51 @@ class ModuleInvisible : public Module } } } -}; -class ModuleInvisibleFactory : public ModuleFactory -{ - public: - ModuleInvisibleFactory() + /* No privmsg response when hiding - submitted by Eric at neowin */ + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { + if ((target_type == TYPE_USER) && (IS_LOCAL(user))) + { + User* target = (User*)dest; + if(target->IsModeSet('Q') && !*user->oper) + { + user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick); + return 1; + } + } + return 0; } - ~ModuleInvisibleFactory() + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { + return OnUserPreNotice(user, dest, target_type, text, status, exempt_list); } - - virtual Module * CreateModule(InspIRCd* Me) + + /* Fix by Eric @ neowin.net, thanks :) -- Brain */ + void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) { - return new ModuleInvisible(Me); - } + va_list argsPtr; + char textbuffer[MAXBUF]; + char tb[MAXBUF]; -}; + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer); + + CUList *ulist = channel->GetUsers(); + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + /* User only appears to vanish for non-opers */ + if (IS_LOCAL(i->first) && IS_OPER(i->first)) + { + i->first->Write(std::string(tb)); + } + } + } -extern "C" void * init_module( void ) -{ - return new ModuleInvisibleFactory; -} +}; +MODULE_INIT(ModuleInvisible)