]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree.cpp
userrec::UpdateNickHash(), userrec::ForceNickChange(), userrec::FullConnect()
[user/henk/code/inspircd.git] / src / modules / m_spanningtree.cpp
index 0725d7b51767dab0ea2d9c40a8b27b7418242b6c..1e908f07b139ce063d5dfccfa4b50358e811c58b 100644 (file)
@@ -139,6 +139,8 @@ extern std::vector<ZLine> pzlines;
 extern std::vector<QLine> pqlines;
 extern std::vector<ELine> pelines;
 
+std::vector<std::string> ValidIPs;
+
 class UserManager : public classbase
 {
        uid_hash uids;
@@ -186,6 +188,7 @@ class UserManager : public classbase
        }
 };
 
+
 /* Each server in the tree is represented by one class of
  * type TreeServer. A locally connected TreeServer can
  * have a class of type TreeSocket associated with it, for
@@ -327,7 +330,7 @@ class TreeServer : public classbase
                        userrec* a = (userrec*)*n;
                        log(DEBUG,"Kill %s fd=%d",a->nick,a->fd);
                        if (!IS_LOCAL(a))
-                               kill_link(a,reason_s);
+                               userrec::QuitUser(a,reason_s);
                }
                return time_to_die.size();
        }
@@ -1026,7 +1029,7 @@ class TreeSocket : public InspSocket
                                                         */
                                                        mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER);
 
