X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=f8a1bd330a77b9a3941e0325bf7e9718c259d3fc;hb=58385dd458e927994957b6d603f7f9da3fc52e14;hp=97e2291be906a4a220e47ab72d20fd8f94573e8a;hpb=156c232d1d22568d20ec498c4bd344bf03052e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 97e2291be..f8a1bd330 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,14 +11,14 @@ * --------------------------------------------------- */ +/* $Core: libIRCDusers */ + #include "inspircd.h" -#include "configreader.h" -#include "channels.h" -#include "users.h" #include #include "socketengine.h" #include "wildcard.h" #include "xline.h" +#include "bancache.h" #include "commands/cmd_whowas.h" static unsigned long already_sent[MAX_DESCRIPTORS] = {0}; @@ -26,60 +26,7 @@ static unsigned long already_sent[MAX_DESCRIPTORS] = {0}; /* XXX: Used for speeding up WriteCommon operations */ unsigned long uniq_id = 0; -bool InitTypes(ServerConfig* conf, const char* tag) -{ - if (conf->opertypes.size()) - { - for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++) - { - if (n->second) - delete[] n->second; - } - } - - conf->opertypes.clear(); - return true; -} - -bool InitClasses(ServerConfig* conf, const char* tag) -{ - if (conf->operclass.size()) - { - for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++) - { - if (n->second) - delete[] n->second; - } - } - - conf->operclass.clear(); - return true; -} - -bool DoType(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* TypeName = values[0].GetString(); - const char* Classes = values[1].GetString(); - - conf->opertypes[TypeName] = strnewdup(Classes); - return true; -} - -bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* ClassName = values[0].GetString(); - const char* CommandList = values[1].GetString(); - - conf->operclass[ClassName] = strnewdup(CommandList); - return true; -} - -bool DoneClassesAndTypes(ServerConfig* conf, const char* tag) -{ - return true; -} - -std::string userrec::ProcessNoticeMasks(const char *sm) +std::string User::ProcessNoticeMasks(const char *sm) { bool adding = true, oldadding = false; const char *c = sm; @@ -126,6 +73,9 @@ std::string userrec::ProcessNoticeMasks(const char *sm) output += *c; } } + else + this->WriteNumeric(501, "%s %c :is unknown snomask char to me", this->nick, *c); + oldadding = adding; break; } @@ -136,137 +86,38 @@ std::string userrec::ProcessNoticeMasks(const char *sm) return output; } -void userrec::StartDNSLookup() +void User::StartDNSLookup() { try { bool cached; - const char* ip = this->GetIPString(); + const char* sip = this->GetIPString(); /* Special case for 4in6 (Have i mentioned i HATE 4in6?) */ - if (!strncmp(ip, "0::ffff:", 8)) - res_reverse = new UserResolver(this->ServerInstance, this, ip + 8, DNS_QUERY_PTR4, cached); + if (!strncmp(sip, "0::ffff:", 8)) + res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached); else - res_reverse = new UserResolver(this->ServerInstance, this, ip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached); + res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached); this->ServerInstance->AddResolver(res_reverse, cached); } catch (CoreException& e) { - ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason()); - } -} - -UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt, bool &cache) : - Resolver(Instance, to_resolve, qt, cache), bound_user(user) -{ - this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA); - this->bound_fd = user->GetFd(); -} - -void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) -{ - if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)) - { - this->bound_user->stored_host = result; - try - { - /* Check we didnt time out */ - if (this->bound_user->registered != REG_ALL) - { - bool cached; -#ifdef IPV6 - if (this->bound_user->GetProtocolFamily() == AF_INET6) - { - /* IPV6 forward lookup (with possibility of 4in6) */ - const char* ip = this->bound_user->GetIPString(); - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), cached); - } - else - /* IPV4 lookup (mixed protocol mode) */ -#endif - /* IPV4 lookup (ipv4 only mode) */ - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, cached); - this->ServerInstance->AddResolver(bound_user->res_forward, cached); - } - } - catch (CoreException& 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 */ - std::string result2("0::ffff:"); - result2.append(result); - if (this->bound_user->GetIPString() == result || this->bound_user->GetIPString() == result2) - { - std::string hostname = this->bound_user->stored_host; - if (hostname.length() < 65) - { - /* Check we didnt time out */ - if ((this->bound_user->registered != REG_ALL) && (!this->bound_user->dns_done)) - { - /* Hostnames starting with : are not a good thing (tm) */ - if (*(hostname.c_str()) == ':') - hostname.insert(0, "0"); - - this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : "")); - this->bound_user->dns_done = true; - strlcpy(this->bound_user->dhost, hostname.c_str(),64); - strlcpy(this->bound_user->host, hostname.c_str(),64); - /* Invalidate cache */ - this->bound_user->InvalidateCache(); - } - } - else - { - if (!this->bound_user->dns_done) - { - 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()); - this->bound_user->dns_done = true; - } - } - } - else - { - if (!this->bound_user->dns_done) - { - 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()); - this->bound_user->dns_done = true; - } - } - } -} - -void UserResolver::OnError(ResolverError e, const std::string &errormessage) -{ - if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user) - { - /* Since dns timeout is implemented outside of the resolver, this was a race condition that could result in this message being sent *after* - * the user was fully connected. This check fixes that issue - Special */ - if (!this->bound_user->dns_done) - { - /* Error message here */ - this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), 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; @@ -283,17 +134,17 @@ const char* userrec::FormatNoticeMasks() -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; @@ -306,29 +157,34 @@ const char* userrec::FormatModes() return data; } -void userrec::DecrementModes() +void User::DecrementModes() { - for (int n = 0; n < 64; n++) + ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()"); + for (unsigned char n = 'A'; n <= 'z'; n++) { - if (modes[n]) + if (modes[n-65]) { - ModeHandler* mh = ServerInstance->Modes->FindMode(n+65, MODETYPE_USER); + 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); + } } } } -userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance) +User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance) { - // 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(true); + age = ServerInstance->Time(); + Penalty = 0; lines_in = lastping = signon = idle_lastmsg = nping = registered = 0; - ChannelCount = timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0; - muted = exempt = 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.clear(); sendq.clear(); @@ -336,46 +192,64 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance) res_forward = res_reverse = NULL; Visibility = NULL; ip = NULL; + MyClass = NULL; + io = NULL; + AllowedUserModes = NULL; + AllowedChanModes = NULL; + AllowedOperCommands = NULL; chans.clear(); invites.clear(); memset(modes,0,sizeof(modes)); memset(snomasks,0,sizeof(snomasks)); /* Invalidate cache */ - operquit = cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL; + 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"); } -void userrec::RemoveCloneCounts() +User::~User() { - clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString()); - if (x != ServerInstance->local_clones.end()) + /* NULL for remote users :) */ + if (this->MyClass) { - x->second--; - if (!x->second) - { - ServerInstance->local_clones.erase(x); - } + this->MyClass->RefCount--; + ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount); } - - clonemap::iterator y = ServerInstance->global_clones.find(this->GetIPString()); - if (y != ServerInstance->global_clones.end()) + if (this->AllowedOperCommands) { - y->second--; - if (!y->second) - { - ServerInstance->global_clones.erase(y); - } + delete AllowedOperCommands; + AllowedOperCommands = NULL; + } + + if (this->AllowedUserModes) + { + delete[] AllowedUserModes; + AllowedUserModes = NULL; + } + + if (this->AllowedChanModes) + { + delete[] AllowedChanModes; + AllowedChanModes = NULL; } -} -userrec::~userrec() -{ this->InvalidateCache(); this->DecrementModes(); - if (operquit) - free(operquit); + if (ip) { - this->RemoveCloneCounts(); + ServerInstance->Users->RemoveCloneCounts(this); if (this->GetProtocolFamily() == AF_INET) { @@ -388,9 +262,11 @@ userrec::~userrec() } #endif } + + ServerInstance->Users->uuidlist->erase(uuid); } -char* userrec::MakeHost() +char* User::MakeHost() { if (this->cached_makehost) return this->cached_makehost; @@ -410,7 +286,7 @@ char* userrec::MakeHost() return this->cached_makehost; } -char* userrec::MakeHostIP() +char* User::MakeHostIP() { if (this->cached_hostip) return this->cached_hostip; @@ -430,13 +306,13 @@ char* userrec::MakeHostIP() 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() { if (this->cached_fullhost) return this->cached_fullhost; @@ -458,7 +334,7 @@ char* userrec::GetFullHost() return this->cached_fullhost; } -char* userrec::MakeWildHost() +char* User::MakeWildHost() { static char nresult[MAXBUF]; char* t = nresult; @@ -470,7 +346,7 @@ char* userrec::MakeWildHost() return nresult; } -int userrec::ReadData(void* buffer, size_t size) +int User::ReadData(void* buffer, size_t size) { if (IS_LOCAL(this)) { @@ -485,7 +361,7 @@ int userrec::ReadData(void* buffer, size_t size) } -char* userrec::GetFullRealHost() +char* User::GetFullRealHost() { if (this->cached_fullrealhost) return this->cached_fullrealhost; @@ -507,33 +383,68 @@ char* userrec::GetFullRealHost() return this->cached_fullrealhost; } -bool userrec::IsInvited(const 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) { - if (channel == *i) + 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(const irc::string &channel) +void User::InviteTo(const irc::string &channel, time_t invtimeout) { - invites.push_back(channel); + 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(const irc::string &channel) +void User::RemoveInvite(const irc::string &channel) { for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++) { - if (channel == *i) + if (channel == i->first) { invites.erase(i); return; @@ -541,12 +452,23 @@ void userrec::RemoveInvite(const irc::string &channel) } } -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. @@ -558,37 +480,19 @@ bool userrec::HasPermission(const std::string &command) return true; // are they even an oper at all? - if (IS_OPER(this)) + if (!IS_OPER(this)) { - opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper); - if (iter_opertype != ServerInstance->Config->opertypes.end()) - { - char* Classes = strdup(iter_opertype->second); - char* myclass = strtok_r(Classes," ",&savept); - while (myclass) - { - operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass); - if (iter_operclass != ServerInstance->Config->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; } @@ -598,7 +502,7 @@ bool userrec::HasPermission(const std::string &command) * 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) { try { @@ -613,10 +517,10 @@ bool userrec::AddBuffer(std::string 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->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax); + ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %d exceeds connect class maximum of %lu",this->nick,recvq.length(),this->MyClass->GetRecvqMax()); return false; } @@ -625,26 +529,26 @@ bool userrec::AddBuffer(std::string a) catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::AddBuffer()"); + ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::AddBuffer()"); return false; } } -bool userrec::BufferIsReady() +bool User::BufferIsReady() { return (recvq.find('\n') != std::string::npos); } -void userrec::ClearBuffer() +void User::ClearBuffer() { recvq.clear(); } -std::string userrec::GetBuffer() +std::string User::GetBuffer() { try { - if (!recvq.length()) + if (recvq.empty()) return ""; /* Strip any leading \r or \n off the string. @@ -675,44 +579,36 @@ std::string userrec::GetBuffer() catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::GetBuffer()"); + ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::GetBuffer()"); 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; } - try - { - 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); - } - catch (...) - { - this->SetWriteError("SendQ exceeded"); - ServerInstance->WriteOpers("*** User %s SendQ got an exception",this->nick); - } + 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() { try { @@ -723,11 +619,8 @@ void userrec::FlushWriteBuf() if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER)) { int old_sendq_length = sendq.length(); -#ifndef WIN32 - int n_sent = write(this->fd, this->sendq.data(), this->sendq.length()); -#else - int n_sent = send(this->fd, (const char*)this->sendq.data(), this->sendq.length(), 0); -#endif + int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0); + if (n_sent == -1) { if (errno == EAGAIN) @@ -761,7 +654,7 @@ void userrec::FlushWriteBuf() catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::FlushWriteBuf()"); + ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::FlushWriteBuf()"); } if (this->sendq.empty()) @@ -770,335 +663,264 @@ void userrec::FlushWriteBuf() } } -void userrec::SetWriteError(const std::string &error) +void User::SetWriteError(const std::string &error) { - try - { - // don't try to set the error twice, its already set take the first string. - if (this->WriteError.empty()) - this->WriteError = error; - } - - catch (...) - { - ServerInstance->Log(DEBUG,"Exception in userrec::SetWriteError()"); - } + // don't try to set the error twice, its already set take the first string. + 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) { + char* mycmd; + char* savept; + char* savept2; + try { 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()); + 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->all_opers.push_back(this); - FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype)); - } + ServerInstance->Users->all_opers.push_back(this); - catch (...) - { - ServerInstance->Log(DEBUG,"Exception in userrec::Oper()"); - } -} - -void userrec::UnOper() -{ - try - { - if (IS_OPER(this)) + opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper); + if (iter_opertype != ServerInstance->Config->opertypes.end()) { - // unset their oper type (what IS_OPER checks), and remove +o - *this->oper = 0; - this->modes[UM_OPERATOR] = 0; - // remove them from the opers list. - for (std::vector::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++) + if (AllowedOperCommands) + AllowedOperCommands->clear(); + else + AllowedOperCommands = new std::map; + + if (!AllowedChanModes) + AllowedChanModes = new bool[64]; + + if (!AllowedUserModes) + AllowedUserModes = new bool[64]; + + memset(AllowedUserModes, 0, 64); + memset(AllowedChanModes, 0, 64); + + char* Classes = strdup(iter_opertype->second); + char* myclass = strtok_r(Classes," ",&savept); + while (myclass) { - if (*a == this) + operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass); + if (iter_operclass != ServerInstance->Config->operclass.end()) { - ServerInstance->all_opers.erase(a); - return; + 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); } - } - catch (...) - { - ServerInstance->Log(DEBUG,"Exception in userrec::UnOper()"); + FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername)); } -} -void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &quitreason, const char* operreason) -{ - user->muted = true; - Instance->GlobalCulls.AddItem(user, quitreason.c_str(), operreason); -} - -/* adds or updates an entry in the whowas list */ -void userrec::AddToWhoWas() -{ - command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); - if (whowas_command) + catch (...) { - std::deque params; - params.push_back(this); - whowas_command->HandleInternal(WHOWAS_ADD, params); + ServerInstance->Logs->Log("OPER", DEBUG,"Exception in User::Oper()"); } } -/* add a client connection to the sockets list */ -void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip) +void User::UnOper() { - std::string tempnick = ConvToStr(socket) + "-unknown"; - user_hash::iterator iter = Instance->clientlist->find(tempnick); - char ipaddr[MAXBUF]; -#ifdef IPV6 - if (socketfamily == AF_INET6) - inet_ntop(AF_INET6, &((const sockaddr_in6*)ip)->sin6_addr, ipaddr, sizeof(ipaddr)); - else -#endif - inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr)); - userrec* New; - int j = 0; - - Instance->unregistered_count++; - - /* - * 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); - } - - 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; - - New->SetSockAddr(socketfamily, ipaddr, port); - - /* 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; - - Instance->AddLocalClone(New); - Instance->AddGlobalClone(New); - - /* - * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved. - * See my note down there for why this is required. DO NOT REMOVE. :) -- w00t - */ - ConnectClass* i = New->GetClass(); - - if (!i) + if (IS_OPER(this)) { - userrec::QuitUser(Instance, New, "Access denied by configuration"); - return; - } + /* Remove all oper only modes from the user when the deoper - Bug #466*/ + std::string moderemove("-"); - New->CheckClass(); - - New->pingmax = i->GetPingTime(); - New->nping = Instance->Time() + i->GetPingTime() + Instance->Config->dns_timeout; - New->timeout = Instance->Time() + i->GetRegTimeout(); - New->flood = i->GetFlood(); - New->threshold = i->GetThreshold(); - New->sendqmax = i->GetSendqMax(); - New->recvqmax = i->GetRecvqMax(); - - Instance->local_users.push_back(New); + for (unsigned char letter = 'A'; letter <= 'z'; letter++) + { + if (letter != 'o') + { + ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER); + if (mh && mh->NeedsOper()) + moderemove += letter; + } + } - if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS)) - { - Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit); - userrec::QuitUser(Instance, New,"No more connections allowed"); - return; - } + const char* parameters[] = { this->nick, moderemove.c_str() }; + ServerInstance->Parser->CallHandler("MODE", parameters, 2, this); - /* - * 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!) - */ -#ifndef WINDOWS - if ((unsigned int)socket >= MAX_DESCRIPTORS) - { - userrec::QuitUser(Instance, New, "Server is full"); - return; - } -#endif + /* 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); - New->exempt = (Instance->XLines->matches_exception(New) != NULL); - if (!New->exempt) - { - ZLine* r = Instance->XLines->matches_zline(ipaddr); - if (r) + if (AllowedOperCommands) { - char reason[MAXBUF]; - if (*Instance->Config->MoronBanner) - New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner); - snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason); - userrec::QuitUser(Instance, New, reason); - return; + delete AllowedOperCommands; + AllowedOperCommands = NULL; } - } - - if (socket > -1) - { - if (!Instance->SE->AddFd(New)) + if (AllowedUserModes) { - userrec::QuitUser(Instance, New, "Internal error handling connection"); - return; + delete[] AllowedUserModes; + AllowedUserModes = NULL; + } + if (AllowedChanModes) + { + delete[] AllowedChanModes; + AllowedChanModes = NULL; } - } - /* NOTE: even if dns lookups are *off*, we still need to display this. - * BOPM and other stuff requires it. - */ - New->WriteServ("NOTICE Auth :*** Looking up your hostname..."); + } } -unsigned long userrec::GlobalCloneCount() +void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason) { - clonemap::iterator x = ServerInstance->global_clones.find(this->GetIPString()); - if (x != ServerInstance->global_clones.end()) - return x->second; + 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; + + if (!*operreason) + user->operquitmsg = quitreason; else - return 0; + user->operquitmsg = operreason; + + Instance->GlobalCulls.AddItem(user); } -unsigned long userrec::LocalCloneCount() +/* adds or updates an entry in the whowas list */ +void User::AddToWhoWas() { - clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString()); - if (x != ServerInstance->local_clones.end()) - return x->second; - else - return 0; + Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); + if (whowas_command) + { + std::deque params; + params.push_back(this); + whowas_command->HandleInternal(WHOWAS_ADD, params); + } } /* * Check class restrictions */ -void userrec::CheckClass() +void User::CheckClass() { - ConnectClass* a = this->GetClass(); + ConnectClass* a = this->MyClass; if ((!a) || (a->GetType() == CC_DENY)) { - userrec::QuitUser(ServerInstance, this, "Unauthorised connection"); + User::QuitUser(ServerInstance, this, "Unauthorised connection"); return; } - else if ((a->GetMaxLocal()) && (this->LocalCloneCount() > a->GetMaxLocal())) + else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal())) { - userrec::QuitUser(ServerInstance, 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->GetMaxLocal(), this->GetIPString()); + 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; } - else if ((a->GetMaxGlobal()) && (this->GlobalCloneCount() > a->GetMaxGlobal())) + else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal())) { - userrec::QuitUser(ServerInstance, 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->GetMaxGlobal(), this->GetIPString()); + 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; } + + this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout; + this->timeout = ServerInstance->Time() + a->GetRegTimeout(); + this->MaxChans = a->GetMaxChans(); } -void userrec::FullConnect() +void User::FullConnect() { - ServerInstance->Log(DEBUG,"FullConnect"); ServerInstance->stats->statsConnects++; this->idle_lastmsg = ServerInstance->Time(); /* - * You may be thinking "wtf, we checked this in userrec::AddClient!" - and yes, we did, BUT. + * 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->CheckClass(); + this->SetClass(); /* 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->GetClass()->GetPass().empty()) && (!this->haspassed)) + if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed) { - userrec::QuitUser(ServerInstance, this, "Invalid password"); + User::QuitUser(ServerInstance, this, "Invalid password"); return; } - + if (!this->exempt) { - GLine* r = ServerInstance->XLines->matches_gline(this); + GLine *r = (GLine *)ServerInstance->XLines->MatchesLine("G", this); if (r) { - this->muted = true; - char reason[MAXBUF]; - if (*ServerInstance->Config->MoronBanner) - this->WriteServ("NOTICE %s :*** %s", this->nick, ServerInstance->Config->MoronBanner); - snprintf(reason,MAXBUF,"G-Lined: %s",r->reason); - userrec::QuitUser(ServerInstance, this, reason); + r->Apply(this); return; } - KLine* n = ServerInstance->XLines->matches_kline(this); + KLine *n = (KLine *)ServerInstance->XLines->MatchesLine("K", this); if (n) { - this->muted = true; - char reason[MAXBUF]; - if (*ServerInstance->Config->MoronBanner) - this->WriteServ("NOTICE %s :*** %s", this, ServerInstance->Config->MoronBanner); - snprintf(reason,MAXBUF,"K-Lined: %s",n->reason); - userrec::QuitUser(ServerInstance, 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()); + 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->unregistered_count) - ServerInstance->unregistered_count--; + if (ServerInstance->Users->unregistered_count) + ServerInstance->Users->unregistered_count--; /* Trigger LUSERS output, give modules a chance too */ int MOD_RESULT = 0; @@ -1107,8 +929,8 @@ void userrec::FullConnect() 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)); @@ -1117,41 +939,32 @@ void userrec::FullConnect() 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->Log(DEBUG,"Exit FullConnect"); + 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) { - try - { - //user_hash::iterator newnick; - user_hash::iterator oldnick = ServerInstance->clientlist->find(this->nick); + //user_hash::iterator newnick; + user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick); - if (!strcasecmp(this->nick,New)) - return oldnick->second; + if (!strcasecmp(this->nick,New)) + return oldnick->second; - if (oldnick == ServerInstance->clientlist->end()) - return NULL; /* doesnt exist */ + if (oldnick == ServerInstance->Users->clientlist->end()) + return NULL; /* doesnt exist */ - userrec* olduser = oldnick->second; - (*(ServerInstance->clientlist))[New] = olduser; - ServerInstance->clientlist->erase(oldnick); - return olduser; - } - - catch (...) - { - ServerInstance->Log(DEBUG,"Exception in userrec::UpdateNickHash()"); - return NULL; - } + User* olduser = oldnick->second; + (*(ServerInstance->Users->clientlist))[New] = olduser; + ServerInstance->Users->clientlist->erase(oldnick); + return olduser; } -void userrec::InvalidateCache() +void User::InvalidateCache() { /* Invalidate cache */ if (cached_fullhost) @@ -1165,9 +978,15 @@ void userrec::InvalidateCache() cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL; } -bool userrec::ForceNickChange(const char* newnick) +bool User::ForceNickChange(const char* newnick) { - try + /* + * 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; @@ -1181,28 +1000,33 @@ bool userrec::ForceNickChange(const char* newnick) return false; } - if (ServerInstance->XLines->matches_qline(newnick)) + if (ServerInstance->XLines->MatchesLine("Q",newnick)) { ServerInstance->stats->statsCollisions++; return false; } - - if (this->registered == REG_ALL) + } + else + { + std::deque dummy; + Command* nickhandler = ServerInstance->Parser->GetHandler("NICK"); + if (nickhandler) // wtfbbq, when would this not be here { - return (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS); + nickhandler->HandleInternal(1, dummy); + bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS); + nickhandler->HandleInternal(0, dummy); + return result; } - return false; } - catch (...) - { - ServerInstance->Log(DEBUG,"Exception in userrec::ForceNickChange()"); - return false; - } + // 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 @@ -1211,7 +1035,7 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port) 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; @@ -1221,17 +1045,17 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port) 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; @@ -1258,7 +1082,7 @@ int userrec::GetPort() return 0; } -int userrec::GetProtocolFamily() +int User::GetProtocolFamily() { if (this->ip == NULL) return 0; @@ -1267,53 +1091,19 @@ int userrec::GetProtocolFamily() 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) - 1); - *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: - 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()) { @@ -1329,8 +1119,11 @@ const char* userrec::GetIPString(char* buf) { 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; @@ -1339,13 +1132,15 @@ const char* userrec::GetIPString(char* buf) { 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: break; } + + // Unreachable, probably return ""; } @@ -1355,38 +1150,34 @@ const char* userrec::GetIPString(char* buf) * 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 (!ServerInstance->SE->BoundsCheckFd(this)) return; try { - /* ServerInstance->Log(DEBUG,"C[%d] <- %s", this->GetFd(), text.c_str()); - * WARNING: The above debug line is VERY loud, do NOT - * enable it till we have a good way of filtering it - * out of the logs (e.g. 1.2 would be good). - */ + ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str()); text.append("\r\n"); } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append"); + 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 { - /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to - * implement their own buffering mechanisms - */ - ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length()); + this->io->OnRawSocketWrite(this->fd, text.data(), text.length()); } catch (CoreException& modexcept) { - ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + ServerInstance->Logs->Log("USEROUTPUT", DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } else @@ -1399,7 +1190,7 @@ void userrec::Write(std::string text) /** Write() */ -void userrec::Write(const char *text, ...) +void User::Write(const char *text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; @@ -1411,7 +1202,7 @@ void userrec::Write(const char *text, ...) this->Write(std::string(textbuffer)); } -void userrec::WriteServ(const std::string& text) +void User::WriteServ(const std::string& text) { char textbuffer[MAXBUF]; @@ -1422,7 +1213,7 @@ void userrec::WriteServ(const std::string& text) /** 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]; @@ -1435,7 +1226,33 @@ void userrec::WriteServ(const char* text, ...) } -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]; @@ -1447,7 +1264,7 @@ void userrec::WriteFrom(userrec *user, const std::string &text) /* 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]; @@ -1462,7 +1279,7 @@ void userrec::WriteFrom(userrec *user, const char* text, ...) /* 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; @@ -1474,13 +1291,13 @@ void userrec::WriteTo(userrec *dest, const char *data, ...) 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; @@ -1495,49 +1312,41 @@ void userrec::WriteCommon(const char* text, ...) this->WriteCommon(std::string(textbuffer)); } -void userrec::WriteCommon(const std::string &text) +void User::WriteCommon(const std::string &text) { - try - { - bool sent_to_at_least_one = false; - char tb[MAXBUF]; + bool sent_to_at_least_one = false; + char tb[MAXBUF]; - if (this->registered != REG_ALL) - return; + if (this->registered != REG_ALL) + return; - uniq_id++; + uniq_id++; - /* 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; + /* 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++) + for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++) + { + CUList* ulist = v->first->GetUsers(); + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - CUList* ulist = v->first->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->first)) && (already_sent[i->first->fd] != uniq_id)) - { - already_sent[i->first->fd] = uniq_id; - i->first->Write(out); - sent_to_at_least_one = true; - } + already_sent[i->first->fd] = uniq_id; + i->first->Write(out); + sent_to_at_least_one = true; } } - - /* - * if the user was not in any channels, no users will receive the text. Make sure the user - * receives their OWN message for WriteCommon - */ - if (!sent_to_at_least_one) - { - this->Write(std::string(tb)); - } } - catch (...) + /* + * if the user was not in any channels, no users will receive the text. Make sure the user + * receives their OWN message for WriteCommon + */ + if (!sent_to_at_least_one) { - ServerInstance->Log(DEBUG,"Exception in userrec::WriteCommon()"); + this->Write(std::string(tb)); } } @@ -1546,7 +1355,7 @@ void userrec::WriteCommon(const std::string &text) * 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; @@ -1558,7 +1367,7 @@ void userrec::WriteCommonExcept(const char* text, ...) this->WriteCommonExcept(std::string(textbuffer)); } -void userrec::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text) +void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text) { char tb1[MAXBUF]; char tb2[MAXBUF]; @@ -1589,7 +1398,7 @@ void userrec::WriteCommonQuit(const std::string &normal_text, const std::string } } -void userrec::WriteCommonExcept(const std::string &text) +void User::WriteCommonExcept(const std::string &text) { char tb1[MAXBUF]; std::string out1; @@ -1619,7 +1428,7 @@ void userrec::WriteCommonExcept(const std::string &text) } -void userrec::WriteWallOps(const std::string &text) +void User::WriteWallOps(const std::string &text) { if (!IS_OPER(this) && IS_LOCAL(this)) return; @@ -1627,15 +1436,15 @@ void userrec::WriteWallOps(const std::string &text) std::string wallop("WALLOPS :"); wallop.append(text); - for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) + for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) { - userrec* t = *i; + 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; @@ -1654,12 +1463,12 @@ void userrec::WriteWallOps(const char* text, ...) * 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 + * channel's userlist in the inner loop which is a std::map * 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; @@ -1676,7 +1485,7 @@ bool userrec::SharesChannelWith(userrec *other) return false; } -bool userrec::ChangeName(const char* gecos) +bool User::ChangeName(const char* gecos) { if (!strcmp(gecos, this->fullname)) return true; @@ -1694,24 +1503,25 @@ bool userrec::ChangeName(const char* gecos) return true; } -bool userrec::ChangeDisplayedHost(const char* host) +bool User::ChangeDisplayedHost(const char* shost) { - if (!strcmp(host, this->dhost)) + 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: userrec::dhost is 65 long, this was truncating some long hosts */ - strlcpy(this->dhost,host,64); + /* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */ + strlcpy(this->dhost,shost,64); this->InvalidateCache(); @@ -1727,12 +1537,12 @@ bool userrec::ChangeDisplayedHost(const char* host) } if (IS_LOCAL(this)) - this->WriteServ("396 %s %s :is now your displayed host",this->nick,this->dhost); + this->WriteNumeric(396, "%s %s :is now your displayed host",this->nick,this->dhost); return true; } -bool userrec::ChangeIdent(const char* newident) +bool User::ChangeIdent(const char* newident) { if (!strcmp(newident, this->ident)) return true; @@ -1740,7 +1550,7 @@ bool userrec::ChangeIdent(const char* newident) if (this->ServerInstance->Config->CycleHosts) this->WriteCommonExcept("%s","QUIT :Changing ident"); - strlcpy(this->ident, newident, IDENTMAX+2); + strlcpy(this->ident, newident, IDENTMAX+1); this->InvalidateCache(); @@ -1758,7 +1568,7 @@ bool userrec::ChangeIdent(const char* newident) return true; } -void userrec::SendAll(const char* command, char* text, ...) +void User::SendAll(const char* command, const char* text, ...) { char textbuffer[MAXBUF]; char formatbuffer[MAXBUF]; @@ -1771,112 +1581,167 @@ void userrec::SendAll(const char* command, char* text, ...) snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer); std::string fmt = formatbuffer; - for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) + for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) { (*i)->Write(fmt); } } -std::string userrec::ChannelList(userrec* source) +std::string User::ChannelList(User* source) { - try + std::string list; + + for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) { - std::string list; - 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 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 option is set. - */ - if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source)))) - { - list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" "); - } + list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" "); } - return list; - } - catch (...) - { - ServerInstance->Log(DEBUG,"Exception in userrec::ChannelList()"); - return ""; } + + 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; - try + 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) { - prefix << this->nick << " " << dest->nick << " :"; - line = prefix.str(); - int namelen = strlen(ServerInstance->Config->ServerName) + 6; + length = (pos == std::string::npos) ? cl.length() : pos; - for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1) + if (line.length() + namelen + length - start > 510) { - length = (pos == std::string::npos) ? cl.length() : pos; - - if (line.length() + namelen + length - start > 510) - { - ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str()); - line = prefix.str(); - } - - if(pos == std::string::npos) - { - line.append(cl.substr(start, length - start)); - break; - } - else - { - line.append(cl.substr(start, length - start + 1)); - } + ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str()); + line = prefix.str(); } - if (line.length()) + if(pos == std::string::npos) { - ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str()); + line.append(cl.substr(start, length - start)); + break; + } + else + { + line.append(cl.substr(start, length - start + 1)); } } - catch (...) + if (line.length()) { - ServerInstance->Log(DEBUG,"Exception in userrec::SplitChanList()"); + 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 (/ 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 or tag specifies an ip, and this user resolves, * then their ip will be taken as 'priority' anyway, so for example, * 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()) { - if (((match(this->GetIPString(),i->GetHost().c_str(),true)) || (match(this->host,i->GetHost().c_str())))) + for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++) { - if (i->GetPort()) + ConnectClass* c = *i; + + if (explicit_name == c->GetName() && !c->GetDisabled()) { - if (this->GetPort() == i->GetPort()) - return &(*i); + 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 - continue; + { + if (!c->GetDisabled()) + found = c; + } } - else - return &(*i); } } - return NULL; + + /* ensure we don't fuck things up refcount wise, only remove them from a class if we find a new one :P */ + if (found) + { + /* 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 this->MyClass; } -void userrec::PurgeEmptyChannels() +/* looks up a users password for their connection class (/ tags) + * NOTE: If the or tag specifies an ip, and this user resolves, + * then their ip will be taken as 'priority' anyway, so for example, + * will match joe!bloggs@localhost + */ +ConnectClass* User::GetClass() { - std::vector to_delete; + return this->MyClass; +} + +void User::PurgeEmptyChannels() +{ + std::vector to_delete; // firstly decrement the count on each channel for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++) @@ -1891,19 +1756,19 @@ void userrec::PurgeEmptyChannels() } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::PurgeEmptyChannels to_delete.push_back()"); + ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()"); } } } - for (std::vector::iterator n = to_delete.begin(); n != to_delete.end(); n++) + for (std::vector::iterator n = to_delete.begin(); n != to_delete.end(); n++) { - chanrec* thischan = *n; + 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); + delete i2->second; ServerInstance->chanlist->erase(i2); this->chans.erase(*n); } @@ -1912,39 +1777,42 @@ void userrec::PurgeEmptyChannels() 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 (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++) - this->WriteServ("372 %s :- %s",this->nick,i->c_str()); + 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("434 %s :RULES File is missing",this->nick); + this->WriteNumeric(434, "%s :RULES File is missing",this->nick); return; } - this->WriteServ("308 %s :- %s Server Rules -",this->nick,ServerInstance->Config->ServerName); + 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->WriteServ("232 %s :- %s",this->nick,i->c_str()); + this->WriteNumeric(232, "%s :- %s",this->nick,i->c_str()); - this->WriteServ("309 %s :End of RULES command.",this->nick); + this->WriteNumeric(309, "%s :End of RULES command.",this->nick); } -void userrec::HandleEvent(EventType et, int errornum) +void User::HandleEvent(EventType et, int errornum) { + if (this->quitting) // drop everything, user is due to be quit + return; + /* WARNING: May delete this user! */ int thisfd = this->GetFd(); @@ -1966,7 +1834,7 @@ void userrec::HandleEvent(EventType et, int errornum) } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::HandleEvent intercepted"); + 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 */ @@ -1974,22 +1842,29 @@ void userrec::HandleEvent(EventType et, int errornum) { if (!WriteError.empty()) { - userrec::QuitUser(ServerInstance, this, GetWriteError()); + User::QuitUser(ServerInstance, this, GetWriteError()); } } } -void userrec::SetOperQuit(const std::string &oquit) +void User::SetOperQuit(const std::string &oquit) { - if (operquit) - return; + operquitmsg = oquit; +} - operquit = strdup(oquit.c_str()); +const char* User::GetOperQuit() +{ + return operquitmsg.c_str(); +} + +void User::IncreasePenalty(int increase) +{ + this->Penalty += increase; } -const char* userrec::GetOperQuit() +void User::DecreasePenalty(int decrease) { - return operquit ? operquit : ""; + this->Penalty -= decrease; } VisData::VisData() @@ -2000,7 +1875,7 @@ VisData::~VisData() { } -bool VisData::VisibleTo(userrec* user) +bool VisData::VisibleTo(User* user) { return true; }