]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/cull_list.cpp
Add sanity checks to the ssl modules so that theres no possibility of an out of range...
[user/henk/code/inspircd.git] / src / cull_list.cpp
index 1acdd4517ee0c8c80e96f1ab76e7087d0362a612..a1e4aa99825fa710ec094b0700a088a46b153422 100644 (file)
@@ -2,88 +2,50 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "xline.h"
-#include "inspstring.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
 #include "cull_list.h"
 
-extern InspIRCd* ServerInstance;
-extern user_hash clientlist;
-
-/*
- * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
- */
-bool CullList::IsValid(userrec* user)
+CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
 {
-       time_t esignon = 0;
-       std::map<userrec*,time_t>::iterator es = exempt.find(user);
-       if (es != exempt.end())
-               esignon = es->second;
-
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-       {
-               /*
-                * BUGFIX
-                *
-                * Because there is an undetermined period of time between a user existing,
-                * and this function being called, we have to check for the following condition:
-                *
-                * Between CullList::AddItem(u) being called, and CullList::IsValid(u) being called,
-                * the user with the pointer u has quit, but only to be REPLACED WITH A NEW USER WHO
-                * BECAUSE OF ALLOCATION RULES, HAS THE SAME MEMORY ADDRESS! To prevent this, we
-                * cross reference each pointer to the user's signon time, and if the signon times
-                * do not match, we return false here to indicate this user is NOT valid as it
-                * seems to differ from the pointer snapshot we got a few seconds earlier. Should
-                * prevent a few random crashes during netsplits.
-                */
-               if (user == u->second)
-                       return (u->second->signon == esignon);
-       }
-       return false;
+       this->user = u;
+       this->reason = r;
+       this->silent = false;
+       /* Seperate oper reason not set, use the user reason */
+       if (*o_reason)
+               this->oper_reason = o_reason;
+       else
+               this->oper_reason = r;
 }
 
-CullItem::CullItem(userrec* u, std::string &r)
+CullItem::CullItem(userrec* u, const char* r, const char* o_reason)
 {
        this->user = u;
        this->reason = r;
+       this->silent = false;
+       /* Seperate oper reason not set, use the user reason */
+       if (*o_reason)
+               this->oper_reason = o_reason;
+       else
+               this->oper_reason = r;
 }
 
-CullItem::CullItem(userrec* u, const char* r)
+void CullItem::MakeSilent()
 {
-       this->user = u;
-       this->reason = r;
+       this->silent = true;
+}
+
+bool CullItem::IsSilent()
+{
+       return this->silent;
 }
 
 CullItem::~CullItem()
@@ -100,30 +62,44 @@ std::string& CullItem::GetReason()
        return this->reason;
 }
 
-CullList::CullList()
+std::string& CullItem::GetOperReason()
+{
+       return this->oper_reason;
+}
+
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
        exempt.clear();
 }
 
-void CullList::AddItem(userrec* user, std::string &reason)
+void CullList::AddItem(userrec* user, std::string &reason, const char* o_reason)
+{
+       AddItem(user, reason.c_str(), o_reason);
+}
+
+
+void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
 {
        if (exempt.find(user) == exempt.end())
        {
-               CullItem item(user,reason);
+               CullItem item(user, reason, o_reason);
                list.push_back(item);
-               exempt[user] = user->signon;
+               exempt[user] = user;
        }
 }
 
-void CullList::AddItem(userrec* user, const char* reason)
+void CullList::MakeSilent(userrec* user)
 {
-       if (exempt.find(user) == exempt.end())
+       for (std::vector<CullItem>::iterator a = list.begin(); a != list.end(); ++a)
        {
-               CullItem item(user,reason);
-               list.push_back(item);
-               exempt[user] = user->signon;
+               if (a->GetUser() == user)
+               {
+                       a->MakeSilent();
+                       break;
+               }
        }
+       return;
 }
 
 int CullList::Apply()
@@ -133,8 +109,93 @@ int CullList::Apply()
        {
                std::vector<CullItem>::iterator a = list.begin();
 
-               kill_link(a->GetUser(), a->GetReason().c_str());
+               user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
+               std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
+               const char* preset_reason = a->GetUser()->GetOperQuit();
+               std::string reason = a->GetReason();
+               std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason();
+
+               if (reason.length() > MAXQUIT - 1)
+                       reason.resize(MAXQUIT - 1);
+               if (oper_reason.length() > MAXQUIT - 1)
+                       oper_reason.resize(MAXQUIT - 1);
+
+               if (a->GetUser()->registered != REG_ALL)
+                       if (ServerInstance->unregistered_count)
+                               ServerInstance->unregistered_count--;
+
+               if (IS_LOCAL(a->GetUser()))
+               {
+                       a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]", a->GetUser()->ident, a->GetUser()->host, oper_reason.c_str());
+                       if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
+                               a->GetUser()->FlushWriteBuf();
+               }
+
+               if (a->GetUser()->registered == REG_ALL)
+               {
+                       FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(), reason, oper_reason));
+                       a->GetUser()->PurgeEmptyChannels();
+                       a->GetUser()->WriteCommonQuit(reason, oper_reason);
+               }
+
+               FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser()));
+
+               if (IS_LOCAL(a->GetUser()))
+               {
+                       if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort()))
+                       {
+                               try
+                               {
+                                       ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd());
+                               }
+                               catch (CoreException& modexcept)
+                               {
+                                       ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                               }
+                       }
+
+                       ServerInstance->SE->DelFd(a->GetUser());
+                       a->GetUser()->CloseSocket();
+               }
+
+               /*
+                * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
+                * if they were an oper with +sn +qQ.
+                */
+               if (a->GetUser()->registered == REG_ALL)
+               {
+                       if (IS_LOCAL(a->GetUser()))
+                       {
+                               if (!a->IsSilent())
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+                               }
+                       }
+                       else
+                       {
+                               if ((!ServerInstance->SilentULine(a->GetUser()->server)) && (!a->IsSilent()))
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+                               }
+                       }
+                       a->GetUser()->AddToWhoWas();
+               }
+
+               if (iter != ServerInstance->clientlist->end())
+               {
+                       if (IS_LOCAL(a->GetUser()))
+                       {
+                               std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
+                               if (x != ServerInstance->local_users.end())
+                                       ServerInstance->local_users.erase(x);
+                       }
+                       ServerInstance->clientlist->erase(iter);
+                       delete a->GetUser();
+               }
+
                list.erase(list.begin());
+               exempt.erase(exemptiter);
        }
        return n;
 }
+