-                                                       if ((mh->GetNumParams(adding) > 0) && (!mh->IsListMode()))
+                                                       if ((mh) && (mh->GetNumParams(adding) > 0) && (!mh->IsListMode()))
                                                        {
                                                                /* We only want to do special things to
                                                                 * modes with parameters, we are going to rewrite
@@ -1145,19 +1148,28 @@ class TreeSocket : public InspSocket
 
                        if (to_keep.length())
                        {
-                               n = 0;
+                               unsigned int n = 2;
+                               unsigned int q = 0;
                                modelist[0] = params[0].c_str();
                                modelist[1] = to_keep.c_str();
 
-                               for (unsigned int q = 2; (q < params.size()) && (q < 64); q++)
-                                               modelist[q] = params_to_keep[n++].c_str();
+                               if (params_to_keep.size() > 2)
+                               {
+                                       for (q = 2; (q < params_to_keep.size()) && (q < 64); q++)
+                                       {
+                                               log(DEBUG,"Item %d of %d", q, params_to_keep.size());
+                                               modelist[n++] = params_to_keep[q].c_str();
+                                       }
+                               }
 
                                if (smode)
                                {
+                                       log(DEBUG,"Send mode");
                                        Srv->SendMode(modelist, n+2, who);
                                }
                                else
                                {
+                                       log(DEBUG,"Send mode client");
                                        Srv->CallCommandHandler("MODE", modelist, n+2, who);
                                }
 
@@ -1326,11 +1338,11 @@ class TreeSocket : public InspSocket
                                        userrec* user = Srv->FindNick(source);
                                        if (!user)
                                        {
-                                               WriteChannelWithServ(source.c_str(), c, "TOPIC %s :%s", c->name, c->topic);
+                                               c->WriteChannelWithServ(source.c_str(), "TOPIC %s :%s", c->name, c->topic);
                                        }
                                        else
                                        {
-                                               WriteChannel(c, user, "TOPIC %s :%s", c->name, c->topic);
+                                               c->WriteChannel(user, "TOPIC %s :%s", c->name, c->topic);
                                                nsource = user->server;
                                        }
                                        /* all done, send it on its way */
@@ -1356,7 +1368,7 @@ class TreeSocket : public InspSocket
                memset(&mode_users,0,sizeof(mode_users));
                mode_users[0] = first;
                mode_users[1] = modestring;
-               strcpy(first,"+");
+               strcpy(modestring,"+");
                unsigned int modectr = 2;
                
                userrec* who = NULL;
@@ -1418,7 +1430,7 @@ class TreeSocket : public InspSocket
                                who = Srv->FindNick(usr);
                                if (who)
                                {
-                                       Srv->JoinUserToChannel(who,channel,key);
+                                       chanrec::JoinUser(who, channel.c_str(), true, key);
                                        if (modectr >= (MAXMODES-1))
                                        {
                                                /* theres a mode for this user. push them onto the mode queue, and flush it
@@ -1431,8 +1443,9 @@ class TreeSocket : public InspSocket
                                                        Srv->SendMode((const char**)mode_users,modectr,who);
                                                        if (ourTS != TS)
                                                        {
-                                                               log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us,ourTS,TS);
+                                                               log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
                                                                us->age = TS;
+                                                               ourTS = TS;
                                                        }
                                                }
                                                else
@@ -1449,6 +1462,7 @@ class TreeSocket : public InspSocket
                                                                        params.push_back(ConvToStr(us->age));
                                                                }
                                                                params.push_back(mode_users[x]);
+                                                               
                                                        }
                                                        // tell everyone to bounce the modes. bad modes, bad!
                                                        DoOneToMany(Srv->GetServerName(),"FMODE",params);
@@ -1462,7 +1476,7 @@ class TreeSocket : public InspSocket
                /* there werent enough modes built up to flush it during FJOIN,
                 * or, there are a number left over. flush them out.
                 */
-               if ((modectr > 2) && (who))
+               if ((modectr > 2) && (who) && (us))
                {
                        if (ourTS >= TS)
                        {
@@ -1470,8 +1484,9 @@ class TreeSocket : public InspSocket
                                Srv->SendMode((const char**)mode_users,modectr,who);
                                if (ourTS != TS)
                                {
-                                       log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us,ourTS,TS);
+                                       log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
                                        us->age = TS;
+                                       ourTS = TS;
                                }
                        }
                        else
@@ -1524,7 +1539,7 @@ class TreeSocket : public InspSocket
                        return true;
                }
                // NICK age nick host dhost ident +modes ip :gecos
-               //   0   123  4 56   7
+               //       0    1   2     3     4      5   6     7
                time_t age = atoi(params[0].c_str());
                
                /* This used to have a pretty craq'y loop doing the same thing,
@@ -1560,9 +1575,13 @@ class TreeSocket : public InspSocket
                {
                        clientlist[tempnick]->modes[(*v)-65] = 1;
                }
-               insp_aton(params[6].c_str(),&clientlist[tempnick]->ip4);
 
-               WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, insp_ntoa(clientlist[tempnick]->ip4));
+               if (params[6].find_first_of(":") != std::string::npos)
+                       clientlist[tempnick]->SetSockAddr(AF_INET6, params[6].c_str(), 0);
+               else
+                       clientlist[tempnick]->SetSockAddr(AF_INET, params[6].c_str(), 0);
+
+               WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, clientlist[tempnick]->GetIPString());
 
                params[7] = ":" + params[7];
                DoOneToAllButSender(source,"NICK",params,source);
@@ -1767,7 +1786,7 @@ class TreeSocket : public InspSocket
                {
                        if (u->second->registered == REG_ALL)
                        {
-                               snprintf(data,MAXBUF,":%s NICK %lu %s %s %s %s +%s %s :%s",u->second->server,(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->FormatModes(),insp_ntoa(u->second->ip4),u->second->fullname);
+                               snprintf(data,MAXBUF,":%s NICK %lu %s %s %s %s +%s %s :%s",u->second->server,(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->FormatModes(),u->second->GetIPString(),u->second->fullname);
                                this->WriteLine(data);
                                if (*u->second->oper)
                                {
@@ -1995,7 +2014,11 @@ class TreeSocket : public InspSocket
                                /* This is not required as one is sent in OnUserPostNick below
                                 */
                                //DoOneToMany(u->nick,"NICK",par);
-                               Srv->ChangeUserNick(u,params[1]);
+                               if (!u->ForceNickChange(params[1].c_str()))
+                               {
+                                       userrec::QuitUser(u, "Nickname collision");
+                                       return true;
+                               }
                                u->age = atoi(params[2].c_str());
                        }
                }
@@ -2011,7 +2034,7 @@ class TreeSocket : public InspSocket
 
                if (u)
                {
-                       Srv->JoinUserToChannel(u,params[1],"");
+                       chanrec::JoinUser(u, params[1].c_str(), false);
                        DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
                }
                return true;
@@ -2059,7 +2082,7 @@ class TreeSocket : public InspSocket
                        params[1] = ":" + params[1];
                        DoOneToAllButSender(prefix,"KILL",params,sourceserv);
                        ::Write(who->fd, ":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str());
-                       Srv->QuitUser(who,reason);
+                       userrec::QuitUser(who,reason);
                }
                return true;
        }
@@ -2877,7 +2900,9 @@ class TreeSocket : public InspSocket
                                                chanrec* chan = Srv->FindChannel(params[0]);
                                                if (user && chan)
                                                {
-                                                       server_kick_channel(user,chan,(char*)params[2].c_str(),false);
+                                                       if (!chan->ServerKickUser(user, params[2].c_str(), false))
+                                                               /* Yikes, the channels gone! */
+                                                               delete chan;
                                                }
                                        }
                                        if (this->InboundServerName != "")
@@ -2944,11 +2969,11 @@ class TreeSocket : public InspSocket
                                                                p.push_back(prefix);
                                                                p.push_back("Nickname collision");
                                                                DoOneToMany(Srv->GetServerName(),"KILL",p);
