Revert "Remove user no longer being watched, not the quitting one. Fix from Szymek...

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 386a64b82069583aec256c27667052e41900d244..848f2a1eb23f1c60c78da4653b7bf8bbc6768f41 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -98,14 +98,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);
        }
@@ -216,7 +215,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 +241,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 +510,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 +759,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<std::string, bool>;
+                       AllowedOperCommands = new std::set<std::string>;
+
+               if (AllowedPrivs)
+                       AllowedPrivs->clear();
+               else
+                       AllowedPrivs = new std::set<std::string>;
 
                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 +804,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 +859,12 @@ void User::UnOper()
                        AllowedOperCommands = NULL;
                }
 
+               if (AllowedPrivs)
+               {
+                       delete AllowedPrivs;
+                       AllowedPrivs = NULL;
+               }
+
                AllowedUserModes.reset();
                AllowedChanModes.reset();
        }
@@ -1164,7 +1232,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];
 
@@ -1188,12 +1256,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;
                        }
@@ -1603,13 +1665,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));
        }
 
+       FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,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 +1702,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);