X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=851e0a1d66e8b891b520064553e28c1525819ea8;hb=c681081852491531151e96b4df31f6547755a390;hp=b749b4788f9aab419b2ee497895fcfaeaa293610;hpb=29237b699f47488962133b54b0b3d1085f3c068d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index b749b4788..851e0a1d6 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -90,6 +90,12 @@ std::string User::ProcessNoticeMasks(const char *sm) *c++; } + std::string s = this->FormatNoticeMasks(); + if (s.length() == 0) + { + this->modes[UM_SNOMASK] = false; + } + return output; } @@ -98,14 +104,13 @@ void User::StartDNSLookup() try { bool cached = false; - const char* sip = this->GetIPString(false); + const char* sip = this->GetIPString(); UserResolver *res_reverse; - /* Special case for 4in6 (Have i mentioned i HATE 4in6?) */ - if (!strncmp(sip, "0::ffff:", 8)) - res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached); - else - res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached); + QueryType resolvtype = strchr(sip, ':') ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4; + // when GetProtocolFamily() works correctly with 4in6, this can be replaced by + // this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6; + res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, cached); this->ServerInstance->AddResolver(res_reverse, cached); } @@ -158,16 +163,28 @@ void User::SetMode(unsigned char m, bool value) modes[m-65] = value; } -const char* User::FormatModes() +const char* User::FormatModes(bool showparameters) { static char data[MAXBUF]; + std::string params; int offset = 0; - for (int n = 0; n < 64; n++) + + for (unsigned char n = 0; n < 64; n++) { if (modes[n]) - data[offset++] = n+65; + { + data[offset++] = n + 65; + ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER); + if (showparameters && mh && mh->GetNumParams(true)) + { + std::string p = mh->GetUserParameter(this); + if (p.length()) + params.append(" ").append(p); + } + } } data[offset] = 0; + strlcat(data, params.c_str(), MAXBUF); return data; } @@ -192,22 +209,18 @@ void User::DecrementModes() User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance) { server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName); - reset_due = ServerInstance->Time(); age = ServerInstance->Time(); Penalty = 0; - lines_in = lastping = signon = idle_lastmsg = nping = registered = 0; + lastping = signon = idle_lastmsg = nping = registered = 0; bytes_in = bytes_out = cmds_in = cmds_out = 0; - quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false; + quietquit = quitting = exempt = haspassed = dns_done = false; fd = -1; recvq.clear(); sendq.clear(); Visibility = NULL; ip = NULL; MyClass = NULL; - io = NULL; - AllowedUserModes = NULL; - AllowedChanModes = NULL; - AllowedOperCommands = NULL; + AllowedPrivs = AllowedOperCommands = NULL; chans.clear(); invites.clear(); @@ -233,22 +246,17 @@ User::~User() this->MyClass->RefCount--; ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount); } + if (this->AllowedOperCommands) { delete AllowedOperCommands; AllowedOperCommands = NULL; } - if (this->AllowedUserModes) - { - delete[] AllowedUserModes; - AllowedUserModes = NULL; - } - - if (this->AllowedChanModes) + if (this->AllowedPrivs) { - delete[] AllowedChanModes; - AllowedChanModes = NULL; + delete AllowedPrivs; + AllowedPrivs = NULL; } this->InvalidateCache(); @@ -395,7 +403,7 @@ const std::string& User::GetFullRealHost() bool User::IsInvited(const irc::string &channel) { - time_t now = time(NULL); + time_t now = ServerInstance->Time(); InvitedList::iterator safei; for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i) { @@ -417,7 +425,7 @@ bool User::IsInvited(const irc::string &channel) InvitedList* User::GetInviteList() { - time_t now = time(NULL); + time_t now = ServerInstance->Time(); /* Weed out expired invites here. */ InvitedList::iterator safei; for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i) @@ -435,7 +443,7 @@ InvitedList* User::GetInviteList() void User::InviteTo(const irc::string &channel, time_t invtimeout) { - time_t now = time(NULL); + time_t now = ServerInstance->Time(); 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) { @@ -472,8 +480,7 @@ bool User::HasModePermission(unsigned char mode, ModeType type) if (!IS_OPER(this)) return false; - if (!AllowedUserModes || !AllowedChanModes) - return false; + if (mode < 'A' || mode > ('A' + 64)) return false; return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')]; @@ -508,6 +515,49 @@ bool User::HasPermission(const std::string &command) return false; } + +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)"); + return true; + } + + if (!IS_OPER(this)) + { + 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; + } + + if (!AllowedPrivs) + { + 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; +} + bool User::AddBuffer(const std::string &a) { std::string::size_type start = 0; @@ -562,7 +612,7 @@ bool User::AddBuffer(const std::string &a) } } - if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax())) + 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()); @@ -627,7 +677,7 @@ void User::AddWriteBuf(const std::string &data) if (this->quitting) return; - if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax())) + if (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 @@ -697,10 +747,6 @@ void User::FlushWriteBuf() void User::Oper(const std::string &opertype, const std::string &opername) { - char* mycmd; - char* savept; - char* savept2; - if (this->IsModeSet('o')) this->UnOper(); @@ -718,53 +764,57 @@ void User::Oper(const std::string &opertype, const std::string &opername) opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str()); if (iter_opertype != ServerInstance->Config->opertypes.end()) { - if (AllowedOperCommands) AllowedOperCommands->clear(); else - AllowedOperCommands = new std::map; + AllowedOperCommands = new std::set; - if (!AllowedChanModes) - AllowedChanModes = new bool[64]; - - if (!AllowedUserModes) - AllowedUserModes = new bool[64]; + if (AllowedPrivs) + AllowedPrivs->clear(); + else + AllowedPrivs = new std::set; - memset(AllowedUserModes, 0, 64); - memset(AllowedChanModes, 0, 64); + AllowedUserModes.reset(); + AllowedChanModes.reset(); + this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. - char* Classes = strdup(iter_opertype->second); - char* myclass = strtok_r(Classes," ",&savept); - while (myclass) + std::string myclass, mycmd, mypriv; + irc::spacesepstream Classes(iter_opertype->second); + while (Classes.GetToken(myclass)) { - operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass); + operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str()); if (iter_operclass != ServerInstance->Config->operclass.end()) { - char* CommandList = strdup(iter_operclass->second.commandlist); - mycmd = strtok_r(CommandList," ",&savept2); - while (mycmd) + /* Process commands */ + irc::spacesepstream CommandList(iter_operclass->second.commandlist); + while (CommandList.GetToken(mycmd)) { - this->AllowedOperCommands->insert(std::make_pair(mycmd, true)); - mycmd = strtok_r(NULL," ",&savept2); + this->AllowedOperCommands->insert(mycmd); } - free(CommandList); - this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. + + irc::spacesepstream PrivList(iter_operclass->second.privs); + while (PrivList.GetToken(mypriv)) + { + this->AllowedPrivs->insert(mypriv); + } + for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c) { if (*c == '*') { - memset(this->AllowedUserModes, (int)(true), 64); + this->AllowedUserModes.set(); } 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); + this->AllowedChanModes.set(); } else { @@ -772,9 +822,7 @@ void User::Oper(const std::string &opertype, const std::string &opername) } } } - myclass = strtok_r(NULL," ",&savept); } - free(Classes); } FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername)); @@ -815,17 +863,15 @@ void User::UnOper() delete AllowedOperCommands; AllowedOperCommands = NULL; } - if (AllowedUserModes) - { - delete[] AllowedUserModes; - AllowedUserModes = NULL; - } - if (AllowedChanModes) + + if (AllowedPrivs) { - delete[] AllowedChanModes; - AllowedChanModes = NULL; + delete AllowedPrivs; + AllowedPrivs = NULL; } + AllowedUserModes.reset(); + AllowedChanModes.reset(); } } @@ -869,10 +915,10 @@ void User::CheckClass() this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout; } -bool User::CheckLines() +bool User::CheckLines(bool doZline) { - const char* check[] = { "G" , "K", NULL }; - + const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL }; + if (!this->exempt) { for (int n = 0; check[n]; ++n) @@ -972,8 +1018,8 @@ User* User::UpdateNickHash(const char* New) return NULL; /* doesnt exist */ User* olduser = oldnick->second; - (*(ServerInstance->Users->clientlist))[New] = olduser; ServerInstance->Users->clientlist->erase(oldnick); + (*(ServerInstance->Users->clientlist))[New] = olduser; return olduser; } @@ -1191,7 +1237,7 @@ const char* User::GetCIDRMask(int range) return ""; // unused, but oh well } -const char* User::GetIPString(bool translate4in6) +const char* User::GetIPString() { static char buf[40]; @@ -1215,12 +1261,6 @@ const char* User::GetIPString(bool translate4in6) { strlcpy(&temp[1], buf, sizeof(temp) - 1); *temp = '0'; - if (translate4in6 && !strncmp(temp, "0::ffff:", 8)) - { - this->cachedip = temp + 8; - return temp + 8; - } - this->cachedip = temp; return temp; } @@ -1268,14 +1308,14 @@ void User::Write(std::string text) return; } - if (this->io) + if (this->GetIOHook()) { /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to * implement their own buffering mechanisms */ try { - this->io->OnRawSocketWrite(this->fd, text.data(), text.length()); + this->GetIOHook()->OnRawSocketWrite(this->fd, text.data(), text.length()); } catch (CoreException& modexcept) { @@ -1630,10 +1670,14 @@ bool User::ChangeDisplayedHost(const char* shost) FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost)); if (MOD_RESULT) return false; - FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost)); } - if (this->ServerInstance->Config->CycleHosts) + FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost)); + + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this)); + + if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) this->WriteCommonExcept("QUIT :Changing hosts"); /* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */ @@ -1641,7 +1685,7 @@ bool User::ChangeDisplayedHost(const char* shost) this->InvalidateCache(); - if (this->ServerInstance->Config->CycleHosts) + if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) { for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) { @@ -1660,17 +1704,20 @@ bool User::ChangeDisplayedHost(const char* shost) bool User::ChangeIdent(const char* newident) { - if (!this->ident.compare(newident)) + if (this->ident == newident) return true; - if (this->ServerInstance->Config->CycleHosts) + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this)); + + if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) this->WriteCommonExcept("%s","QUIT :Changing ident"); this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1); this->InvalidateCache(); - if (this->ServerInstance->Config->CycleHosts) + if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) { for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) {