-                                                               Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
+                                                               userrec::QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
                                                                userrec* y = Srv->FindNick(prefix);
                                                                if (y)
                                                                {
-                                                                       Srv->QuitUser(y,"Nickname collision");
+                                                                       userrec::QuitUser(y,"Nickname collision");
                                                                }
                                                                return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
                                                        }
@@ -3031,39 +3056,99 @@ class TreeSocket : public InspSocket
                 * IPs for which we don't have a link block.
                 */
                bool found = false;
-               char resolved_host[MAXBUF];
-               vector<Link>::iterator i;
-               for (i = LinkBlocks.begin(); i != LinkBlocks.end(); i++)
+
+               found = (std::find(ValidIPs.begin(), ValidIPs.end(), ip) != ValidIPs.end());
+               if (!found)
                {
-                       if (i->IPAddr == ip)
-                       {
-                               found = true;
-                               break;
-                       }
-                       /* XXX: Fixme: blocks for a very short amount of time,
-                        * we should cache these on rehash/startup
-                        */
-                       if (CleanAndResolve(resolved_host,i->IPAddr.c_str(),true,1))
-                       {
-                               if (std::string(resolved_host) == ip)
-                               {
+                       for (vector<std::string>::iterator i = ValidIPs.begin(); i != ValidIPs.end(); i++)
+                               if (MatchCIDR(ip, (*i).c_str()))
                                        found = true;
-                                       break;
-                               }
+
+                       if (!found)
+                       {
+                               WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip);
+                               close(newsock);
+                               return false;
                        }
                }
-               if (!found)
-               {
-                       WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip);
-                       close(newsock);
-                       return false;
-               }
                TreeSocket* s = new TreeSocket(newsock, ip);
                Srv->AddSocket(s);
                return true;
        }
 };
 
+/** This class is used to resolve server hostnames during /connect and autoconnect.
+ * As of 1.1, the resolver system is seperated out from InspSocket, so we must do this
+ * resolver step first ourselves if we need it. This is totally nonblocking, and will
+ * callback to OnLookupComplete or OnError when completed. Once it has completed we
+ * will have an IP address which we can then use to continue our connection.
+ */
+class ServernameResolver : public Resolver
+{       
+ private:
+       /** A copy of the Link tag info for what we're connecting to.
+        * We take a copy, rather than using a pointer, just in case the
+        * admin takes the tag away and rehashes while the domain is resolving.
+        */
+       Link MyLink;
+ public:        
+       ServernameResolver(const std::string &hostname, Link x) : Resolver(hostname, DNS_QUERY_FORWARD), MyLink(x)
+       {
+               /* Nothing in here, folks */
+       }
+        
+       void OnLookupComplete(const std::string &result)
+       {
+               /* Initiate the connection, now that we have an IP to use.
+                * Passing a hostname directly to InspSocket causes it to
+                * just bail and set its FD to -1.
+                */
+               TreeServer* CheckDupe = FindServer(MyLink.Name.c_str());
+               if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */
+               {
+                       TreeSocket* newsocket = new TreeSocket(result,MyLink.Port,false,10,MyLink.Name.c_str());
+                       if (newsocket->GetFd() > -1)
+                       {
+                               /* We're all OK */
+                               Srv->AddSocket(newsocket);
+                       }
+                       else
+                       {
+                               /* Something barfed, show the opers */
+                               WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
+                               delete newsocket;
+                       }
+               }
+       }
+
+       void OnError(ResolverError e, const std::string &errormessage)
+       {
+               /* Ooops! */
+               WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str());
+       }
+};
+
+class SecurityIPResolver : public Resolver
+{
+ private:
+       Link MyLink;
+ public:
+       SecurityIPResolver(const std::string &hostname, Link x) : Resolver(hostname, DNS_QUERY_FORWARD), MyLink(x)
+       {
+       }
+
+       void OnLookupComplete(const std::string &result)
+       {
+               log(DEBUG,"Security IP cache: Adding IP address '%s' for Link '%s'",result.c_str(),MyLink.Name.c_str());
+               ValidIPs.push_back(result);
+       }
+
+       void OnError(ResolverError e, const std::string &errormessage)
+       {
+               log(DEBUG,"Could not resolve IP associated with Link '%s': %s",MyLink.Name.c_str(),errormessage.c_str());
+       }
+};
+
 void AddThisServer(TreeServer* server, std::deque<TreeServer*> &list)
 {
        for (unsigned int c = 0; c < list.size(); c++)
@@ -3269,9 +3354,11 @@ void ReadConfiguration(bool rebind)
        FlatLinks = Conf->ReadFlag("options","flatlinks",0);
        HideULines = Conf->ReadFlag("options","hideulines",0);
        LinkBlocks.clear();
+       ValidIPs.clear();
        for (int j =0; j < Conf->Enumerate("link"); j++)
        {
                Link L;
+               std::string Allow = Conf->ReadValue("link","allowmask",j);
                L.Name = (Conf->ReadValue("link","name",j)).c_str();
                L.IPAddr = Conf->ReadValue("link","ipaddr",j);
                L.Port = Conf->ReadInteger("link","port",j,true);
@@ -3284,6 +3371,26 @@ void ReadConfiguration(bool rebind)
                /* Bugfix by brain, do not allow people to enter bad configurations */
                if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
                {
+                       ValidIPs.push_back(L.IPAddr);
+
+                       if (Allow.length())
+                               ValidIPs.push_back(Allow);
+
+                       /* Needs resolving */
+                       insp_inaddr binip;
+                       if (insp_aton(L.IPAddr.c_str(), &binip) < 1)
+                       {
+                               try
+                               {
+                                       SecurityIPResolver* sr = new SecurityIPResolver(L.IPAddr, L);
+                                       Srv->AddResolver(sr);
+                               }
+                               catch (ModuleException& e)
+                               {
+                                       log(DEBUG,"Error in resolver: %s",e.GetReason());
+                               }
+                       }
+
                        LinkBlocks.push_back(L);
                        log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port);
                }
@@ -3479,6 +3586,10 @@ class ModuleSpanningTree : public Module
                                params[1] = s->GetName();
                                DoOneToOne(user->nick, "STATS", params, s->GetName());
                        }
