Remove m_halfop from list in compat linking mode

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

diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index e1d46d0d974da1ce9d33f6d5999f98d88b1fc219..bf98b16d127ca26b621f40524af96c744d8eeb99 100644 (file)
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -12,12 +12,10 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "../m_hash.h"
+#include "../ssl.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -26,7 +24,6 @@
 #include "link.h"
 #include "treesocket.h"
 #include "resolvers.h"
-#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h */
 
@@ -80,12 +77,10 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
                }
 
                hmac2 += challenge;
-               HashResetRequest(Utils->Creator, sha256).Send();
-               hmac2 = HashSumRequest(Utils->Creator, sha256, hmac2).Send();
-
-               HashResetRequest(Utils->Creator, sha256).Send();
+               hmac2 = HashRequest(Utils->Creator, sha256, hmac2).hex();
+               
                std::string hmac = hmac1 + hmac2;
-               hmac = HashSumRequest(Utils->Creator, sha256, hmac).Send();
+               hmac = HashRequest(Utils->Creator, sha256, hmac).hex();
 
                return "HMAC-SHA256:"+ hmac;
        }
@@ -104,7 +99,7 @@ std::string TreeSocket::RandString(unsigned int ilength)
 
        if (f >= 0)
        {
-               if (read(f, randombuf, ilength) < ilength)
+               if (read(f, randombuf, ilength) < (int)ilength)
                        ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Entropy source has gone predictable (did not return enough data)");
                close(f);
        }
@@ -130,18 +125,14 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
        this->auth_fingerprint = !link.Fingerprint.empty();
        this->auth_challenge = !ourchallenge.empty() && !theirchallenge.empty();
 
-       const char* fp = NULL;
-       if (GetHook())
-               fp = BufferedSocketFingerprintRequest(this, Utils->Creator, GetHook()).Send();
-
-       if (fp)
-               ServerInstance->Logs->Log("m_spanningtree", DEFAULT, std::string("Server SSL fingerprint ") + fp);
-
-       if (auth_fingerprint)
+       std::string fp;
+       if (GetIOHook())
        {
-               /* Require fingerprint to exist and match */
-               if (!fp || link.Fingerprint != std::string(fp))
-                       return false;
+               SSLCertificateRequest req(this, Utils->Creator);
+               if (req.cert)
+               {
+                       fp = req.cert->GetFingerprint();
+               }
        }
 
        if (auth_challenge)
@@ -149,9 +140,30 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
                std::string our_hmac = MakePass(link.RecvPass, ourchallenge);
 
                /* Straight string compare of hashes */
-               return our_hmac == theirs;
+               if (our_hmac != theirs)
+                       return false;
+       }
+       else
+       {
+               /* Straight string compare of plaintext */
+               if (link.RecvPass != theirs)
+                       return false;
        }
 
-       /* Straight string compare of plaintext */
-       return link.RecvPass == theirs;
+       if (auth_fingerprint)
+       {
+               /* Require fingerprint to exist and match */
+               if (link.Fingerprint != fp)
+               {
+                       ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL fingerprint on link %s: need '%s' got '%s'", 
+                               link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str());
+                       SendError("Provided invalid SSL fingerprint " + fp + " - expected " + link.Fingerprint);
+                       return false;
+               }
+       }
+       else if (!fp.empty())
+       {
+               ServerInstance->SNO->WriteToSnoMask('l', "SSL fingerprint for link %s is %s", link.Name.c_str(), fp.c_str());
+       }
+       return true;
 }