X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fusers.cpp;h=bb3ef18e90e88768dbea368188397332f1104ce9;hb=6d4128715da39b1e097642a64ee0bd40586d9a38;hp=40594c8a9b787c0d617735d4a0c8b1b36fb3ccc2;hpb=fc9e00f49299cb3b402406b5f185d5f4af1e9780;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 40594c8a9..bb3ef18e9 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -3,13 +3,13 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * E-mail: + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -20,11 +20,7 @@ #include "connection.h" #include "users.h" #include "inspircd.h" -#include -#ifdef THREADED_DNS -#include -#include -#endif +#include #include "inspstring.h" #include "commands.h" #include "helperfuncs.h" @@ -48,11 +44,11 @@ extern time_t TIME; extern userrec* fd_ref_table[MAX_DESCRIPTORS]; extern ServerConfig *Config; extern user_hash clientlist; - -whowas_users whowas; - +extern Server* MyServer; extern std::vector local_users; +irc::whowas::whowas_users whowas; +static unsigned long already_sent[MAX_DESCRIPTORS] = {0}; std::vector all_opers; typedef std::map opertype_t; @@ -61,6 +57,9 @@ 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(const char* tag) { for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++) @@ -110,11 +109,146 @@ bool DoneClassesAndTypes(const char* tag) return true; } -bool userrec::HasMode(unsigned char m) +bool userrec::ProcessNoticeMasks(const char *sm) +{ + bool adding = true; + const char *c = sm; + + while (c && *c) + { + switch (*c) + { + case '+': + adding = true; + break; + case '-': + adding = false; + break; + default: + if ((*c >= 'A') && (*c <= 'z')) + this->SetNoticeMask(*c, adding); + break; + } + + *c++; + } + + return true; +} + +void userrec::StartDNSLookup() +{ + log(DEBUG,"Commencing reverse lookup"); + try + { + res_reverse = new UserResolver(this, this->GetIPString(), false); + MyServer->AddResolver(res_reverse); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } +} + +UserResolver::UserResolver(userrec* user, std::string to_resolve, bool forward) : Resolver(to_resolve, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), bound_user(user) +{ + this->fwd = forward; + this->bound_fd = user->fd; +} + +void UserResolver::OnLookupComplete(const std::string &result) +{ + if ((!this->fwd) && (fd_ref_table[this->bound_fd] == this->bound_user)) + { + log(DEBUG,"Commencing forward lookup"); + this->bound_user->stored_host = result; + try + { + bound_user->res_forward = new UserResolver(this->bound_user, result, true); + MyServer->AddResolver(bound_user->res_forward); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } + } + else if ((this->fwd) && (fd_ref_table[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) + { + /* 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()); + } + } + 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()); + } + } +} + +void UserResolver::OnError(ResolverError e, const std::string &errormessage) +{ + if (fd_ref_table[this->bound_fd] == this->bound_user) + { + /* 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; + } +} + + +bool userrec::IsNoticeMaskSet(unsigned char sm) +{ + return (snomasks[sm-65]); +} + +void userrec::SetNoticeMask(unsigned char sm, bool value) +{ + snomasks[sm-65] = value; +} + +const char* userrec::FormatNoticeMasks() +{ + static char data[MAXBUF]; + int offset = 0; + + for (int n = 0; n < 64; n++) + { + if (snomasks[n]) + data[offset++] = n+65; + } + + data[offset] = 0; + return data; +} + + + +bool userrec::IsModeSet(unsigned char m) { return (modes[m-65]); } +void userrec::SetMode(unsigned char m, bool value) +{ + modes[m-65] = value; +} + const char* userrec::FormatModes() { static char data[MAXBUF]; @@ -135,10 +269,13 @@ userrec::userrec() server = (char*)FindServerNamePtr(Config->ServerName); reset_due = TIME; lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0; - timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0; + timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0; haspassed = dns_done = false; recvq = ""; sendq = ""; + WriteError = ""; + res_forward = res_reverse = NULL; + ip = NULL; chans.clear(); invites.clear(); chans.resize(MAXCHANS); @@ -158,7 +295,21 @@ userrec::~userrec() for (std::vector::iterator n = chans.begin(); n != chans.end(); n++) { ucrec* x = (ucrec*)*n; - DELETE(x); + delete x; + } + + if (ip) + { + if (this->GetProtocolFamily() == AF_INET) + { + delete (sockaddr_in*)ip; + } +#ifdef SUPPORT_IP6LINKS + else + { + delete (sockaddr_in6*)ip; + } +#endif } } @@ -247,7 +398,6 @@ bool userrec::IsInvited(irc::string &channel) return true; } } - return false; } @@ -259,7 +409,6 @@ InvitedList* userrec::GetInviteList() void userrec::InviteTo(irc::string &channel) { Invited i; - i.channel = channel; invites.push_back(i); } @@ -338,44 +487,32 @@ bool userrec::HasPermission(const std::string &command) bool userrec::AddBuffer(const std::string &a) { std::string b = ""; - char* n = (char*)a.c_str(); - - for (char* i = n; *i; i++) - { - if ((*i != '\r') && (*i != '\0') && (*i != 7)) - b = b + *i; - } - - recvq.append(b); - unsigned int i = 0; - - // count the size of the first line in the buffer. - while (i < recvq.length()) + + /* NB: std::string is arsey about \r and \n and tries to translate them + * somehow, so we CANNOT use std::string::find() here :( + */ + for (std::string::const_iterator i = a.begin(); i != a.end(); i++) { - if (recvq[i++] == '\n') - break; + if (*i != '\r') + b += *i; } + + if (b.length()) + recvq.append(b); + if (recvq.length() > (unsigned)this->recvqmax) { this->SetWriteError("RecvQ exceeded"); WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax); + return false; } - - /* - * return false if we've had more than 600 characters WITHOUT - * a carriage return (this is BAD, drop the socket) - */ - return (i < 600); + + return true; } bool userrec::BufferIsReady() { - unsigned int t = recvq.length(); - - for (unsigned int i = 0; i < t; i++) - if (recvq[i] == '\n') - return true; - return false; + return (recvq.find('\n') != std::string::npos); } void userrec::ClearBuffer() @@ -385,25 +522,29 @@ void userrec::ClearBuffer() std::string userrec::GetBuffer() { - if (recvq == "") + if (!recvq.length()) return ""; - - char* line = (char*)recvq.c_str(); - - std::string ret = ""; - - while ((*line != '\n') && (*line)) + + /* 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++) { - ret = ret + *line; - line++; + /* 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; + } } - - while ((*line == '\n') || (*line == '\r')) - line++; - - recvq = line; - - return ret; + return ""; } void userrec::AddWriteBuf(const std::string &data) @@ -423,7 +564,17 @@ void userrec::AddWriteBuf(const std::string &data) return; } - sendq.append(data); + if (data.length() > 512) + { + std::string newdata(data); + newdata.resize(510); + newdata.append("\r\n"); + sendq.append(newdata); + } + else + { + sendq.append(data); + } } // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it) @@ -431,7 +582,7 @@ void userrec::FlushWriteBuf() { if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER)) { - char* tb = (char*)this->sendq.c_str(); + const char* tb = this->sendq.c_str(); int n_sent = write(this->fd,tb,this->sendq.length()); if (n_sent == -1) { @@ -452,10 +603,13 @@ void userrec::FlushWriteBuf() void userrec::SetWriteError(const std::string &error) { - log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str()); + 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 == "") + if (!this->WriteError.length()) + { + log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str()); this->WriteError = error; + } } const char* userrec::GetWriteError() @@ -463,26 +617,36 @@ const char* userrec::GetWriteError() return this->WriteError.c_str(); } -void AddOper(userrec* user) +void userrec::Oper(const std::string &opertype) { - log(DEBUG,"Oper added to optimization list"); - all_opers.push_back(user); + this->modes[UM_OPERATOR] = 1; + this->WriteServ("MODE %s :+o", this->nick); + FOREACH_MOD(I_OnOper, OnOper(this, opertype)); + 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); + all_opers.push_back(this); + FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype)); } -void DeleteOper(userrec* user) +void userrec::UnOper() { - for (std::vector::iterator a = all_opers.begin(); a < all_opers.end(); a++) + if (*this->oper) { - if (*a == user) + *this->oper = 0; + this->modes[UM_OPERATOR] = 0; + for (std::vector::iterator a = all_opers.begin(); a < all_opers.end(); a++) { - log(DEBUG,"Oper removed from optimization list"); - all_opers.erase(a); - return; + if (*a == this) + { + log(DEBUG,"Oper removed from optimization list"); + all_opers.erase(a); + return; + } } } } -void kill_link(userrec *user,const char* r) +void userrec::QuitUser(userrec *user,const std::string &quitreason) { user_hash::iterator iter = clientlist.find(user->nick); @@ -496,20 +660,19 @@ void kill_link(userrec *user,const char* r) * if (iter == clientlist.end()) * return; */ + std::string reason = quitreason; - char reason[MAXBUF]; - - strlcpy(reason,r,MAXQUIT-1); - log(DEBUG,"kill_link: %s %d '%s'",user->nick,user->fd,reason); + if (reason.length() > MAXQUIT - 1) + reason.resize(MAXQUIT - 1); if (IS_LOCAL(user)) - Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason); + user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason.c_str()); - if (user->registered == 7) + if (user->registered == REG_ALL) { purge_empty_chans(user); FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason)); - WriteCommonExcept(user,"QUIT :%s",reason); + user->WriteCommonExcept("QUIT :%s",reason.c_str()); } if (IS_LOCAL(user)) @@ -519,11 +682,11 @@ void kill_link(userrec *user,const char* r) if (IS_LOCAL(user)) { - if (Config->GetIOHook(user->port)) + if (Config->GetIOHook(user->GetPort())) { try { - Config->GetIOHook(user->port)->OnRawSocketClose(user->fd); + Config->GetIOHook(user->GetPort())->OnRawSocketClose(user->fd); } catch (ModuleException& modexcept) { @@ -543,11 +706,11 @@ void kill_link(userrec *user,const char* r) * 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 == 7) + if (user->registered == REG_ALL) { if (IS_LOCAL(user)) - WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason); - AddWhoWas(user); + WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str()); + user->AddToWhoWas(); } if (iter != clientlist.end()) @@ -557,89 +720,94 @@ void kill_link(userrec *user,const char* r) { fd_ref_table[user->fd] = NULL; if (find(local_users.begin(),local_users.end(),user) != local_users.end()) - { local_users.erase(find(local_users.begin(),local_users.end(),user)); - log(DEBUG,"Delete local user"); - } } clientlist.erase(iter); DELETE(user); } } -WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon) +namespace irc { - this->host = strdup(user->host); - this->dhost = strdup(user->dhost); - this->ident = strdup(user->ident); - this->server = user->server; - this->gecos = strdup(user->fullname); -} + namespace whowas + { -WhoWasGroup::~WhoWasGroup() -{ - if (host) - free(host); - if (dhost) - free(dhost); - if (ident) - free(ident); - if (gecos) - free(gecos); -} + 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() + { + 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 TIME) + { + for (whowas_users::iterator iter = ::whowas.begin(); iter != ::whowas.end(); iter++) + { + whowas_set* n = (whowas_set*)iter->second; + if (n->size()) + { + while ((n->begin() != n->end()) && ((*n->begin())->signon < TIME - 259200)) // 3 days + { + WhoWasGroup *a = *(n->begin()); + DELETE(a); + n->erase(n->begin()); + } + } + } + } + }; +}; /* adds or updates an entry in the whowas list */ -void AddWhoWas(userrec* u) +void userrec::AddToWhoWas() { - whowas_users::iterator iter = whowas.find(u->nick); - + irc::whowas::whowas_users::iterator iter = whowas.find(this->nick); + if (iter == whowas.end()) { - whowas_set* n = new whowas_set; - WhoWasGroup *a = new WhoWasGroup(u); + irc::whowas::whowas_set* n = new irc::whowas::whowas_set; + irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this); n->push_back(a); - whowas[u->nick] = n; + whowas[this->nick] = n; } else { - whowas_set* group = (whowas_set*)iter->second; - + irc::whowas::whowas_set* group = (irc::whowas::whowas_set*)iter->second; + if (group->size() > 10) { - WhoWasGroup *a = (WhoWasGroup*)*(group->begin()); + irc::whowas::WhoWasGroup *a = (irc::whowas::WhoWasGroup*)*(group->begin()); DELETE(a); group->pop_front(); } - - WhoWasGroup *a = new WhoWasGroup(u); - group->push_back(a); - } -} -/* every hour, run this function which removes all entries over 3 days */ -void MaintainWhoWas(time_t TIME) -{ - for (whowas_users::iterator iter = whowas.begin(); iter != whowas.end(); iter++) - { - whowas_set* n = (whowas_set*)iter->second; - if (n->size()) - { - while ((n->begin() != n->end()) && ((*n->begin())->signon < TIME - 259200)) // 3 days - { - WhoWasGroup *a = *(n->begin()); - DELETE(a); - n->erase(n->begin()); - } - } + irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this); + group->push_back(a); } } /* add a client connection to the sockets list */ -void AddClient(int socket, int port, bool iscached, in_addr ip4) +void userrec::AddClient(int socket, int port, bool iscached, insp_inaddr ip) { std::string tempnick = ConvToStr(socket) + "-unknown"; user_hash::iterator iter = clientlist.find(tempnick); - const char *ipaddr = inet_ntoa(ip4); + const char *ipaddr = insp_ntoa(ip); + userrec* _new; int j = 0; /* @@ -660,25 +828,28 @@ void AddClient(int socket, int port, bool iscached, in_addr ip4) log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr); - clientlist[tempnick] = new userrec(); - clientlist[tempnick]->fd = socket; - strlcpy(clientlist[tempnick]->nick,tempnick.c_str(),NICKMAX-1); - - /* Smarter than your average bear^H^H^H^Hset of strlcpys. */ - for (char* temp = (char*)ipaddr; *temp && j < 64; temp++, j++) - clientlist[tempnick]->dhost[j] = clientlist[tempnick]->host[j] = *temp; - clientlist[tempnick]->dhost[j] = clientlist[tempnick]->host[j] = 0; + _new = new userrec(); + clientlist[tempnick] = _new; + _new->fd = socket; + strlcpy(_new->nick,tempnick.c_str(),NICKMAX-1); - clientlist[tempnick]->server = (char*)FindServerNamePtr(Config->ServerName); + _new->server = FindServerNamePtr(Config->ServerName); /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */ - strcpy(clientlist[tempnick]->ident, "unknown"); + strcpy(_new->ident, "unknown"); - clientlist[tempnick]->registered = 0; - clientlist[tempnick]->signon = TIME + Config->dns_timeout; - clientlist[tempnick]->lastping = 1; - clientlist[tempnick]->ip4 = ip4; - clientlist[tempnick]->port = port; + _new->registered = REG_NONE; + _new->signon = TIME + Config->dns_timeout; + _new->lastping = 1; + log(DEBUG,"Setting socket addresses"); + _new->SetSockAddr(AF_FAMILY, ipaddr, port); + 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; @@ -688,11 +859,11 @@ void AddClient(int socket, int port, bool iscached, in_addr ip4) for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { - if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str()))) + if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str(),true))) { class_regtimeout = (unsigned long)i->registration_timeout; class_flood = i->flood; - clientlist[tempnick]->pingmax = i->pingtime; + _new->pingmax = i->pingtime; class_threshold = i->threshold; class_sqmax = i->sendqmax; class_rqmax = i->recvqmax; @@ -700,25 +871,25 @@ void AddClient(int socket, int port, bool iscached, in_addr ip4) } } - clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax + Config->dns_timeout; - clientlist[tempnick]->timeout = TIME+class_regtimeout; - clientlist[tempnick]->flood = class_flood; - clientlist[tempnick]->threshold = class_threshold; - clientlist[tempnick]->sendqmax = class_sqmax; - clientlist[tempnick]->recvqmax = class_rqmax; + _new->nping = TIME + _new->pingmax + Config->dns_timeout; + _new->timeout = TIME+class_regtimeout; + _new->flood = class_flood; + _new->threshold = class_threshold; + _new->sendqmax = class_sqmax; + _new->recvqmax = class_rqmax; - fd_ref_table[socket] = clientlist[tempnick]; - local_users.push_back(clientlist[tempnick]); + fd_ref_table[socket] = _new; + local_users.push_back(_new); if (local_users.size() > Config->SoftLimit) { - kill_link(clientlist[tempnick],"No more connections allowed"); + userrec::QuitUser(_new,"No more connections allowed"); return; } if (local_users.size() >= MAXCLIENTS) { - kill_link(clientlist[tempnick],"No more connections allowed"); + userrec::QuitUser(_new,"No more connections allowed"); return; } @@ -734,7 +905,7 @@ void AddClient(int socket, int port, bool iscached, in_addr ip4) */ if ((unsigned)socket >= MAX_DESCRIPTORS) { - kill_link(clientlist[tempnick],"Server is full"); + userrec::QuitUser(_new,"Server is full"); return; } char* e = matches_exception(ipaddr); @@ -745,79 +916,97 @@ void AddClient(int socket, int port, bool iscached, in_addr ip4) { char reason[MAXBUF]; snprintf(reason,MAXBUF,"Z-Lined: %s",r); - kill_link(clientlist[tempnick],reason); + userrec::QuitUser(_new,reason); return; } } if (socket > -1) { - ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT); + if (!ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT)) + { + userrec::QuitUser(_new, "Internal error handling connection"); + return; + } } - WriteServ(clientlist[tempnick]->fd,"NOTICE Auth :*** Looking up your hostname..."); + _new->WriteServ("NOTICE Auth :*** Looking up your hostname..."); } -long FindMatchingGlobal(userrec* user) +long userrec::GlobalCloneCount() { + char u1[1024]; + char u2[1024]; long x = 0; for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++) { - if (a->second->ip4.s_addr == user->ip4.s_addr) - x++; + /* 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 FindMatchingLocal(userrec* user) +long userrec::LocalCloneCount() { long x = 0; for (std::vector::const_iterator a = local_users.begin(); a != local_users.end(); a++) { - userrec* comp = (userrec*)(*a); - if (comp->ip4.s_addr == user->ip4.s_addr) + 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; } -void FullConnectUser(userrec* user, CullList* Goners) +void userrec::FullConnect(CullList* Goners) { ServerInstance->stats->statsConnects++; - user->idle_lastmsg = TIME; - log(DEBUG,"ConnectUser: %s",user->nick); + this->idle_lastmsg = TIME; + + ConnectClass a = GetClass(this); - ConnectClass a = GetClass(user); - if (a.type == CC_DENY) { - Goners->AddItem(user,"Unauthorised connection"); + Goners->AddItem(this,"Unauthorised connection"); return; } - if ((*(a.pass.c_str())) && (!user->haspassed)) + if ((*(a.pass.c_str())) && (!this->haspassed)) { - Goners->AddItem(user,"Invalid password"); + Goners->AddItem(this,"Invalid password"); return; } - if (FindMatchingLocal(user) > a.maxlocal) + if (this->LocalCloneCount() > a.maxlocal) { - Goners->AddItem(user,"No more connections allowed from your host via this connect class (local)"); - WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s",a.maxlocal,(char*)inet_ntoa(user->ip4)); + Goners->AddItem(this, "No more connections allowed from your host via this connect class (local)"); + WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a.maxlocal, this->GetIPString()); return; } - else if (FindMatchingGlobal(user) > a.maxglobal) + else if (this->GlobalCloneCount() > a.maxglobal) { - Goners->AddItem(user,"No more connections allowed from your host via this connect class (global)"); - WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal,(char*)inet_ntoa(user->ip4)); + Goners->AddItem(this, "No more connections allowed from your host via this connect class (global)"); + WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal, this->GetIPString()); return; } char match_against[MAXBUF]; - snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host); + snprintf(match_against,MAXBUF,"%s@%s", this->ident, this->host); char* e = matches_exception(match_against); - + if (!e) { char* r = matches_gline(match_against); @@ -826,7 +1015,7 @@ void FullConnectUser(userrec* user, CullList* Goners) { char reason[MAXBUF]; snprintf(reason,MAXBUF,"G-Lined: %s",r); - Goners->AddItem(user,reason); + Goners->AddItem(this, reason); return; } @@ -836,18 +1025,18 @@ void FullConnectUser(userrec* user, CullList* Goners) { char reason[MAXBUF]; snprintf(reason,MAXBUF,"K-Lined: %s",r); - Goners->AddItem(user,reason); + Goners->AddItem(this, reason); return; } } - WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Config->Network); - WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Config->Network,user->nick,user->ident,user->host); - WriteServ(user->fd,"002 %s :Your host is %s, running version %s",user->nick,Config->ServerName,VERSION); - WriteServ(user->fd,"003 %s :This server was created %s %s",user->nick,__TIME__,__DATE__); - WriteServ(user->fd,"004 %s %s %s iowghrasxRVSCWBG lvhopsmntikrcaqbegIOLQRSKVHGCNT vhobeIaqglk",user->nick,Config->ServerName,VERSION); - + this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",Config->Network); + this->WriteServ("001 %s :Welcome to the %s IRC Network %s!%s@%s",this->nick, Config->Network, this->nick, this->ident, this->host); + this->WriteServ("002 %s :Your host is %s, running version %s",this->nick,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, Config->ServerName, VERSION, ServerInstance->ModeGrok->UserModeList().c_str(), ServerInstance->ModeGrok->ChannelModeList().c_str(), ServerInstance->ModeGrok->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(Config->data005); @@ -863,92 +1052,591 @@ void FullConnectUser(userrec* user, CullList* Goners) if ((token_counter >= 13) || (out.eof() == true)) { - WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str()); + this->WriteServ("005 %s %s:are supported by this server", this->nick, line5.c_str()); line5 = ""; token_counter = 0; } } - ShowMOTD(user); + ShowMOTD(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'. */ - FOREACH_MOD(I_OnUserConnect,OnUserConnect(user)); - FOREACH_MOD(I_OnGlobalConnect,OnGlobalConnect(user)); - user->registered = 7; - WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,(char*)inet_ntoa(user->ip4)); + FOREACH_MOD(I_OnUserConnect,OnUserConnect(this)); + FOREACH_MOD(I_OnGlobalConnect,OnGlobalConnect(this)); + this->registered = REG_ALL; + WriteOpers("*** Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString()); } -/** ReHashNick() +/** userrec::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* ReHashNick(char* Old, char* New) +userrec* userrec::UpdateNickHash(const char* New) { //user_hash::iterator newnick; - user_hash::iterator oldnick = clientlist.find(Old); + user_hash::iterator oldnick = clientlist.find(this->nick); - log(DEBUG,"ReHashNick: %s %s",Old,New); - - if (!strcasecmp(Old,New)) - { - log(DEBUG,"old nick is new nick, skipping"); + if (!strcasecmp(this->nick,New)) return oldnick->second; - } if (oldnick == clientlist.end()) return NULL; /* doesnt exist */ - log(DEBUG,"ReHashNick: Found hashed nick %s",Old); - userrec* olduser = oldnick->second; clientlist[New] = olduser; clientlist.erase(oldnick); - - log(DEBUG,"ReHashNick: Nick rehashed as %s",New); - return clientlist[New]; } -void force_nickchange(userrec* user,const char* newnick) +bool userrec::ForceNickChange(const char* newnick) { char nick[MAXBUF]; int MOD_RESULT = 0; *nick = 0; - FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,newnick)); + FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick)); if (MOD_RESULT) { ServerInstance->stats->statsCollisions++; - kill_link(user,"Nickname collision"); - return; + return false; } if (matches_qline(newnick)) { ServerInstance->stats->statsCollisions++; - kill_link(user,"Nickname collision"); + return false; + } + + 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; +} + +void userrec::SetSockAddr(int protocol_family, const char* ip, int port) +{ + switch (protocol_family) + { +#ifdef SUPPORT_IP6LINKS + case AF_INET6: + { + 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); + this->ip = (sockaddr*)sin; + } + break; +#endif + case AF_INET: + { + 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); + this->ip = (sockaddr*)sin; + } + break; + default: + log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick); + break; + } +} + +int userrec::GetPort() +{ + if (this->ip == NULL) + return 0; + + switch (this->GetProtocolFamily()) + { +#ifdef SUPPORT_IP6LINKS + case AF_INET6: + { + sockaddr_in6* sin = (sockaddr_in6*)this->ip; + return sin->sin6_port; + } + break; +#endif + case AF_INET: + { + sockaddr_in* sin = (sockaddr_in*)this->ip; + return sin->sin_port; + } + break; + default: + log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick); + break; + } + return 0; +} + +int userrec::GetProtocolFamily() +{ + if (this->ip == NULL) + return 0; + + sockaddr_in* sin = (sockaddr_in*)this->ip; + return sin->sin_family; +} + +const char* userrec::GetIPString() +{ + static char buf[1024]; + static char temp[1024]; + + if (this->ip == NULL) + return ""; + + switch (this->GetProtocolFamily()) + { +#ifdef SUPPORT_IP6LINKS + case AF_INET6: + { + 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: + log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick); + break; + } + return ""; +} + +const char* userrec::GetIPString(char* buf) +{ + static char temp[1024]; + + if (this->ip == NULL) + { + *buf = 0; + return buf; + } + + switch (this->GetProtocolFamily()) + { +#ifdef SUPPORT_IP6LINKS + case AF_INET6: + { + 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'; + strlcpy(buf, temp, sizeof(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: + log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick); + break; + } + return ""; +} + + +void userrec::Write(const std::string &text) +{ + if ((this->fd < 0) || (this->fd > MAX_DESCRIPTORS)) return; + + std::string crlf = text; + crlf.append("\r\n"); + + if (Config->GetIOHook(this->GetPort())) + { + try + { + Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, crlf.data(), crlf.length()); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); + } } + else + { + this->AddWriteBuf(crlf); + } + ServerInstance->stats->statsSent += crlf.length(); +} + +/** Write() + */ +void userrec::Write(const char *text, ...) +{ + va_list argsPtr; + char textbuffer[MAXBUF]; + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + + this->Write(std::string(textbuffer)); +} + +void userrec::WriteServ(const std::string& text) +{ + char textbuffer[MAXBUF]; + + snprintf(textbuffer,MAXBUF,":%s %s",Config->ServerName,text.c_str()); + this->Write(std::string(textbuffer)); +} + +/** WriteServ() + * Same as Write(), except `text' is prefixed with `:server.name '. + */ +void userrec::WriteServ(const char* text, ...) +{ + va_list argsPtr; + char textbuffer[MAXBUF]; + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + + this->WriteServ(std::string(textbuffer)); +} + + +void userrec::WriteFrom(userrec *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, ...) +{ + va_list argsPtr; + char textbuffer[MAXBUF]; + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + + this->WriteFrom(user, std::string(textbuffer)); +} + - if (user) +/* write text to an destination user from a source user (e.g. user privmsg) */ + +void userrec::WriteTo(userrec *dest, const char *data, ...) +{ + char textbuffer[MAXBUF]; + va_list argsPtr; + + va_start(argsPtr, data); + vsnprintf(textbuffer, MAXBUF, data, argsPtr); + va_end(argsPtr); + + this->WriteTo(dest, std::string(textbuffer)); +} + +void userrec::WriteTo(userrec *dest, const std::string &data) +{ + dest->WriteFrom(this, data); +} + + +void userrec::WriteCommon(const char* text, ...) +{ + char textbuffer[MAXBUF]; + va_list argsPtr; + + if (this->registered != REG_ALL) + return; + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + + this->WriteCommon(std::string(textbuffer)); +} + +void userrec::WriteCommon(const std::string &text) +{ + bool sent_to_at_least_one = false; + + if (this->registered != REG_ALL) + return; + + uniq_id++; + + for (std::vector::const_iterator v = this->chans.begin(); v != this->chans.end(); v++) + { + ucrec *n = *v; + if (n->channel) + { + CUList *ulist= n->channel->GetUsers(); + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + 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; + } + } + } + } + + /* + * 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->WriteFrom(this,std::string(text)); + } +} + + +/* write a formatted string to all users who share at least one common + * channel, NOT including the source user e.g. for use in QUIT + */ + +void userrec::WriteCommonExcept(const char* text, ...) +{ + char textbuffer[MAXBUF]; + va_list argsPtr; + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + + this->WriteCommonExcept(std::string(textbuffer)); +} + +void userrec::WriteCommonExcept(const std::string &text) +{ + bool quit_munge = true; + char oper_quit[MAXBUF]; + char textbuffer[MAXBUF]; + + strlcpy(textbuffer, text.c_str(), MAXBUF); + + if (this->registered != REG_ALL) + return; + + uniq_id++; + + /* 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 (Config->HideSplits) { - if (newnick) + char* check = textbuffer + 6; + + if (!strncasecmp(textbuffer, "QUIT :",6)) { - strlcpy(nick,newnick,MAXBUF-1); + std::stringstream split(check); + std::string server_one; + std::string server_two; + + split >> server_one; + split >> server_two; + + if ((FindServerName(server_one)) && (FindServerName(server_two))) + { + strlcpy(oper_quit,textbuffer,MAXQUIT); + strlcpy(check,"*.net *.split",MAXQUIT); + quit_munge = true; + } } + } - if (user->registered == 7) + if ((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* pars[1]; - - pars[0] = nick; - std::string cmd = "NICK"; - ServerInstance->Parser->CallHandler(cmd,pars,1,user); + 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; } } + + for (std::vector::const_iterator v = this->chans.begin(); v != this->chans.end(); v++) + { + ucrec* n = *v; + if (n->channel) + { + CUList *ulist= n->channel->GetUsers(); + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + if (this != i->second) + { + 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)); + } + } + } + } + } + +} + +void userrec::WriteWallOps(const std::string &text) +{ + /* Does nothing if theyre not opered */ + if ((!*this->oper) && (IS_LOCAL(this))) + return; + + std::string wallop = "WALLOPS :"; + wallop.append(text); + + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + { + userrec* t = *i; + if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS])) + this->WriteTo(t,wallop); + } } + +void userrec::WriteWallOps(const char* text, ...) +{ + char textbuffer[MAXBUF]; + va_list argsPtr; + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, 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 old algorithm in 1.0 for this was relatively inefficient, iterating over + * 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 + * 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) +{ + if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL)) + return false; + + /* Outer loop */ + for (std::vector::const_iterator 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; + } + } + return false; +} + +int userrec::CountChannels() +{ + int z = 0; + for (std::vector::const_iterator i = this->chans.begin(); i != this->chans.end(); i++) + if ((*i)->channel) + z++; + return z; +} + +bool userrec::ChangeName(const char* gecos) +{ + if (IS_LOCAL(this)) + { + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(this,gecos)); + if (MOD_RESULT) + return false; + FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos)); + } + strlcpy(this->fullname,gecos,MAXGECOS+1); + return true; +} + +bool userrec::ChangeDisplayedHost(const char* host) +{ + if (IS_LOCAL(this)) + { + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,host)); + if (MOD_RESULT) + return false; + FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,host)); + } + strlcpy(this->dhost,host,63); + + if (IS_LOCAL(this)) + this->WriteServ("396 %s %s :is now your hidden host",this->nick,this->dhost); + + return true; +} +