+                       else
+                       {
+                               WriteServ(user->fd, "402 %s %s :No such server", user->nick, parameters[0]);
+                       }
                        return 1;
                }
                return 0;
@@ -3666,16 +3777,36 @@ class ModuleSpanningTree : public Module
                                {
                                        // an autoconnected server is not connected. Check if its time to connect it
                                        WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
-                                       TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
-                                       if (newsocket->GetFd() > -1)
+
+                                       insp_inaddr binip;
+
+                                       /* Do we already have an IP? If so, no need to resolve it. */
+                                       if (insp_aton(x->IPAddr.c_str(), &binip) > 0)
                                        {
-                                               Srv->AddSocket(newsocket);
+                                               TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
+                                               if (newsocket->GetFd() > -1)
+                                               {
+                                                       Srv->AddSocket(newsocket);
+                                               }
+                                               else
+                                               {
+                                                       WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+                                                       delete newsocket;
+                                               }
                                        }
                                        else
                                        {
-                                               WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
-                                               DELETE(newsocket);
+                                               try
+                                               {
+                                                       ServernameResolver* snr = new ServernameResolver(x->IPAddr, *x);
+                                                       Srv->AddResolver(snr);
+                                               }
+                                               catch (ModuleException& e)
+                                               {
+                                                       log(DEBUG,"Error in resolver: %s",e.GetReason());
+                                               }
                                        }
+
                                }
                        }
                }
@@ -3728,15 +3859,33 @@ class ModuleSpanningTree : public Module
                                if (!CheckDupe)
                                {
                                        WriteServ(user->fd,"NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
-                                       TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
-                                       if (newsocket->GetFd() > -1)
+                                       insp_inaddr binip;
+
+                                       /* Do we already have an IP? If so, no need to resolve it. */
+                                       if (insp_aton(x->IPAddr.c_str(), &binip) > 0)
                                        {
-                                               Srv->AddSocket(newsocket);
+                                               TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
+                                               if (newsocket->GetFd() > -1)
+                                               {
+                                                       Srv->AddSocket(newsocket);
+                                               }
+                                               else
+                                               {
+                                                       WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+                                                       delete newsocket;
+                                               }
                                        }
                                        else
                                        {
-                                               WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002: %s.",user->nick,x->Name.c_str(),strerror(errno));
-                                               DELETE(newsocket);
+                                               try
+                                               {
+                                                       ServernameResolver* snr = new ServernameResolver(x->IPAddr, *x);
+                                                       Srv->AddResolver(snr);
+                                               }
+                                               catch (ModuleException& e)
+                                               {
+                                                       log(DEBUG,"Error in resolver: %s",e.GetReason());
+                                               }
                                        }
                                        return 1;
                                }
@@ -4055,7 +4204,7 @@ class ModuleSpanningTree : public Module
                        params.push_back(user->dhost);
                        params.push_back(user->ident);
                        params.push_back("+"+std::string(user->FormatModes()));
-                       params.push_back((char*)insp_ntoa(user->ip4));
+                       params.push_back(user->GetIPString());
                        params.push_back(":"+std::string(user->fullname));
                        DoOneToMany(Srv->GetServerName(),"NICK",params);