Added ability to send and receive a challenge, dont do anything with it yet

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6767 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_spanningtree/handshaketimer.cpp b/src/modules/m_spanningtree/handshaketimer.cpp
index 32364e2785d8d3b01c22c749362972fb3a40275f..57a7eecedd5458c98afe196f108d6dfdff10a377 100644 (file)
--- a/src/modules/m_spanningtree/handshaketimer.cpp
+++ b/src/modules/m_spanningtree/handshaketimer.cpp
@@ -41,18 +41,25 @@ void HandshakeTimer::Tick(time_t TIME)
 {
        if (Instance->SE->GetRef(thefd) == sock)
        {
-               if (sock->GetHook() && InspSocketHSCompleteRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send())
+               if (!sock->GetHook())
                {
-                       InspSocketAttachCertRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send();
                        sock->SendCapabilities();
                        if (sock->GetLinkState() == CONNECTING)
-                       {
                                sock->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+lnk->SendPass+" 0 :"+this->Instance->Config->ServerDesc);
-                       }
                }
                else
                {
-                       Instance->Timers->AddTimer(new HandshakeTimer(Instance, sock, lnk, Utils));
+                       if (sock->GetHook() && InspSocketHSCompleteRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send())
+                       {
+                               InspSocketAttachCertRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send();
+                               sock->SendCapabilities();
+                               if (sock->GetLinkState() == CONNECTING)
+                                       sock->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+lnk->SendPass+" 0 :"+this->Instance->Config->ServerDesc);
+                       }
+                       else
+                       {
+                               Instance->Timers->AddTimer(new HandshakeTimer(Instance, sock, lnk, Utils));
+                       }
                }
        }
 }

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 58f2b4bf1a2a2808a1369b017765e88d999bb521..2fd18b35a6c270b10563a81524fff6c8e1e5e7ea 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -145,6 +145,10 @@ class TreeSocket : public InspSocket
         */
        ~TreeSocket();
 
+       /** Generate random string used for challenge-response auth
+        */
+       std::string RandString(unsigned int length);
+
        /** When an outbound connection finishes connecting, we receive
         * this event, and must send our SERVER string to the other
         * side. If the other side is happy, as outlined in the server

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 3dbe2938714b33f4bbd0befe0966c012ad00f9df..fdf88f071fac7465a01f23e0d6e79b3ed24a2171 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -145,10 +145,10 @@ bool TreeSocket::OnConnected()
                                else
                                        this->SendCapabilities();
                                /* found who we're supposed to be connecting to, send the neccessary gubbins. */
-                               if (Hook)
+                               /*if (Hook)*/
                                        Instance->Timers->AddTimer(new HandshakeTimer(Instance, this, &(*x), this->Utils));
-                               else
-                                       this->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+x->SendPass+" 0 :"+this->Instance->Config->ServerDesc);
+                               /*else
+                                       this->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+x->SendPass+" 0 :"+this->Instance->Config->ServerDesc);*/
                                return true;
                        }
                }
@@ -230,6 +230,14 @@ std::string TreeSocket::MyCapabilities()
        return capabilities;
 }
 
+std::string TreeSocket::RandString(unsigned int length)
+{
+       std::string out;
+       for (unsigned int i = 0; i < length; i++)
+               out += static_cast<char>((rand() % 26) + 65);
+       return out;
+}
+
 void TreeSocket::SendCapabilities()
 {
        irc::commasepstream modulelist(MyCapabilities());
@@ -262,7 +270,8 @@ void TreeSocket::SendCapabilities()
 #ifdef SUPPORT_IP6LINKS
        ip6support = 1;
 #endif
-       this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support)+" PROTOCOL="+ConvToStr(ProtocolVersion));
+       this->SetOurChallenge(RandString(20));
+       this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support)+" PROTOCOL="+ConvToStr(ProtocolVersion)+" CHALLENGE="+this->GetOurChallenge());
 
        this->WriteLine("CAPAB END");
 }
@@ -370,6 +379,15 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
                        reason = "Maximum GECOS (fullname) lengths differ or remote GECOS length not specified";
                if (((this->CapKeys.find("MAXAWAY") == this->CapKeys.end()) || ((this->CapKeys.find("MAXAWAY") != this->CapKeys.end()) && (this->CapKeys.find("MAXAWAY")->second != ConvToStr(MAXAWAY)))))
                        reason = "Maximum awaymessage lengths differ or remote awaymessage length not specified";
+
+               /* Challenge response, store their challenge for our password */
+               std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");
+               if (n != this->CapKeys.end())
+               {
+                       /* Challenge-response is on now */
+                       this->SetTheirChallenge(n->second);
+               }
+
                if (reason.length())
                {
                        this->WriteLine("ERROR :CAPAB negotiation failed: "+reason);