X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=784783086ca21f8bc3df288dbca0d8478057fbe7;hb=30b7a1bf7fb0b422a6fd674f0cce95b3b0f92673;hp=386a64b82069583aec256c27667052e41900d244;hpb=a95616f608aefc38250a620087639dcc6407567f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 386a64b82..784783086 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -216,7 +216,7 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance Visibility = NULL; ip = NULL; MyClass = NULL; - AllowedOperCommands = NULL; + AllowedPrivs = AllowedOperCommands = NULL; chans.clear(); invites.clear(); @@ -242,12 +242,19 @@ 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->AllowedPrivs) + { + delete AllowedPrivs; + AllowedPrivs = NULL; + } + this->InvalidateCache(); this->DecrementModes(); @@ -504,6 +511,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; @@ -710,28 +760,40 @@ 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 (AllowedPrivs) + AllowedPrivs->clear(); + else + AllowedPrivs = new std::set; AllowedUserModes.reset(); AllowedChanModes.reset(); this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. - std::string myclass, mycmd; + 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.c_str()); if (iter_operclass != ServerInstance->Config->operclass.end()) { + /* Process commands */ irc::spacesepstream CommandList(iter_operclass->second.commandlist); while (CommandList.GetToken(mycmd)) { - this->AllowedOperCommands->insert(std::make_pair(mycmd, true)); + this->AllowedOperCommands->insert(mycmd); } + + 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 == '*') @@ -743,6 +805,7 @@ void User::Oper(const std::string &opertype, const std::string &opername) this->AllowedUserModes[*c - 'A'] = true; } } + for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c) { if (*c == '*') @@ -797,6 +860,12 @@ void User::UnOper() AllowedOperCommands = NULL; } + if (AllowedPrivs) + { + delete AllowedPrivs; + AllowedPrivs = NULL; + } + AllowedUserModes.reset(); AllowedChanModes.reset(); } @@ -1609,7 +1678,7 @@ bool User::ChangeDisplayedHost(const char* shost) int MOD_RESULT = 0; FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this)); - if (this->ServerInstance->Config->CycleHosts) + 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 */ @@ -1639,10 +1708,10 @@ bool User::ChangeIdent(const char* newident) if (this->ident == newident) return true; - int MOD_RESULT = 0; + int MOD_RESULT = 0; FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this)); - if (this->ServerInstance->Config->CycleHosts) + if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT) this->WriteCommonExcept("%s","QUIT :Changing ident"); this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);