X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=b3e6ef58f32b3efa082b4c8c0bc3f120b250e4b0;hb=36cb60f872712e8e5a59df74b5b36177addc4248;hp=48902835952541090271bbc1878d663fc46d188f;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 489028359..b3e6ef58f 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -245,6 +245,8 @@ User::~User() { this->MyClass->RefCount--; ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount); + if (MyClass->RefCount == 0) + delete MyClass; } if (this->AllowedOperCommands) @@ -330,7 +332,7 @@ void User::CloseSocket() } } -const std::string& User::GetFullHost() +const std::string User::GetFullHost() { if (!this->cached_fullhost.empty()) return this->cached_fullhost; @@ -379,7 +381,7 @@ int User::ReadData(void* buffer, size_t size) } -const std::string& User::GetFullRealHost() +const std::string User::GetFullRealHost() { if (!this->cached_fullrealhost.empty()) return this->cached_fullrealhost; @@ -483,7 +485,7 @@ bool User::HasModePermission(unsigned char mode, ModeType type) if (mode < 'A' || mode > ('A' + 64)) return false; return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')]; - + } bool User::HasPermission(const std::string &command) @@ -518,7 +520,6 @@ bool User::HasPermission(const std::string &command) bool User::HasPrivPermission(const std::string &privstr, bool noisy) { - ServerInstance->Logs->Log("PRIVS", DEBUG, "Checking if I have " + privstr); if (!IS_LOCAL(this)) { ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)"); @@ -529,7 +530,6 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy) { if (noisy) this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str()); - ServerInstance->Logs->Log("PRIVS", DEBUG, "Not oper (no)"); return false; } @@ -537,24 +537,20 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy) { if (noisy) this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str()); - ServerInstance->Logs->Log("PRIVS", DEBUG, "No privs(?) (no)"); return false; } if (AllowedPrivs->find(privstr) != AllowedPrivs->end()) { - ServerInstance->Logs->Log("PRIVS", DEBUG, "I do have it."); return true; } else if (AllowedPrivs->find("*") != AllowedPrivs->end()) { - ServerInstance->Logs->Log("PRIVS", DEBUG, "I allow all."); return true; } if (noisy) this->WriteServ("NOTICE %s :Oper type %s does not have access to priv %s", this->nick.c_str(), this->oper.c_str(), privstr.c_str()); - ServerInstance->Logs->Log("PRIVS", DEBUG, "I don't have it..."); return false; } @@ -615,7 +611,7 @@ bool User::AddBuffer(const std::string &a) if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax()) { ServerInstance->Users->QuitUser(this, "RecvQ exceeded"); - ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax()); + ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax()); return false; } @@ -674,10 +670,7 @@ std::string User::GetBuffer() void User::AddWriteBuf(const std::string &data) { - if (this->quitting) - return; - - if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax()) + if (!this->quitting && this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax()) { /* * Fix by brain - Set the error text BEFORE calling, because @@ -685,10 +678,13 @@ void User::AddWriteBuf(const std::string &data) * to repeatedly add the text to the sendq! */ ServerInstance->Users->QuitUser(this, "SendQ exceeded"); - ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax()); + ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax()); return; } + // We still want to append data to the sendq of a quitting user, + // e.g. their ERROR message that says 'closing link' + 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 @@ -761,6 +757,13 @@ void User::Oper(const std::string &opertype, const std::string &opername) this->oper.assign(opertype, 0, 512); ServerInstance->Users->all_opers.push_back(this); + /* + * This might look like it's in the wrong place. + * It is *not*! + * + * For multi-network servers, we may not have the opertypes of the remote server, but we still want to mark the user as an oper of that type. + * -- w00t + */ opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str()); if (iter_opertype != ServerInstance->Config->opertypes.end()) { @@ -779,7 +782,7 @@ void User::Oper(const std::string &opertype, const std::string &opername) this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. std::string myclass, mycmd, mypriv; - irc::spacesepstream Classes(iter_opertype->second); + irc::spacesepstream Classes(iter_opertype->second.c_str()); while (Classes.GetToken(myclass)) { operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str()); @@ -839,6 +842,7 @@ void User::UnOper() */ this->oper.clear(); + /* Remove all oper only modes from the user when the deoper - Bug #466*/ std::string moderemove("-"); @@ -849,12 +853,13 @@ void User::UnOper() moderemove += letter; } + std::vector parameters; parameters.push_back(this->nick); parameters.push_back(moderemove); ServerInstance->Parser->CallHandler("MODE", parameters, this); - + /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */ ServerInstance->Users->all_opers.remove(this); @@ -872,6 +877,7 @@ void User::UnOper() AllowedUserModes.reset(); AllowedChanModes.reset(); + this->modes[UM_OPERATOR] = 0; } } @@ -894,7 +900,7 @@ void User::CheckClass() { ConnectClass* a = this->MyClass; - if ((!a) || (a->GetType() == CC_DENY)) + if ((!a) || (a->type == CC_DENY)) { ServerInstance->Users->QuitUser(this, "Unauthorised connection"); return; @@ -902,13 +908,13 @@ void User::CheckClass() else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal())) { ServerInstance->Users->QuitUser(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()); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); return; } else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal())) { ServerInstance->Users->QuitUser(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()); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); return; } @@ -918,7 +924,7 @@ void User::CheckClass() bool User::CheckLines(bool doZline) { const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL }; - + if (!this->exempt) { for (int n = 0; check[n]; ++n) @@ -948,7 +954,7 @@ void User::FullConnect() * Don't remove this! -- w00t */ 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! */ @@ -1038,8 +1044,12 @@ bool User::ForceNickChange(const char* newnick) this->InvalidateCache(); + this->Extend("NICKForced", "Enabled"); + FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick)); + this->Shrink("NICKForced"); + if (MOD_RESULT) { ServerInstance->stats->statsCollisions++; @@ -1053,7 +1063,9 @@ bool User::ForceNickChange(const char* newnick) std::vector parameters; nickhandler->HandleInternal(1, dummy); parameters.push_back(newnick); + this->Extend("NICKForced", "Enabled"); bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS); + this->Shrink("NICKForced"); nickhandler->HandleInternal(0, dummy); return result; } @@ -1154,7 +1166,7 @@ const char* User::GetCIDRMask(int range) sockaddr_in6* sin; int i, bytestozero, extrabits; char buffer[40]; - + if(range > 128) throw "CIDR mask width greater than address width (IPv6, 128 bit)"; @@ -1167,12 +1179,12 @@ const char* User::GetCIDRMask(int range) * which must be set to zero. */ bytestozero = (128 - range) / 8; - + /* Some of the least significant bits of the next most significant byte may also have to * be zeroed. The number of bits is the remainder of the above division. */ extrabits = (128 - range) % 8; - + /* Populate our working struct with the parts of the user's IP which are required in the * final CIDR mask. Set all the subsequent bytes to zero. * (16 - bytestozero) is the number of bytes which must be populated with actual IP data. @@ -1181,13 +1193,13 @@ const char* User::GetCIDRMask(int range) { v6.s6_addr[i] = sin->sin6_addr.s6_addr[i]; } - + /* And zero all the remaining bytes in the IP. */ for(; i < 16; i++) { v6.s6_addr[i] = 0; } - + /* And finally, zero the extra bits required. */ v6.s6_addr[15 - bytestozero] = (v6.s6_addr[15 - bytestozero] >> extrabits) << extrabits; @@ -1264,7 +1276,7 @@ const char* User::GetIPString() this->cachedip = temp; return temp; } - + this->cachedip = buf; return buf; } @@ -1281,7 +1293,7 @@ const char* User::GetIPString() default: break; } - + // Unreachable, probably return ""; } @@ -1583,9 +1595,6 @@ void User::WriteCommonExcept(const std::string &text) void User::WriteWallOps(const std::string &text) { - if (!IS_LOCAL(this)) - return; - std::string wallop("WALLOPS :"); wallop.append(text); @@ -1829,10 +1838,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name) { ConnectClass* c = *i; - if (c->GetDisabled()) - continue; // can't possibly match, removed from conf - - if (explicit_name == c->GetName()) + if (explicit_name == c->name) { ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str()); found = c; @@ -1845,24 +1851,17 @@ ConnectClass* User::SetClass(const std::string &explicit_name) { ConnectClass* c = *i; - if (c->GetType() == CC_ALLOW) + if (c->type == CC_ALLOW) { - ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str()); + ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.c_str(), c->GetPort(), c->GetName().c_str()); } else { ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str()); } - /* if it's disabled, we can't match this one. */ - if (c->GetDisabled()) - { - ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled"); - continue; - } - /* check if host matches.. */ - if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && + if (c->GetHost().length() && !InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL)) { ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str()); @@ -1873,7 +1872,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name) * deny change if change will take class over the limit check it HERE, not after we found a matching class, * because we should attempt to find another class if this one doesn't match us. -- w00t */ - if (c->limit && (c->RefCount + 1 >= c->limit)) + if (c->limit && (c->RefCount >= c->limit)) { ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit); continue; @@ -1910,6 +1909,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name) return this->MyClass; this->MyClass->RefCount--; ServerInstance->Logs->Log("USERS", DEBUG, "Untying user from connect class -- refcount: %lu", this->MyClass->RefCount); + if (MyClass->RefCount == 0) + delete MyClass; } this->MyClass = found; @@ -1958,6 +1959,10 @@ void User::PurgeEmptyChannels() chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name); if (i2 != ServerInstance->chanlist->end()) { + int MOD_RESULT = 0; + FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(i2->second)); + if (MOD_RESULT == 1) + continue; // delete halted by module FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); delete i2->second; ServerInstance->chanlist->erase(i2); @@ -2038,6 +2043,26 @@ void User::DecreasePenalty(int decrease) this->Penalty -= decrease; } +void FakeUser::SetFakeServer(std::string name) +{ + this->nick = name; + this->server = nick.c_str(); +} + +const std::string FakeUser::GetFullHost() +{ + if (*ServerInstance->Config->HideWhoisServer) + return ServerInstance->Config->HideWhoisServer; + return nick; +} + +const std::string FakeUser::GetFullRealHost() +{ + if (*ServerInstance->Config->HideWhoisServer) + return ServerInstance->Config->HideWhoisServer; + return nick; +} + VisData::VisData() { } @@ -2051,3 +2076,28 @@ bool VisData::VisibleTo(User* user) return true; } + +ConnectClass::ConnectClass(char t, const std::string& mask) + : type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1) +{ +} + +ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent) + : type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1) +{ +} + +void ConnectClass::Update(const ConnectClass* src) +{ + name = src->name; + registration_timeout = src->registration_timeout; + host = src->host; + pingtime = src->pingtime; + pass = src->pass; + hash = src->hash; + sendqmax = src->sendqmax; + recvqmax = src->recvqmax; + maxlocal = src->maxlocal; + maxglobal = src->maxglobal; + limit = src->limit; +}