Changed AES negotiation to occur before SERVER

[user/henk/code/inspircd.git] / src / modules / m_spanningtree.cpp

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index a20318d3f11a07c148b2aa7c9f173963a12148cb..09a3b2c56b2a0b302e62d858c3dbc290621f2b4c 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -41,6 +41,7 @@ using namespace std;
 #include "xline.h"
 #include "typedefs.h"
 #include "cull_list.h"
+#include "aes.h"
 
 #ifdef GCC3
 #define nspace __gnu_cxx
@@ -439,6 +440,7 @@ class Link
         std::string RecvPass;
         unsigned long AutoConnect;
         time_t NextConnectTime;
+        std::string EncryptionKey;
 };
 
 /* The usual stuff for inspircd modules,
@@ -536,6 +538,8 @@ class TreeSocket : public InspSocket
        time_t NextPing;
        bool LastPingWasGood;
        bool bursting;
+       AES* ctx;
+       unsigned int keylength;
        
  public:
 
@@ -567,6 +571,33 @@ class TreeSocket : public InspSocket
        {
                this->LinkState = WAIT_AUTH_1;
        }
+
+       void InitAES(std::string key)
+       {
+               if (key == "")
+                       return;
+
+               ctx = new AES();
+               log(DEBUG,"Initialized AES key %s",key.c_str());
+               // key must be 16, 24, 32 etc bytes (multiple of 8)
+               keylength = key.length();
+               if (!(keylength == 16 || keylength == 24 || keylength == 32))
+               {
+                       WriteOpers("\2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!");
+                       log(DEBUG,"Key length not 16, 24 or 32 characters!");
+               }
+               else
+               {
+                       std::string SName = myhost;
+                       if (InboundServerName != "")
+                       {
+                               SName = InboundServerName;
+                       }
+                       WriteOpers("\2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str());
+                       ctx->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
+                               \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
+               }
+       }
        
        /* When an outbound connection finishes connecting, we receive
         * this event, and must send our SERVER string to the other
@@ -584,6 +615,11 @@ class TreeSocket : public InspSocket
                        {
                                if (x->Name == this->myhost)
                                {
+                                       if (x->EncryptionKey != "")
+                                       {
+                                               this->WriteLine("AES "+Srv->GetServerName());
+                                               this->InitAES(x->EncryptionKey);
+                                       }
                                        /* found who we're supposed to be connecting to, send the neccessary gubbins. */
                                        this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription());
                                        return true;
@@ -659,7 +695,6 @@ class TreeSocket : public InspSocket
                }
                /* Now we've whacked the kids, whack self */
                num_lost_servers++;
-               quittingpeople = false;
                for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
                {
                        if (!strcasecmp(u->second->server,Current->GetName().c_str()))
@@ -1137,6 +1172,18 @@ class TreeSocket : public InspSocket
                                /* Process this one, abort if it
                                 * didnt return true.
                                 */
+                               if (this->ctx)
+                               {
+                                       char out[1024];
+                                       char result[1024];
+                                       log(DEBUG,"Original string '%s'",ret.c_str());
+                                       int nbytes = from64tobits(out, ret.c_str(), 1024);
+                                       log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes);
+                                       ctx->Decrypt(out, result, nbytes, 0);
+                                       for (int t = 0; t < nbytes; t++)
+                                               if (result[t] == '\7') result[t] = 0;
+                                       ret = result;
+                               }
                                if (!this->ProcessLine(ret))
                                {
                                        return false;
@@ -1149,6 +1196,27 @@ class TreeSocket : public InspSocket
        int WriteLine(std::string line)
        {
                log(DEBUG,"OUT: %s",line.c_str());
+               if (this->ctx)
+               {
+                       log(DEBUG,"AES context");
+                       char result[1024];
+                       char result64[1024];
+                       if (this->keylength)
+                       {
+                               while (line.length() % this->keylength != 0)
+                               {
+                                       // pad it to be a multiple of the key length
+                                       line = line + "\7";
+                               }
+                       }
+                       ctx->Encrypt(line.c_str(), result, line.length(),0);
+                       to64frombits((unsigned char*)result64,
+                                       (unsigned char*)result,
+                                       line.length());
+                       line = result64;
+                       log(DEBUG,"Encrypted: %s",line.c_str());
+                       //int from64tobits(char *out, const char *in, int maxlen);
+               }
                return this->Write(line + "\r\n");
        }
 
@@ -1623,7 +1691,7 @@ class TreeSocket : public InspSocket
                line = l;
                if (line == "")
                        return true;
-               Srv->Log(DEBUG,"IN: '"+line+"'");
+               Srv->Log(DEBUG,"IN: "+line);
                std::deque<std::string> params;
                this->Split(line,true,params);
                std::string command = "";
@@ -1643,6 +1711,19 @@ class TreeSocket : public InspSocket
                        command = params[0];
                        params.pop_front();
                }
+
+               if ((!this->ctx) && (command == "AES"))
+               {
+                        std::string sserv = params[0];
+                        for (std::vector<Link>::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++)
+                        {
+                                if ((x->EncryptionKey != "") && (x->Name == sserv))
+                                {
+                                        this->InitAES(x->EncryptionKey);
+                                }
+                        }
+                        return true;
+               }
                
                switch (this->LinkState)
                {
@@ -2138,9 +2219,18 @@ void ReadConfiguration(bool rebind)
                L.SendPass = Conf->ReadValue("link","sendpass",j);
                L.RecvPass = Conf->ReadValue("link","recvpass",j);
                L.AutoConnect = Conf->ReadInteger("link","autoconnect",j,true);
+               L.EncryptionKey =  Conf->ReadValue("link","encryptionkey",j);
                L.NextConnectTime = time(NULL) + L.AutoConnect;
-               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);
+               /* Bugfix by brain, do not allow people to enter bad configurations */
+               if ((L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
+               {
+                       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);
+               }
+               else
+               {
+                       log(DEFAULT,"m_spanningtree: Invalid configuration for server '%s', ignored!",L.Name.c_str());
+               }
        }
        delete Conf;
 }