* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * 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.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "channels.h"
-#include "connection.h"
-#include "users.h"
+/* $Core: libIRCDusers */
+
#include "inspircd.h"
#include <stdarg.h>
-#include "inspstring.h"
-#include "commands.h"
-
-#include "typedefs.h"
#include "socketengine.h"
-#include "hashcomp.h"
#include "wildcard.h"
#include "xline.h"
-#include "cull_list.h"
+#include "bancache.h"
+#include "commands/cmd_whowas.h"
-irc::whowas::whowas_users whowas;
static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
-typedef std::map<irc::string,char*> opertype_t;
-typedef opertype_t operclass_t;
-
-opertype_t opertypes;
-operclass_t operclass;
-
/* XXX: Used for speeding up WriteCommon operations */
unsigned long uniq_id = 0;
-bool InitTypes(ServerConfig* conf, const char* tag)
-{
- for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++)
- {
- if (n->second)
- delete[] n->second;
- }
-
- opertypes.clear();
- return true;
-}
-
-bool InitClasses(ServerConfig* conf, const char* tag)
-{
- for (operclass_t::iterator n = operclass.begin(); n != operclass.end(); n++)
- {
- if (n->second)
- delete[] n->second;
- }
-
- operclass.clear();
- return true;
-}
-
-bool DoType(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
-{
- char* TypeName = (char*)values[0];
- char* Classes = (char*)values[1];
-
- opertypes[TypeName] = strdup(Classes);
- conf->GetInstance()->Log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
- return true;
-}
-
-bool DoClass(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
-{
- char* ClassName = (char*)values[0];
- char* CommandList = (char*)values[1];
-
- operclass[ClassName] = strdup(CommandList);
- conf->GetInstance()->Log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
- return true;
-}
-
-bool DoneClassesAndTypes(ServerConfig* conf, const char* tag)
+std::string User::ProcessNoticeMasks(const char *sm)
{
- return true;
-}
-
-bool userrec::ProcessNoticeMasks(const char *sm)
-{
- bool adding = true;
+ bool adding = true, oldadding = false;
const char *c = sm;
+ std::string output;
while (c && *c)
{
{
case '+':
adding = true;
- break;
+ break;
case '-':
adding = false;
- break;
+ break;
+ case '*':
+ for (unsigned char d = 'A'; d <= 'z'; d++)
+ {
+ if (ServerInstance->SNO->IsEnabled(d))
+ {
+ if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding))
+ {
+ if ((oldadding != adding) || (!output.length()))
+ output += (adding ? '+' : '-');
+
+ this->SetNoticeMask(d, adding);
+
+ output += d;
+ }
+ }
+ oldadding = adding;
+ }
+ break;
default:
- if ((*c >= 'A') && (*c <= 'z'))
- this->SetNoticeMask(*c, adding);
- break;
+ if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
+ {
+ if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
+ {
+ if ((oldadding != adding) || (!output.length()))
+ output += (adding ? '+' : '-');
+
+ this->SetNoticeMask(*c, adding);
+
+ output += *c;
+ }
+ }
+ else
+ this->WriteNumeric(501, "%s %c :is unknown snomask char to me", this->nick, *c);
+
+ oldadding = adding;
+ break;
}
*c++;
}
- return true;
+ return output;
}
-void userrec::StartDNSLookup()
+void User::StartDNSLookup()
{
- ServerInstance->Log(DEBUG,"Commencing reverse lookup");
try
{
- ServerInstance->Log(DEBUG,"Passing instance: %08x",this->ServerInstance);
- res_reverse = new UserResolver(this->ServerInstance, this, this->GetIPString(), false);
- this->ServerInstance->AddResolver(res_reverse);
- }
- catch (ModuleException& e)
- {
- ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
- }
-}
-
-UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, bool forward) :
- Resolver(Instance, to_resolve, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), bound_user(user)
-{
- this->fwd = forward;
- this->bound_fd = user->GetFd();
-}
+ bool cached;
+ const char* sip = this->GetIPString();
-void UserResolver::OnLookupComplete(const std::string &result)
-{
- if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
- {
- ServerInstance->Log(DEBUG,"Commencing forward lookup");
- this->bound_user->stored_host = result;
- try
- {
- /* Check we didnt time out */
- if (this->bound_user->registered != REG_ALL)
- {
- bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, true);
- this->ServerInstance->AddResolver(bound_user->res_forward);
- }
- }
- catch (ModuleException& e)
- {
- ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
- }
- }
- else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
- {
- /* Both lookups completed */
- if (this->bound_user->GetIPString() == result)
- {
- std::string hostname = this->bound_user->stored_host;
- if (hostname.length() < 65)
- {
- /* Check we didnt time out */
- if (this->bound_user->registered != REG_ALL)
- {
- /* Hostnames starting with : are not a good thing (tm) */
- if (*(hostname.c_str()) == ':')
- hostname = "0" + hostname;
-
- this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)", hostname.c_str());
- this->bound_user->dns_done = true;
- strlcpy(this->bound_user->dhost, hostname.c_str(),64);
- strlcpy(this->bound_user->host, hostname.c_str(),64);
- }
- }
- else
- {
- this->bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", this->bound_user->GetIPString());
- }
- }
+ /* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
+ if (!strncmp(sip, "0::ffff:", 8))
+ res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached);
else
- {
- this->bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", this->bound_user->GetIPString());
- }
- }
-}
+ res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
-void UserResolver::OnError(ResolverError e, const std::string &errormessage)
-{
- if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
+ this->ServerInstance->AddResolver(res_reverse, cached);
+ }
+ catch (CoreException& e)
{
- /* Error message here */
- this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname, using your IP address (%s) instead.", this->bound_user->GetIPString());
- this->bound_user->dns_done = true;
+ ServerInstance->Logs->Log("USERS", DEBUG,"Error in resolver: %s",e.GetReason());
}
}
-
-bool userrec::IsNoticeMaskSet(unsigned char sm)
+bool User::IsNoticeMaskSet(unsigned char sm)
{
return (snomasks[sm-65]);
}
-void userrec::SetNoticeMask(unsigned char sm, bool value)
+void User::SetNoticeMask(unsigned char sm, bool value)
{
snomasks[sm-65] = value;
}
-const char* userrec::FormatNoticeMasks()
+const char* User::FormatNoticeMasks()
{
static char data[MAXBUF];
int offset = 0;
-bool userrec::IsModeSet(unsigned char m)
+bool User::IsModeSet(unsigned char m)
{
return (modes[m-65]);
}
-void userrec::SetMode(unsigned char m, bool value)
+void User::SetMode(unsigned char m, bool value)
{
modes[m-65] = value;
}
-const char* userrec::FormatModes()
+const char* User::FormatModes()
{
static char data[MAXBUF];
int offset = 0;
return data;
}
-userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
+void User::DecrementModes()
+{
+ ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()");
+ for (unsigned char n = 'A'; n <= 'z'; n++)
+ {
+ if (modes[n-65])
+ {
+ ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n);
+ ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
+ if (mh)
+ {
+ ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n);
+ mh->ChangeCount(-1);
+ }
+ }
+ }
+}
+
+User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
{
- ServerInstance->Log(DEBUG,"userrec::userrec(): Instance: %08x",ServerInstance);
- // the PROPER way to do it, AVOID bzero at *ALL* costs
- *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = 0;
+ *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = *uuid = 0;
server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
reset_due = ServerInstance->Time();
+ age = ServerInstance->Time();
+ Penalty = 0;
lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
- timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
- haspassed = dns_done = false;
+ ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+ quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
fd = -1;
- recvq = "";
- sendq = "";
- WriteError = "";
+ recvq.clear();
+ sendq.clear();
+ WriteError.clear();
res_forward = res_reverse = NULL;
+ Visibility = NULL;
ip = NULL;
+ MyClass = NULL;
+ io = NULL;
+ AllowedUserModes = NULL;
+ AllowedChanModes = NULL;
+ AllowedOperCommands = NULL;
chans.clear();
invites.clear();
- chans.resize(MAXCHANS);
memset(modes,0,sizeof(modes));
-
- for (unsigned int n = 0; n < MAXCHANS; n++)
- {
- ucrec* x = new ucrec();
- chans[n] = x;
- x->channel = NULL;
- x->uc_modes = 0;
- }
+ memset(snomasks,0,sizeof(snomasks));
+ /* Invalidate cache */
+ cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+
+ if (uid.empty())
+ strlcpy(uuid, Instance->GetUID().c_str(), UUID_LENGTH);
+ else
+ strlcpy(uuid, uid.c_str(), UUID_LENGTH);
+
+ ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid, uid.empty() ? "allocated new" : "used remote");
+
+ user_hash::iterator finduuid = Instance->Users->uuidlist->find(uuid);
+ if (finduuid == Instance->Users->uuidlist->end())
+ (*Instance->Users->uuidlist)[uuid] = this;
+ else
+ throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
}
-userrec::~userrec()
+User::~User()
{
- for (std::vector<ucrec*>::iterator n = chans.begin(); n != chans.end(); n++)
+ /* NULL for remote users :) */
+ if (this->MyClass)
+ {
+ this->MyClass->RefCount--;
+ ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount);
+ }
+ if (this->AllowedOperCommands)
+ {
+ delete AllowedOperCommands;
+ AllowedOperCommands = NULL;
+ }
+
+ if (this->AllowedUserModes)
+ {
+ delete[] AllowedUserModes;
+ AllowedUserModes = NULL;
+ }
+
+ if (this->AllowedChanModes)
{
- ucrec* x = (ucrec*)*n;
- delete x;
+ delete[] AllowedChanModes;
+ AllowedChanModes = NULL;
}
+ this->InvalidateCache();
+ this->DecrementModes();
+
if (ip)
{
+ ServerInstance->Users->RemoveCloneCounts(this);
+
if (this->GetProtocolFamily() == AF_INET)
{
delete (sockaddr_in*)ip;
}
#endif
}
+
+ ServerInstance->Users->uuidlist->erase(uuid);
}
-/* XXX - minor point, other *Host functions return a char *, this one creates it. Might be nice to be consistant? */
-void userrec::MakeHost(char* nhost)
+char* User::MakeHost()
{
+ if (this->cached_makehost)
+ return this->cached_makehost;
+
+ char nhost[MAXBUF];
/* This is much faster than snprintf */
char* t = nhost;
for(char* n = ident; *n; n++)
for(char* n = host; *n; n++)
*t++ = *n;
*t = 0;
+
+ this->cached_makehost = strdup(nhost);
+
+ return this->cached_makehost;
+}
+
+char* User::MakeHostIP()
+{
+ if (this->cached_hostip)
+ return this->cached_hostip;
+
+ char ihost[MAXBUF];
+ /* This is much faster than snprintf */
+ char* t = ihost;
+ for(char* n = ident; *n; n++)
+ *t++ = *n;
+ *t++ = '@';
+ for(const char* n = this->GetIPString(); *n; n++)
+ *t++ = *n;
+ *t = 0;
+
+ this->cached_hostip = strdup(ihost);
+
+ return this->cached_hostip;
}
-void userrec::CloseSocket()
+void User::CloseSocket()
{
- shutdown(this->fd,2);
- close(this->fd);
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
}
-
-char* userrec::GetFullHost()
+
+char* User::GetFullHost()
{
- static char result[MAXBUF];
+ if (this->cached_fullhost)
+ return this->cached_fullhost;
+
+ char result[MAXBUF];
char* t = result;
for(char* n = nick; *n; n++)
*t++ = *n;
for(char* n = dhost; *n; n++)
*t++ = *n;
*t = 0;
- return result;
+
+ this->cached_fullhost = strdup(result);
+
+ return this->cached_fullhost;
}
-char* userrec::MakeWildHost()
+char* User::MakeWildHost()
{
static char nresult[MAXBUF];
char* t = nresult;
return nresult;
}
-int userrec::ReadData(void* buffer, size_t size)
+int User::ReadData(void* buffer, size_t size)
{
- if (this->fd > -1)
+ if (IS_LOCAL(this))
{
+#ifndef WIN32
return read(this->fd, buffer, size);
+#else
+ return recv(this->fd, (char*)buffer, size, 0);
+#endif
}
else
return 0;
}
-char* userrec::GetFullRealHost()
+char* User::GetFullRealHost()
{
- static char fresult[MAXBUF];
+ if (this->cached_fullrealhost)
+ return this->cached_fullrealhost;
+
+ char fresult[MAXBUF];
char* t = fresult;
for(char* n = nick; *n; n++)
*t++ = *n;
for(char* n = host; *n; n++)
*t++ = *n;
*t = 0;
- return fresult;
+
+ this->cached_fullrealhost = strdup(fresult);
+
+ return this->cached_fullrealhost;
}
-bool userrec::IsInvited(irc::string &channel)
+bool User::IsInvited(const irc::string &channel)
{
- for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
+ time_t now = time(NULL);
+ InvitedList::iterator safei;
+ for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
{
- irc::string compare = i->channel;
-
- if (compare == channel)
+ if (channel == i->first)
{
+ if (i->second != 0 && now > i->second)
+ {
+ /* Expired invite, remove it. */
+ safei = i;
+ --i;
+ invites.erase(safei);
+ continue;
+ }
return true;
}
}
return false;
}
-InvitedList* userrec::GetInviteList()
+InvitedList* User::GetInviteList()
{
+ time_t now = time(NULL);
+ /* Weed out expired invites here. */
+ InvitedList::iterator safei;
+ for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
+ {
+ if (i->second != 0 && now > i->second)
+ {
+ /* Expired invite, remove it. */
+ safei = i;
+ --i;
+ invites.erase(safei);
+ }
+ }
return &invites;
}
-void userrec::InviteTo(irc::string &channel)
+void User::InviteTo(const irc::string &channel, time_t invtimeout)
{
- Invited i;
- i.channel = channel;
- invites.push_back(i);
+ time_t now = time(NULL);
+ if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
+ for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
+ {
+ if (channel == i->first)
+ {
+ if (i->second != 0 && invtimeout > i->second)
+ {
+ i->second = invtimeout;
+ }
+ }
+ }
+ invites.push_back(std::make_pair(channel, invtimeout));
}
-void userrec::RemoveInvite(irc::string &channel)
+void User::RemoveInvite(const irc::string &channel)
{
- ServerInstance->Log(DEBUG,"Removing invites");
-
- if (invites.size())
+ for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
{
- for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
+ if (channel == i->first)
{
- irc::string compare = i->channel;
-
- if (compare == channel)
- {
- invites.erase(i);
- return;
- }
- }
- }
+ invites.erase(i);
+ return;
+ }
+ }
}
-bool userrec::HasPermission(const std::string &command)
+bool User::HasModePermission(unsigned char mode, ModeType type)
{
- char* mycmd;
- char* savept;
- char* savept2;
+ if (!IS_LOCAL(this))
+ return true;
+
+ if (!IS_OPER(this))
+ return false;
+
+ if (!AllowedUserModes || !AllowedChanModes)
+ return false;
+
+ return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
+}
+
+bool User::HasPermission(const std::string &command)
+{
/*
* users on remote servers can completely bypass all permissions based checks.
* This prevents desyncs when one server has different type/class tags to another.
*/
if (!IS_LOCAL(this))
return true;
-
+
// are they even an oper at all?
- if (*this->oper)
+ if (!IS_OPER(this))
{
- opertype_t::iterator iter_opertype = opertypes.find(this->oper);
- if (iter_opertype != opertypes.end())
- {
- char* Classes = strdup(iter_opertype->second);
- char* myclass = strtok_r(Classes," ",&savept);
- while (myclass)
- {
- operclass_t::iterator iter_operclass = operclass.find(myclass);
- if (iter_operclass != operclass.end())
- {
- char* CommandList = strdup(iter_operclass->second);
- mycmd = strtok_r(CommandList," ",&savept2);
- while (mycmd)
- {
- if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*'))
- {
- free(Classes);
- free(CommandList);
- return true;
- }
- mycmd = strtok_r(NULL," ",&savept2);
- }
- free(CommandList);
- }
- myclass = strtok_r(NULL," ",&savept);
- }
- free(Classes);
- }
+ return false;
}
+
+ if (!AllowedOperCommands)
+ return false;
+
+ if (AllowedOperCommands->find(command) != AllowedOperCommands->end())
+ return true;
+ else if (AllowedOperCommands->find("*") != AllowedOperCommands->end())
+ return true;
+
return false;
}
* something we can change anyway. Makes sense to just let
* the compiler do that copy for us.
*/
-bool userrec::AddBuffer(std::string a)
+bool User::AddBuffer(std::string a)
{
- std::string::size_type i = a.rfind('\r');
-
- while (i != std::string::npos)
+ try
{
- a.erase(i, 1);
- i = a.rfind('\r');
- }
+ std::string::size_type i = a.rfind('\r');
+
+ while (i != std::string::npos)
+ {
+ a.erase(i, 1);
+ i = a.rfind('\r');
+ }
- if (a.length())
- recvq.append(a);
+ if (a.length())
+ recvq.append(a);
- if (recvq.length() > (unsigned)this->recvqmax)
+ if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
+ {
+ this->SetWriteError("RecvQ exceeded");
+ ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %d exceeds connect class maximum of %lu",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
+ return false;
+ }
+
+ return true;
+ }
+
+ catch (...)
{
- this->SetWriteError("RecvQ exceeded");
- ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
+ ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::AddBuffer()");
return false;
}
-
- return true;
}
-bool userrec::BufferIsReady()
+bool User::BufferIsReady()
{
return (recvq.find('\n') != std::string::npos);
}
-void userrec::ClearBuffer()
+void User::ClearBuffer()
{
- recvq = "";
+ recvq.clear();
}
-std::string userrec::GetBuffer()
+std::string User::GetBuffer()
{
- if (!recvq.length())
- return "";
-
- /* Strip any leading \r or \n off the string.
- * Usually there are only one or two of these,
- * so its is computationally cheap to do.
- */
- while ((*recvq.begin() == '\r') || (*recvq.begin() == '\n'))
- recvq.erase(recvq.begin());
-
- for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
+ try
{
- /* Find the first complete line, return it as the
- * result, and leave the recvq as whats left
+ if (recvq.empty())
+ return "";
+
+ /* Strip any leading \r or \n off the string.
+ * Usually there are only one or two of these,
+ * so its is computationally cheap to do.
*/
- if (*x == '\n')
+ std::string::iterator t = recvq.begin();
+ while (t != recvq.end() && (*t == '\r' || *t == '\n'))
{
- std::string ret = std::string(recvq.begin(), x);
- recvq.erase(recvq.begin(), x + 1);
- return ret;
+ recvq.erase(t);
+ t = recvq.begin();
}
+
+ for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
+ {
+ /* Find the first complete line, return it as the
+ * result, and leave the recvq as whats left
+ */
+ if (*x == '\n')
+ {
+ std::string ret = std::string(recvq.begin(), x);
+ recvq.erase(recvq.begin(), x + 1);
+ return ret;
+ }
+ }
+ return "";
+ }
+
+ catch (...)
+ {
+ ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::GetBuffer()");
+ return "";
}
- return "";
}
-void userrec::AddWriteBuf(const std::string &data)
+void User::AddWriteBuf(const std::string &data)
{
if (*this->GetWriteError())
return;
-
- if (sendq.length() + data.length() > (unsigned)this->sendqmax)
+
+ if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
{
/*
- * Fix by brain - Set the error text BEFORE calling writeopers, because
+ * Fix by brain - Set the error text BEFORE calling, because
* if we dont it'll recursively call here over and over again trying
* to repeatedly add the text to the sendq!
*/
this->SetWriteError("SendQ exceeded");
- ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
+ ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %d exceeds connect class maximum of %lu",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
return;
}
-
- if (data.length() > 512)
- {
- std::string newdata(data);
- newdata.resize(510);
- newdata.append("\r\n");
- sendq.append(newdata);
- }
+
+ if (data.length() > MAXBUF - 2) /* MAXBUF has a value of 514, to account for line terminators */
+ sendq.append(data.substr(0,MAXBUF - 4)).append("\r\n"); /* MAXBUF-4 = 510 */
else
- {
sendq.append(data);
- }
}
// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void userrec::FlushWriteBuf()
+void User::FlushWriteBuf()
{
- if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
+ try
{
- const char* tb = this->sendq.c_str();
- int n_sent = write(this->fd,tb,this->sendq.length());
- if (n_sent == -1)
+ if ((this->fd == FD_MAGIC_NUMBER) || (*this->GetWriteError()))
{
- if (errno != EAGAIN)
- this->SetWriteError(strerror(errno));
+ sendq.clear();
}
- else
+ if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
{
- // advance the queue
- tb += n_sent;
- this->sendq = tb;
- // update the user's stats counters
- this->bytes_out += n_sent;
- this->cmds_out++;
+ int old_sendq_length = sendq.length();
+ int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0);
+
+ if (n_sent == -1)
+ {
+ if (errno == EAGAIN)
+ {
+ /* The socket buffer is full. This isnt fatal,
+ * try again later.
+ */
+ this->ServerInstance->SE->WantWrite(this);
+ }
+ else
+ {
+ /* Fatal error, set write error and bail
+ */
+ this->SetWriteError(errno ? strerror(errno) : "EOF from client");
+ return;
+ }
+ }
+ else
+ {
+ /* advance the queue */
+ if (n_sent)
+ this->sendq = this->sendq.substr(n_sent);
+ /* update the user's stats counters */
+ this->bytes_out += n_sent;
+ this->cmds_out++;
+ if (n_sent != old_sendq_length)
+ this->ServerInstance->SE->WantWrite(this);
+ }
}
}
+
+ catch (...)
+ {
+ ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::FlushWriteBuf()");
+ }
+
+ if (this->sendq.empty())
+ {
+ FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
+ }
}
-void userrec::SetWriteError(const std::string &error)
+void User::SetWriteError(const std::string &error)
{
- ServerInstance->Log(DEBUG,"SetWriteError: %s",error.c_str());
// don't try to set the error twice, its already set take the first string.
- if (!this->WriteError.length())
- {
- ServerInstance->Log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
+ if (this->WriteError.empty())
this->WriteError = error;
- }
}
-const char* userrec::GetWriteError()
+const char* User::GetWriteError()
{
return this->WriteError.c_str();
}
-void userrec::Oper(const std::string &opertype)
+void User::Oper(const std::string &opertype, const std::string &opername)
{
- this->modes[UM_OPERATOR] = 1;
- this->WriteServ("MODE %s :+o", this->nick);
- FOREACH_MOD(I_OnOper, OnOper(this, opertype));
- ServerInstance->Log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
- strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
- ServerInstance->all_opers.push_back(this);
- FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype));
-}
+ char* mycmd;
+ char* savept;
+ char* savept2;
-void userrec::UnOper()
-{
- if (*this->oper)
+ try
{
- *this->oper = 0;
- this->modes[UM_OPERATOR] = 0;
- for (std::vector<userrec*>::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++)
- {
- if (*a == this)
- {
- ServerInstance->Log(DEBUG,"Oper removed from optimization list");
- ServerInstance->all_opers.erase(a);
- return;
- }
- }
- }
-}
+ this->modes[UM_OPERATOR] = 1;
+ this->WriteServ("MODE %s :+o", this->nick);
+ FOREACH_MOD(I_OnOper, OnOper(this, opertype));
+ ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
+ strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
+ ServerInstance->Users->all_opers.push_back(this);
-void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quitreason)
-{
- user_hash::iterator iter = Instance->clientlist.find(user->nick);
-
-/*
- * I'm pretty sure returning here is causing a desync when part of the net thinks a user is gone,
- * and another part doesn't. We want to broadcast the quit/kill before bailing so the net stays in sync.
- *
- * I can't imagine this blowing up, so I'm commenting it out. We still check
- * before playing with a bad iterator below in our if(). DISCUSS THIS BEFORE YOU DO ANYTHING. --w00t
- *
- * if (iter == clientlist.end())
- * return;
- */
- std::string reason = quitreason;
+ opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper);
+ if (iter_opertype != ServerInstance->Config->opertypes.end())
+ {
- if (reason.length() > MAXQUIT - 1)
- reason.resize(MAXQUIT - 1);
-
- if (IS_LOCAL(user))
- user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason.c_str());
+ if (AllowedOperCommands)
+ AllowedOperCommands->clear();
+ else
+ AllowedOperCommands = new std::map<std::string, bool>;
- if (user->registered == REG_ALL)
- {
- user->PurgeEmptyChannels();
- FOREACH_MOD_I(Instance,I_OnUserQuit,OnUserQuit(user,reason));
- user->WriteCommonExcept("QUIT :%s",reason.c_str());
- }
+ if (!AllowedChanModes)
+ AllowedChanModes = new bool[64];
- if (IS_LOCAL(user))
- user->FlushWriteBuf();
+ if (!AllowedUserModes)
+ AllowedUserModes = new bool[64];
- FOREACH_MOD_I(Instance,I_OnUserDisconnect,OnUserDisconnect(user));
+ memset(AllowedUserModes, 0, 64);
+ memset(AllowedChanModes, 0, 64);
- if (IS_LOCAL(user))
- {
- if (Instance->Config->GetIOHook(user->GetPort()))
- {
- try
- {
- Instance->Config->GetIOHook(user->GetPort())->OnRawSocketClose(user->fd);
- }
- catch (ModuleException& modexcept)
+ char* Classes = strdup(iter_opertype->second);
+ char* myclass = strtok_r(Classes," ",&savept);
+ while (myclass)
{
- Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
+ operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
+ if (iter_operclass != ServerInstance->Config->operclass.end())
+ {
+ char* CommandList = strdup(iter_operclass->second.commandlist);
+ mycmd = strtok_r(CommandList," ",&savept2);
+ while (mycmd)
+ {
+ this->AllowedOperCommands->insert(std::make_pair(mycmd, true));
+ mycmd = strtok_r(NULL," ",&savept2);
+ }
+ free(CommandList);
+ this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
+ for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
+ {
+ if (*c == '*')
+ {
+ memset(this->AllowedUserModes, (int)(true), 64);
+ }
+ else
+ {
+ this->AllowedUserModes[*c - 'A'] = true;
+ }
+ }
+ for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+ {
+ if (*c == '*')
+ {
+ memset(this->AllowedChanModes, (int)(true), 64);
+ }
+ else
+ {
+ this->AllowedChanModes[*c - 'A'] = true;
+ }
+ }
+ }
+ myclass = strtok_r(NULL," ",&savept);
}
+ free(Classes);
}
-
- Instance->SE->DelFd(user);
- user->CloseSocket();
- }
- /*
- * this must come before the ServerInstance->WriteOpers so that it doesnt try to fill their buffer with anything
- * if they were an oper with +s.
- *
- * XXX -
- * In the current implementation, we only show local quits, as we only show local connects. With
- * the proposed implmentation of snomasks however, this will likely change in the (near?) future.
- */
- if (user->registered == REG_ALL)
- {
- if (IS_LOCAL(user))
- Instance->WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str());
- user->AddToWhoWas();
+ FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
}
- if (iter != Instance->clientlist.end())
+ catch (...)
{
- Instance->Log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
- if (IS_LOCAL(user))
- {
- if (find(Instance->local_users.begin(),Instance->local_users.end(),user) != Instance->local_users.end())
- Instance->local_users.erase(find(Instance->local_users.begin(),Instance->local_users.end(),user));
- }
- Instance->clientlist.erase(iter);
- DELETE(user);
+ ServerInstance->Logs->Log("OPER", DEBUG,"Exception in User::Oper()");
}
}
-namespace irc
+void User::UnOper()
{
- namespace whowas
+ if (IS_OPER(this))
{
+ /* Remove all oper only modes from the user when the deoper - Bug #466*/
+ std::string moderemove("-");
- WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
- {
- this->host = strdup(user->host);
- this->dhost = strdup(user->dhost);
- this->ident = strdup(user->ident);
- this->server = user->server;
- this->gecos = strdup(user->fullname);
- }
-
- WhoWasGroup::~WhoWasGroup()
+ for (unsigned char letter = 'A'; letter <= 'z'; letter++)
{
- if (host)
- free(host);
- if (dhost)
- free(dhost);
- if (ident)
- free(ident);
- if (gecos)
- free(gecos);
- }
-
- /* every hour, run this function which removes all entries over 3 days */
- void MaintainWhoWas(time_t t)
- {
- for (whowas_users::iterator iter = ::whowas.begin(); iter != ::whowas.end(); iter++)
+ if (letter != 'o')
{
- whowas_set* n = (whowas_set*)iter->second;
- if (n->size())
- {
- while ((n->begin() != n->end()) && ((*n->begin())->signon < t - 259200)) // 3 days
- {
- WhoWasGroup *a = *(n->begin());
- DELETE(a);
- n->erase(n->begin());
- }
- }
+ ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
+ if (mh && mh->NeedsOper())
+ moderemove += letter;
}
}
- };
-};
-/* adds or updates an entry in the whowas list */
-void userrec::AddToWhoWas()
-{
- irc::whowas::whowas_users::iterator iter = whowas.find(this->nick);
+ const char* parameters[] = { this->nick, moderemove.c_str() };
+ ServerInstance->Parser->CallHandler("MODE", parameters, 2, this);
- if (iter == whowas.end())
- {
- irc::whowas::whowas_set* n = new irc::whowas::whowas_set;
- irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this);
- n->push_back(a);
- whowas[this->nick] = n;
- }
- else
- {
- irc::whowas::whowas_set* group = (irc::whowas::whowas_set*)iter->second;
+ /* unset their oper type (what IS_OPER checks), and remove +o */
+ *this->oper = 0;
+ this->modes[UM_OPERATOR] = 0;
+
+ /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
+ ServerInstance->Users->all_opers.remove(this);
- if (group->size() > 10)
+ if (AllowedOperCommands)
+ {
+ delete AllowedOperCommands;
+ AllowedOperCommands = NULL;
+ }
+ if (AllowedUserModes)
+ {
+ delete[] AllowedUserModes;
+ AllowedUserModes = NULL;
+ }
+ if (AllowedChanModes)
{
- irc::whowas::WhoWasGroup *a = (irc::whowas::WhoWasGroup*)*(group->begin());
- DELETE(a);
- group->pop_front();
+ delete[] AllowedChanModes;
+ AllowedChanModes = NULL;
}
- irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this);
- group->push_back(a);
}
}
-/* add a client connection to the sockets list */
-void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, insp_inaddr ip)
+void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
{
- std::string tempnick = ConvToStr(socket) + "-unknown";
- user_hash::iterator iter = Instance->clientlist.find(tempnick);
- const char *ipaddr = insp_ntoa(ip);
- userrec* _new;
- int j = 0;
+ Instance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
+ user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
+ user->quietquit = false;
+ user->quitmsg = quitreason;
- /*
- * fix by brain.
- * as these nicknames are 'RFC impossible', we can be sure nobody is going to be
- * using one as a registered connection. As they are per fd, we can also safely assume
- * that we wont have collisions. Therefore, if the nick exists in the list, its only
- * used by a dead socket, erase the iterator so that the new client may reclaim it.
- * this was probably the cause of 'server ignores me when i hammer it with reconnects'
- * issue in earlier alphas/betas
- */
- if (iter != Instance->clientlist.end())
- {
- userrec* goner = iter->second;
- DELETE(goner);
- Instance->clientlist.erase(iter);
- }
+ if (!*operreason)
+ user->operquitmsg = quitreason;
+ else
+ user->operquitmsg = operreason;
- Instance->Log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
-
- _new = new userrec(Instance);
- Instance->clientlist[tempnick] = _new;
- _new->fd = socket;
- strlcpy(_new->nick,tempnick.c_str(),NICKMAX-1);
-
- _new->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
- /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
- strcpy(_new->ident, "unknown");
-
- _new->registered = REG_NONE;
- _new->signon = Instance->Time() + Instance->Config->dns_timeout;
- _new->lastping = 1;
-
- Instance->Log(DEBUG,"Setting socket addresses");
- _new->SetSockAddr(AF_FAMILY, ipaddr, port);
- Instance->Log(DEBUG,"Socket addresses set.");
-
- /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
- for (const char* temp = _new->GetIPString(); *temp && j < 64; temp++, j++)
- _new->dhost[j] = _new->host[j] = *temp;
- _new->dhost[j] = _new->host[j] = 0;
-
- // set the registration timeout for this user
- unsigned long class_regtimeout = 90;
- int class_flood = 0;
- long class_threshold = 5;
- long class_sqmax = 262144; // 256kb
- long class_rqmax = 4096; // 4k
+ Instance->GlobalCulls.AddItem(user);
+}
- for (ClassVector::iterator i = Instance->Config->Classes.begin(); i != Instance->Config->Classes.end(); i++)
+/* adds or updates an entry in the whowas list */
+void User::AddToWhoWas()
+{
+ Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+ if (whowas_command)
{
- if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str(),true)))
- {
- class_regtimeout = (unsigned long)i->registration_timeout;
- class_flood = i->flood;
- _new->pingmax = i->pingtime;
- class_threshold = i->threshold;
- class_sqmax = i->sendqmax;
- class_rqmax = i->recvqmax;
- break;
- }
+ std::deque<classbase*> params;
+ params.push_back(this);
+ whowas_command->HandleInternal(WHOWAS_ADD, params);
}
+}
- _new->nping = Instance->Time() + _new->pingmax + Instance->Config->dns_timeout;
- _new->timeout = Instance->Time() + class_regtimeout;
- _new->flood = class_flood;
- _new->threshold = class_threshold;
- _new->sendqmax = class_sqmax;
- _new->recvqmax = class_rqmax;
-
- Instance->local_users.push_back(_new);
+/*
+ * Check class restrictions
+ */
+void User::CheckClass()
+{
+ ConnectClass* a = this->MyClass;
- if (Instance->local_users.size() > Instance->Config->SoftLimit)
+ if ((!a) || (a->GetType() == CC_DENY))
{
- userrec::QuitUser(Instance, _new,"No more connections allowed");
+ User::QuitUser(ServerInstance, this, "Unauthorised connection");
return;
}
-
- if (Instance->local_users.size() >= MAXCLIENTS)
+ else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
{
- userrec::QuitUser(Instance, _new,"No more connections allowed");
+ User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
+ ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
return;
}
-
- /*
- * XXX -
- * this is done as a safety check to keep the file descriptors within range of fd_ref_table.
- * its a pretty big but for the moment valid assumption:
- * file descriptors are handed out starting at 0, and are recycled as theyre freed.
- * therefore if there is ever an fd over 65535, 65536 clients must be connected to the
- * irc server at once (or the irc server otherwise initiating this many connections, files etc)
- * which for the time being is a physical impossibility (even the largest networks dont have more
- * than about 10,000 users on ONE server!)
- */
- if ((unsigned)socket >= MAX_DESCRIPTORS)
+ else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
{
- userrec::QuitUser(Instance, _new,"Server is full");
+ User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
+ ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
return;
}
- char* e = Instance->XLines->matches_exception(ipaddr);
- if (!e)
- {
- char* r = Instance->XLines->matches_zline(ipaddr);
- if (r)
- {
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"Z-Lined: %s",r);
- userrec::QuitUser(Instance, _new,reason);
- return;
- }
- }
-
- if (socket > -1)
- {
- if (!Instance->SE->AddFd(_new))
- {
- userrec::QuitUser(Instance, _new, "Internal error handling connection");
- return;
- }
- }
-
- _new->WriteServ("NOTICE Auth :*** Looking up your hostname...");
-}
-
-long userrec::GlobalCloneCount()
-{
- char u1[1024];
- char u2[1024];
- long x = 0;
- for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
- {
- /* We have to match ip's as strings - we don't know what protocol
- * a remote user may be using
- */
- if (!strcasecmp(a->second->GetIPString(u1), this->GetIPString(u2)))
- x++;
- }
- return x;
-}
-long userrec::LocalCloneCount()
-{
- long x = 0;
- for (std::vector<userrec*>::const_iterator a = ServerInstance->local_users.begin(); a != ServerInstance->local_users.end(); a++)
- {
- userrec* comp = *a;
-#ifdef IPV6
- /* I dont think theres any faster way of matching two ipv6 addresses than memcmp */
- in6_addr* s1 = &(((sockaddr_in6*)comp->ip)->sin6_addr);
- in6_addr* s2 = &(((sockaddr_in6*)this->ip)->sin6_addr);
- if (!memcmp(s1->s6_addr, s2->s6_addr, sizeof(in6_addr)))
- x++;
-#else
- in_addr* s1 = &((sockaddr_in*)comp->ip)->sin_addr;
- in_addr* s2 = &((sockaddr_in*)this->ip)->sin_addr;
- if (s1->s_addr == s2->s_addr)
- x++;
-#endif
- }
- return x;
+ this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
+ this->timeout = ServerInstance->Time() + a->GetRegTimeout();
+ this->MaxChans = a->GetMaxChans();
}
-void userrec::FullConnect(CullList* Goners)
+void User::FullConnect()
{
ServerInstance->stats->statsConnects++;
this->idle_lastmsg = ServerInstance->Time();
- ConnectClass a = this->GetClass();
-
- if (a.type == CC_DENY)
- {
- Goners->AddItem(this,"Unauthorised connection");
- return;
- }
-
- if ((*(a.pass.c_str())) && (!this->haspassed))
- {
- Goners->AddItem(this,"Invalid password");
- return;
- }
+ /*
+ * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT.
+ * At the time AddClient is called, we don't have a resolved host, by here we probably do - which
+ * may put the user into a totally seperate class with different restrictions! so we *must* check again.
+ * Don't remove this! -- w00t
+ */
+ this->SetClass();
- if (this->LocalCloneCount() > a.maxlocal)
- {
- Goners->AddItem(this, "No more connections allowed from your host via this connect class (local)");
- ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a.maxlocal, this->GetIPString());
- return;
- }
- else if (this->GlobalCloneCount() > a.maxglobal)
+ /* Check the password, if one is required by the user's connect class.
+ * This CANNOT be in CheckClass(), because that is called prior to PASS as well!
+ */
+ if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed)
{
- Goners->AddItem(this, "No more connections allowed from your host via this connect class (global)");
- ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal, this->GetIPString());
+ User::QuitUser(ServerInstance, this, "Invalid password");
return;
}
- char match_against[MAXBUF];
- snprintf(match_against,MAXBUF,"%s@%s", this->ident, this->host);
- char* e = ServerInstance->XLines->matches_exception(match_against);
-
- if (!e)
+ if (!this->exempt)
{
- char* r = ServerInstance->XLines->matches_gline(match_against);
-
+ GLine *r = (GLine *)ServerInstance->XLines->MatchesLine("G", this);
+
if (r)
{
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"G-Lined: %s",r);
- Goners->AddItem(this, reason);
+ r->Apply(this);
return;
}
-
- r = ServerInstance->XLines->matches_kline(match_against);
-
- if (r)
+
+ KLine *n = (KLine *)ServerInstance->XLines->MatchesLine("K", this);
+
+ if (n)
{
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"K-Lined: %s",r);
- Goners->AddItem(this, reason);
+ n->Apply(this);
return;
}
}
-
this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
- this->WriteServ("001 %s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
- this->WriteServ("002 %s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
- this->WriteServ("003 %s :This server was created %s %s", this->nick, __TIME__, __DATE__);
- this->WriteServ("004 %s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
-
- // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
- // so i'd better split it :)
- std::stringstream out(ServerInstance->Config->data005);
- std::string token = "";
- std::string line5 = "";
- int token_counter = 0;
-
- while (!out.eof())
- {
- out >> token;
- line5 = line5 + token + " ";
- token_counter++;
-
- if ((token_counter >= 13) || (out.eof() == true))
- {
- this->WriteServ("005 %s %s:are supported by this server", this->nick, line5.c_str());
- line5 = "";
- token_counter = 0;
- }
- }
-
+ this->WriteNumeric(001, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
+ this->WriteNumeric(002, "%s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
+ this->WriteNumeric(003, "%s :This server was created %s %s", this->nick, __TIME__, __DATE__);
+ this->WriteNumeric(004, "%s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+
+ ServerInstance->Config->Send005(this);
+
+ this->WriteNumeric(42, "%s %s :your unique ID", this->nick, this->uuid);
+
+
this->ShowMOTD();
+ /* Now registered */
+ if (ServerInstance->Users->unregistered_count)
+ ServerInstance->Users->unregistered_count--;
+
+ /* Trigger LUSERS output, give modules a chance too */
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnPreCommand, OnPreCommand("LUSERS", NULL, 0, this, true, "LUSERS"));
+ if (!MOD_RESULT)
+ ServerInstance->CallCommandHandler("LUSERS", NULL, 0, this);
+
/*
- * fix 3 by brain, move registered = 7 below these so that spurious modes and host
- * changes dont go out onto the network and produce 'fake direction'.
+ * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
+ * for a user that doesn't exist yet.
*/
FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
- FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+
this->registered = REG_ALL;
- ServerInstance->WriteOpers("*** Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
+
+ FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+
+ ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString(), this->fullname);
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
+ ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
}
-/** userrec::UpdateNick()
+/** User::UpdateNick()
* re-allocates a nick in the user_hash after they change nicknames,
* returns a pointer to the new user as it may have moved
*/
-userrec* userrec::UpdateNickHash(const char* New)
+User* User::UpdateNickHash(const char* New)
{
//user_hash::iterator newnick;
- user_hash::iterator oldnick = ServerInstance->clientlist.find(this->nick);
+ user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick);
if (!strcasecmp(this->nick,New))
return oldnick->second;
- if (oldnick == ServerInstance->clientlist.end())
+ if (oldnick == ServerInstance->Users->clientlist->end())
return NULL; /* doesnt exist */
- userrec* olduser = oldnick->second;
- ServerInstance->clientlist[New] = olduser;
- ServerInstance->clientlist.erase(oldnick);
- return ServerInstance->clientlist[New];
+ User* olduser = oldnick->second;
+ (*(ServerInstance->Users->clientlist))[New] = olduser;
+ ServerInstance->Users->clientlist->erase(oldnick);
+ return olduser;
}
-bool userrec::ForceNickChange(const char* newnick)
+void User::InvalidateCache()
{
- char nick[MAXBUF];
- int MOD_RESULT = 0;
+ /* Invalidate cache */
+ if (cached_fullhost)
+ free(cached_fullhost);
+ if (cached_hostip)
+ free(cached_hostip);
+ if (cached_makehost)
+ free(cached_makehost);
+ if (cached_fullrealhost)
+ free(cached_fullrealhost);
+ cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+}
+
+bool User::ForceNickChange(const char* newnick)
+{
+ /*
+ * XXX this makes no sense..
+ * why do we do nothing for change on users not REG_ALL?
+ * why do we trigger events twice for everyone previously (and just them now)
+ * i think the first if () needs removing totally, or? -- w00t
+ */
+ if (this->registered != REG_ALL)
+ {
+ int MOD_RESULT = 0;
+
+ this->InvalidateCache();
+
+ FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
- *nick = 0;
+ if (MOD_RESULT)
+ {
+ ServerInstance->stats->statsCollisions++;
+ return false;
+ }
- FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
-
- if (MOD_RESULT)
- {
- ServerInstance->stats->statsCollisions++;
- return false;
+ if (ServerInstance->XLines->MatchesLine("Q",newnick))
+ {
+ ServerInstance->stats->statsCollisions++;
+ return false;
+ }
}
-
- if (ServerInstance->XLines->matches_qline(newnick))
+ else
{
- ServerInstance->stats->statsCollisions++;
- return false;
+ std::deque<classbase*> dummy;
+ Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+ if (nickhandler) // wtfbbq, when would this not be here
+ {
+ nickhandler->HandleInternal(1, dummy);
+ bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
+ nickhandler->HandleInternal(0, dummy);
+ return result;
+ }
}
- if (newnick)
- {
- strlcpy(this->nick, newnick, NICKMAX - 1);
- }
- if (this->registered == REG_ALL)
- {
- const char* pars[1];
- pars[0] = nick;
- std::string cmd = "NICK";
- ServerInstance->Parser->CallHandler(cmd, pars, 1, this);
- }
- return true;
+ // Unreachable.
+ return false;
}
-void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
+void User::SetSockAddr(int protocol_family, const char* sip, int port)
{
+ this->cachedip = "";
+
switch (protocol_family)
{
#ifdef SUPPORT_IP6LINKS
case AF_INET6:
{
- ServerInstance->Log(DEBUG,"Set inet6 protocol address");
sockaddr_in6* sin = new sockaddr_in6;
sin->sin6_family = AF_INET6;
sin->sin6_port = port;
- inet_pton(AF_INET6, ip, &sin->sin6_addr);
+ inet_pton(AF_INET6, sip, &sin->sin6_addr);
this->ip = (sockaddr*)sin;
}
break;
#endif
case AF_INET:
{
- ServerInstance->Log(DEBUG,"Set inet4 protocol address");
sockaddr_in* sin = new sockaddr_in;
sin->sin_family = AF_INET;
sin->sin_port = port;
- inet_pton(AF_INET, ip, &sin->sin_addr);
+ inet_pton(AF_INET, sip, &sin->sin_addr);
this->ip = (sockaddr*)sin;
}
break;
default:
- ServerInstance->Log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
+ ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
break;
}
}
-int userrec::GetPort()
+int User::GetPort()
{
if (this->ip == NULL)
return 0;
}
break;
default:
- ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
break;
}
return 0;
}
-int userrec::GetProtocolFamily()
+int User::GetProtocolFamily()
{
if (this->ip == NULL)
return 0;
return sin->sin_family;
}
-const char* userrec::GetIPString()
+/*
+ * XXX the duplication here is horrid..
+ * do we really need two methods doing essentially the same thing?
+ */
+const char* User::GetIPString()
{
static char buf[1024];
if (this->ip == NULL)
return "";
- switch (this->GetProtocolFamily())
- {
-#ifdef SUPPORT_IP6LINKS
- case AF_INET6:
- {
- static char temp[1024];
-
- sockaddr_in6* sin = (sockaddr_in6*)this->ip;
- inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
- /* IP addresses starting with a : on irc are a Bad Thing (tm) */
- if (*buf == ':')
- {
- strlcpy(&temp[1], buf, sizeof(temp));
- *temp = '0';
- return temp;
- }
- return buf;
- }
- break;
-#endif
- case AF_INET:
- {
- sockaddr_in* sin = (sockaddr_in*)this->ip;
- inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
- return buf;
- }
- break;
- default:
- ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
- break;
- }
- return "";
-}
-
-const char* userrec::GetIPString(char* buf)
-{
- if (this->ip == NULL)
- {
- *buf = 0;
- return buf;
- }
+ if (!this->cachedip.empty())
+ return this->cachedip.c_str();
switch (this->GetProtocolFamily())
{
case AF_INET6:
{
static char temp[1024];
-
+
sockaddr_in6* sin = (sockaddr_in6*)this->ip;
inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
/* IP addresses starting with a : on irc are a Bad Thing (tm) */
if (*buf == ':')
{
- strlcpy(&temp[1], buf, sizeof(temp));
+ strlcpy(&temp[1], buf, sizeof(temp) - 1);
*temp = '0';
- strlcpy(buf, temp, sizeof(temp));
+ this->cachedip = temp;
+ return temp;
}
+
+ this->cachedip = buf;
return buf;
}
break;
{
sockaddr_in* sin = (sockaddr_in*)this->ip;
inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
+ this->cachedip = buf;
return buf;
}
break;
-
default:
- ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
break;
}
+
+ // Unreachable, probably
return "";
}
* something we can change anyway. Makes sense to just let
* the compiler do that copy for us.
*/
-void userrec::Write(std::string text)
+void User::Write(std::string text)
{
- if ((this->fd < 0) || (this->fd > MAX_DESCRIPTORS))
+ if (!ServerInstance->SE->BoundsCheckFd(this))
return;
- text.append("\r\n");
+ try
+ {
+ ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
+ text.append("\r\n");
+ }
+ catch (...)
+ {
+ ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"Exception in User::Write() std::string::append");
+ return;
+ }
- if (ServerInstance->Config->GetIOHook(this->GetPort()))
+ if (this->io)
{
+ /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+ * implement their own buffering mechanisms
+ */
try
{
- ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length());
+ this->io->OnRawSocketWrite(this->fd, text.data(), text.length());
}
- catch (ModuleException& modexcept)
+ catch (CoreException& modexcept)
{
- ServerInstance->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
+ ServerInstance->Logs->Log("USEROUTPUT", DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
}
else
this->AddWriteBuf(text);
}
ServerInstance->stats->statsSent += text.length();
+ this->ServerInstance->SE->WantWrite(this);
}
/** Write()
*/
-void userrec::Write(const char *text, ...)
+void User::Write(const char *text, ...)
{
va_list argsPtr;
char textbuffer[MAXBUF];
this->Write(std::string(textbuffer));
}
-void userrec::WriteServ(const std::string& text)
+void User::WriteServ(const std::string& text)
{
char textbuffer[MAXBUF];
/** WriteServ()
* Same as Write(), except `text' is prefixed with `:server.name '.
*/
-void userrec::WriteServ(const char* text, ...)
+void User::WriteServ(const char* text, ...)
{
va_list argsPtr;
char textbuffer[MAXBUF];
}
-void userrec::WriteFrom(userrec *user, const std::string &text)
+void User::WriteNumeric(unsigned int numeric, const char* text, ...)
+{
+ va_list argsPtr;
+ char textbuffer[MAXBUF];
+
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ this->WriteNumeric(numeric, std::string(textbuffer));
+}
+
+void User::WriteNumeric(unsigned int numeric, const std::string &text)
+{
+ char textbuffer[MAXBUF];
+ int MOD_RESULT = 0;
+
+ FOREACH_RESULT(I_OnNumeric, OnNumeric(this, numeric, text));
+
+ if (MOD_RESULT)
+ return;
+
+ snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName, numeric, text.c_str());
+ this->Write(std::string(textbuffer));
+}
+
+void User::WriteFrom(User *user, const std::string &text)
{
char tb[MAXBUF];
snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
-
+
this->Write(std::string(tb));
}
/* write text from an originating user to originating user */
-void userrec::WriteFrom(userrec *user, const char* text, ...)
+void User::WriteFrom(User *user, const char* text, ...)
{
va_list argsPtr;
char textbuffer[MAXBUF];
/* write text to an destination user from a source user (e.g. user privmsg) */
-void userrec::WriteTo(userrec *dest, const char *data, ...)
+void User::WriteTo(User *dest, const char *data, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteTo(dest, std::string(textbuffer));
}
-void userrec::WriteTo(userrec *dest, const std::string &data)
+void User::WriteTo(User *dest, const std::string &data)
{
dest->WriteFrom(this, data);
}
-void userrec::WriteCommon(const char* text, ...)
+void User::WriteCommon(const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteCommon(std::string(textbuffer));
}
-void userrec::WriteCommon(const std::string &text)
+void User::WriteCommon(const std::string &text)
{
bool sent_to_at_least_one = false;
+ char tb[MAXBUF];
if (this->registered != REG_ALL)
return;
uniq_id++;
- for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
+ /* We dont want to be doing this n times, just once */
+ snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
+ std::string out = tb;
+
+ for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
{
- ucrec *n = *v;
- if (n->channel)
+ CUList* ulist = v->first->GetUsers();
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- CUList *ulist= n->channel->GetUsers();
-
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
{
- if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
- {
- already_sent[i->second->fd] = uniq_id;
- i->second->WriteFrom(this, std::string(text));
- sent_to_at_least_one = true;
- }
+ already_sent[i->first->fd] = uniq_id;
+ i->first->Write(out);
+ sent_to_at_least_one = true;
}
}
}
*/
if (!sent_to_at_least_one)
{
- this->WriteFrom(this,std::string(text));
+ this->Write(std::string(tb));
}
}
* channel, NOT including the source user e.g. for use in QUIT
*/
-void userrec::WriteCommonExcept(const char* text, ...)
+void User::WriteCommonExcept(const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteCommonExcept(std::string(textbuffer));
}
-void userrec::WriteCommonExcept(const std::string &text)
+void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
{
- bool quit_munge = true;
- char oper_quit[MAXBUF];
- char textbuffer[MAXBUF];
-
- strlcpy(textbuffer, text.c_str(), MAXBUF);
+ char tb1[MAXBUF];
+ char tb2[MAXBUF];
if (this->registered != REG_ALL)
return;
uniq_id++;
+ snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost(),normal_text.c_str());
+ snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost(),oper_text.c_str());
+ std::string out1 = tb1;
+ std::string out2 = tb2;
- /* TODO: We need some form of WriteCommonExcept that will send two lines, one line to
- * opers and the other line to non-opers, then all this hidebans and hidesplits gunk
- * can go byebye.
- */
- if (ServerInstance->Config->HideSplits)
+ for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
{
- char* check = textbuffer + 6;
-
- if (!strncasecmp(textbuffer, "QUIT :",6))
+ CUList *ulist = v->first->GetUsers();
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- std::stringstream split(check);
- std::string server_one;
- std::string server_two;
-
- split >> server_one;
- split >> server_two;
-
- if ((ServerInstance->FindServerName(server_one)) && (ServerInstance->FindServerName(server_two)))
+ if (this != i->first)
{
- strlcpy(oper_quit,textbuffer,MAXQUIT);
- strlcpy(check,"*.net *.split",MAXQUIT);
- quit_munge = true;
+ if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
+ {
+ already_sent[i->first->fd] = uniq_id;
+ i->first->Write(IS_OPER(i->first) ? out2 : out1);
+ }
}
}
}
+}
- if ((ServerInstance->Config->HideBans) && (!quit_munge))
- {
- if ((!strncasecmp(textbuffer, "QUIT :G-Lined:",14)) || (!strncasecmp(textbuffer, "QUIT :K-Lined:",14))
- || (!strncasecmp(textbuffer, "QUIT :Q-Lined:",14)) || (!strncasecmp(textbuffer, "QUIT :Z-Lined:",14)))
- {
- char* check = textbuffer + 13;
- strlcpy(oper_quit,textbuffer,MAXQUIT);
- *check = 0; // We don't need to strlcpy, we just chop it from the :
- quit_munge = true;
- }
- }
+void User::WriteCommonExcept(const std::string &text)
+{
+ char tb1[MAXBUF];
+ std::string out1;
+
+ if (this->registered != REG_ALL)
+ return;
+
+ uniq_id++;
+ snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
+ out1 = tb1;
- for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
+ for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
{
- ucrec* n = *v;
- if (n->channel)
+ CUList *ulist = v->first->GetUsers();
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- CUList *ulist= n->channel->GetUsers();
-
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ if (this != i->first)
{
- if (this != i->second)
+ if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
{
- if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
- {
- already_sent[i->second->fd] = uniq_id;
- if (quit_munge)
- i->second->WriteFrom(this, *i->second->oper ? std::string(oper_quit) : std::string(textbuffer));
- else
- i->second->WriteFrom(this, std::string(textbuffer));
- }
+ already_sent[i->first->fd] = uniq_id;
+ i->first->Write(out1);
}
}
}
}
-void userrec::WriteWallOps(const std::string &text)
+void User::WriteWallOps(const std::string &text)
{
- /* Does nothing if theyre not opered */
- if ((!*this->oper) && (IS_LOCAL(this)))
+ if (!IS_OPER(this) && IS_LOCAL(this))
return;
- std::string wallop = "WALLOPS :";
+ std::string wallop("WALLOPS :");
wallop.append(text);
- for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
{
- userrec* t = *i;
- if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS]))
+ User* t = *i;
+ if (t->IsModeSet('w'))
this->WriteTo(t,wallop);
}
}
-void userrec::WriteWallOps(const char* text, ...)
-{
+void User::WriteWallOps(const char* text, ...)
+{
char textbuffer[MAXBUF];
va_list argsPtr;
va_start(argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
+ va_end(argsPtr);
+
this->WriteWallOps(std::string(textbuffer));
-}
+}
/* return 0 or 1 depending if users u and u2 share one or more common channels
* (used by QUIT, NICK etc which arent channel specific notices)
* the first users channels then the second users channels within the outer loop,
* therefore it was a maximum of x*y iterations (upon returning 0 and checking
* all possible iterations). However this new function instead checks against the
- * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
+ * channel's userlist in the inner loop which is a std::map<User*,User*>
* and saves us time as we already know what pointer value we are after.
* Don't quote me on the maths as i am not a mathematician or computer scientist,
* but i believe this algorithm is now x+(log y) maximum iterations instead.
*/
-bool userrec::SharesChannelWith(userrec *other)
+bool User::SharesChannelWith(User *other)
{
if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL))
return false;
/* Outer loop */
- for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+ for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
{
- /* Fetch the channel from the user */
- ucrec* user_channel = *i;
-
- if (user_channel->channel)
- {
- /* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
- * by replacing it with a map::find which *should* be more efficient
- */
- if (user_channel->channel->HasUser(other))
- return true;
- }
+ /* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
+ * by replacing it with a map::find which *should* be more efficient
+ */
+ if (i->first->HasUser(other))
+ return true;
}
return false;
}
-int userrec::CountChannels()
+bool User::ChangeName(const char* gecos)
{
- int z = 0;
- for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
- if ((*i)->channel)
- z++;
- return z;
-}
+ if (!strcmp(gecos, this->fullname))
+ return true;
-bool userrec::ChangeName(const char* gecos)
-{
if (IS_LOCAL(this))
{
int MOD_RESULT = 0;
FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
}
strlcpy(this->fullname,gecos,MAXGECOS+1);
+
return true;
}
-bool userrec::ChangeDisplayedHost(const char* host)
+bool User::ChangeDisplayedHost(const char* shost)
{
+ if (!strcmp(shost, this->dhost))
+ return true;
+
if (IS_LOCAL(this))
{
int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,host));
+ FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost));
if (MOD_RESULT)
return false;
- FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,host));
+ FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost));
+ }
+
+ if (this->ServerInstance->Config->CycleHosts)
+ this->WriteCommonExcept("QUIT :Changing hosts");
+
+ /* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
+ strlcpy(this->dhost,shost,64);
+
+ this->InvalidateCache();
+
+ if (this->ServerInstance->Config->CycleHosts)
+ {
+ for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
+ {
+ i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
+ std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
+ if (n.length() > 0)
+ i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name, n.c_str());
+ }
}
- strlcpy(this->dhost,host,63);
if (IS_LOCAL(this))
- this->WriteServ("396 %s %s :is now your hidden host",this->nick,this->dhost);
+ this->WriteNumeric(396, "%s %s :is now your displayed host",this->nick,this->dhost);
+
+ return true;
+}
+
+bool User::ChangeIdent(const char* newident)
+{
+ if (!strcmp(newident, this->ident))
+ return true;
+
+ if (this->ServerInstance->Config->CycleHosts)
+ this->WriteCommonExcept("%s","QUIT :Changing ident");
+
+ strlcpy(this->ident, newident, IDENTMAX+1);
+
+ this->InvalidateCache();
+
+ if (this->ServerInstance->Config->CycleHosts)
+ {
+ for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
+ {
+ i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
+ std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
+ if (n.length() > 0)
+ i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name, n.c_str());
+ }
+ }
return true;
}
-void userrec::NoticeAll(char* text, ...)
+void User::SendAll(const char* command, const char* text, ...)
{
char textbuffer[MAXBUF];
char formatbuffer[MAXBUF];
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
+ snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer);
+ std::string fmt = formatbuffer;
- for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
{
- userrec* t = *i;
- t->WriteFrom(this, std::string(formatbuffer));
+ (*i)->Write(fmt);
}
}
-std::string userrec::ChannelList(userrec* source)
+std::string User::ChannelList(User* source)
{
std::string list;
- for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
- {
- ucrec* rec = *i;
- if(rec->channel && rec->channel->name)
+ for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
+ {
+ /* If the target is the same as the sender, let them see all their channels.
+ * If the channel is NOT private/secret OR the user shares a common channel
+ * If the user is an oper, and the <options:operspywhois> option is set.
+ */
+ if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source))))
{
- /* If the target is the same as the sender, let them see all their channels.
- * If the channel is NOT private/secret OR the user shares a common channel
- * If the user is an oper, and the <options:operspywhois> option is set.
- */
- if ((source == this) || (*source->oper && ServerInstance->Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
- {
- list.append(rec->channel->GetPrefixChar(this)).append(rec->channel->name).append(" ");
- }
+ list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" ");
}
}
+
return list;
}
-void userrec::SplitChanList(userrec* dest, const std::string &cl)
+void User::SplitChanList(User* dest, const std::string &cl)
{
std::string line;
std::ostringstream prefix;
std::string::size_type start, pos, length;
- prefix << ":" << ServerInstance->Config->ServerName << " 319 " << this->nick << " " << dest->nick << " :";
+ prefix << this->nick << " " << dest->nick << " :";
line = prefix.str();
+ int namelen = strlen(ServerInstance->Config->ServerName) + 6;
for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
{
length = (pos == std::string::npos) ? cl.length() : pos;
- if (line.length() + length - start > 510)
+ if (line.length() + namelen + length - start > 510)
{
- this->Write(line);
+ ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
line = prefix.str();
}
if (line.length())
{
- this->Write(line);
+ ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
}
}
+unsigned int User::GetMaxChans()
+{
+ return this->MaxChans;
+}
-/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+
+/*
+ * Sets a user's connection class.
+ * If the class name is provided, it will be used. Otherwise, the class will be guessed using host/ip/ident/etc.
* NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
* then their ip will be taken as 'priority' anyway, so for example,
* <connect allow="127.0.0.1"> will match joe!bloggs@localhost
*/
-ConnectClass& userrec::GetClass()
+ConnectClass* User::SetClass(const std::string &explicit_name)
{
- for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+ ConnectClass *found = NULL;
+
+ if (!IS_LOCAL(this))
+ return NULL;
+
+ if (!explicit_name.empty())
+ {
+ for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+ {
+ ConnectClass* c = *i;
+
+ if (explicit_name == c->GetName() && !c->GetDisabled())
+ {
+ found = c;
+ }
+ }
+ }
+ else
+ {
+ for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+ {
+ ConnectClass* c = *i;
+
+ if (((match(this->GetIPString(),c->GetHost().c_str(),true)) || (match(this->host,c->GetHost().c_str()))))
+ {
+ if (c->GetPort())
+ {
+ if (this->GetPort() == c->GetPort() && !c->GetDisabled())
+ {
+ found = c;
+ }
+ else
+ continue;
+ }
+ else
+ {
+ if (!c->GetDisabled())
+ found = c;
+ }
+ }
+ }
+ }
+
+ /* ensure we don't fuck things up refcount wise, only remove them from a class if we find a new one :P */
+ if (found)
{
- if ((match(this->GetIPString(),i->host.c_str(),true)) || (match(this->host,i->host.c_str())))
- return *i;
+ /* deny change if change will take class over the limit */
+ if (found->limit && (found->RefCount + 1 >= found->limit))
+ {
+ ServerInstance->Logs->Log("USERS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", found->limit);
+ return this->MyClass;
+ }
+
+ /* should always be valid, but just in case .. */
+ if (this->MyClass)
+ {
+ if (found == this->MyClass) // no point changing this shit :P
+ return this->MyClass;
+ this->MyClass->RefCount--;
+ ServerInstance->Logs->Log("USERS", DEBUG, "Untying user from connect class -- refcount: %lu", this->MyClass->RefCount);
+ }
+
+ this->MyClass = found;
+ this->MyClass->RefCount++;
+ ServerInstance->Logs->Log("USERS", DEBUG, "User tied to new class -- connect refcount now: %lu", this->MyClass->RefCount);
}
- return *(ServerInstance->Config->Classes.begin());
+ return this->MyClass;
+}
+
+/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+ * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
+ * then their ip will be taken as 'priority' anyway, so for example,
+ * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
+ */
+ConnectClass* User::GetClass()
+{
+ return this->MyClass;
}
-void userrec::PurgeEmptyChannels()
+void User::PurgeEmptyChannels()
{
- std::vector<chanrec*> to_delete;
+ std::vector<Channel*> to_delete;
// firstly decrement the count on each channel
- for (std::vector<ucrec*>::iterator f = this->chans.begin(); f != this->chans.end(); f++)
+ for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
{
- ucrec* uc = *f;
- if (uc->channel)
+ f->first->RemoveAllPrefixes(this);
+ if (f->first->DelUser(this) == 0)
{
- uc->channel->RemoveAllPrefixes(this);
- if (uc->channel->DelUser(this) == 0)
+ /* No users left in here, mark it for deletion */
+ try
+ {
+ to_delete.push_back(f->first);
+ }
+ catch (...)
{
- /* No users left in here, mark it for deletion */
- to_delete.push_back(uc->channel);
- uc->channel = NULL;
+ ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()");
}
}
}
- for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
+ for (std::vector<Channel*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
{
- chanrec* thischan = *n;
- chan_hash::iterator i2 = ServerInstance->chanlist.find(thischan->name);
- if (i2 != ServerInstance->chanlist.end())
+ Channel* thischan = *n;
+ chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
+ if (i2 != ServerInstance->chanlist->end())
{
FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
- DELETE(i2->second);
- ServerInstance->chanlist.erase(i2);
+ delete i2->second;
+ ServerInstance->chanlist->erase(i2);
+ this->chans.erase(*n);
}
}
this->UnOper();
}
-void userrec::ShowMOTD()
+void User::ShowMOTD()
{
if (!ServerInstance->Config->MOTD.size())
{
- this->WriteServ("422 %s :Message of the day file is missing.",this->nick);
+ this->WriteNumeric(422, "%s :Message of the day file is missing.",this->nick);
return;
}
- this->WriteServ("375 %s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
+ this->WriteNumeric(375, "%s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
- for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
- this->WriteServ("372 %s :- %s",this->nick,ServerInstance->Config->MOTD[i].c_str());
+ for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
+ this->WriteNumeric(372, "%s :- %s",this->nick,i->c_str());
- this->WriteServ("376 %s :End of message of the day.", this->nick);
+ this->WriteNumeric(376, "%s :End of message of the day.", this->nick);
}
-void userrec::ShowRULES()
+void User::ShowRULES()
{
if (!ServerInstance->Config->RULES.size())
{
- this->WriteServ("NOTICE %s :Rules file is missing.",this->nick);
+ this->WriteNumeric(434, "%s :RULES File is missing",this->nick);
return;
}
- this->WriteServ("NOTICE %s :%s rules",this->nick,ServerInstance->Config->ServerName);
- for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
- this->WriteServ("NOTICE %s :%s",this->nick,ServerInstance->Config->RULES[i].c_str());
+ this->WriteNumeric(308, "%s :- %s Server Rules -",this->nick,ServerInstance->Config->ServerName);
+
+ for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
+ this->WriteNumeric(232, "%s :- %s",this->nick,i->c_str());
- this->WriteServ("NOTICE %s :End of %s rules.",this->nick,ServerInstance->Config->ServerName);
+ this->WriteNumeric(309, "%s :End of RULES command.",this->nick);
}
-void userrec::HandleEvent(EventType et)
+void User::HandleEvent(EventType et, int errornum)
{
+ if (this->quitting) // drop everything, user is due to be quit
+ return;
+
/* WARNING: May delete this user! */
- ServerInstance->ProcessUser(this);
+ int thisfd = this->GetFd();
+
+ try
+ {
+ switch (et)
+ {
+ case EVENT_READ:
+ ServerInstance->ProcessUser(this);
+ break;
+ case EVENT_WRITE:
+ this->FlushWriteBuf();
+ break;
+ case EVENT_ERROR:
+ /** This should be safe, but dont DARE do anything after it -- Brain */
+ this->SetWriteError(errornum ? strerror(errornum) : "EOF from client");
+ break;
+ }
+ }
+ catch (...)
+ {
+ ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::HandleEvent intercepted");
+ }
+
+ /* If the user has raised an error whilst being processed, quit them now we're safe to */
+ if ((ServerInstance->SE->GetRef(thisfd) == this))
+ {
+ if (!WriteError.empty())
+ {
+ User::QuitUser(ServerInstance, this, GetWriteError());
+ }
+ }
+}
+
+void User::SetOperQuit(const std::string &oquit)
+{
+ operquitmsg = oquit;
+}
+
+const char* User::GetOperQuit()
+{
+ return operquitmsg.c_str();
+}
+
+void User::IncreasePenalty(int increase)
+{
+ this->Penalty += increase;
+}
+
+void User::DecreasePenalty(int decrease)
+{
+ this->Penalty -= decrease;
+}
+
+VisData::VisData()
+{
+}
+
+VisData::~VisData()
+{
+}
+
+bool VisData::VisibleTo(User* user)
+{
+ return true;
}