Visibility = NULL;
ip = NULL;
MyClass = NULL;
- io = NULL;
- AllowedUserModes = NULL;
- AllowedChanModes = NULL;
- AllowedOperCommands = NULL;
+ AllowedPrivs = AllowedOperCommands = NULL;
chans.clear();
invites.clear();
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();
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')];
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;
void User::Oper(const std::string &opertype, const std::string &opername)
{
- char* mycmd;
- char* savept;
- char* savept2;
-
if (this->IsModeSet('o'))
this->UnOper();
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<std::string, bool>;
+ AllowedOperCommands = new std::set<std::string>;
- if (!AllowedChanModes)
- AllowedChanModes = new bool[64];
-
- if (!AllowedUserModes)
- AllowedUserModes = new bool[64];
+ if (AllowedPrivs)
+ AllowedPrivs->clear();
+ else
+ AllowedPrivs = new std::set<std::string>;
- 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(mycmd);
+ }
+
+ irc::spacesepstream PrivList(iter_operclass->second.privs);
+ while (PrivList.GetToken(mypriv))
{
- this->AllowedOperCommands->insert(std::make_pair(mycmd, true));
- mycmd = strtok_r(NULL," ",&savept2);
+ this->AllowedPrivs->insert(mypriv);
}
- 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);
+ 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
{
}
}
}
- myclass = strtok_r(NULL," ",&savept);
}
- free(Classes);
}
FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
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();
}
}
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)
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;
}
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)
{
FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost));
}
- if (this->ServerInstance->Config->CycleHosts)
+ 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 */
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++)
{
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++)
{
projects / user / henk / code / inspircd.git / blobdiff