* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
#include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
#include "socket.h"
-#include "wildcard.h"
#include "xline.h"
-#include "transport.h"
-#include "m_hash.h"
+#include "../m_hash.h"
+#include "../ssl.h"
#include "socketengine.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
-
-/* $ModDep: m_spanningtree/timesynctimer.h 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 */
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
const std::string& TreeSocket::GetOurChallenge()
{
- return this->ourchallenge;
+ return capab->ourchallenge;
}
void TreeSocket::SetOurChallenge(const std::string &c)
{
- this->ourchallenge = c;
+ capab->ourchallenge = c;
}
const std::string& TreeSocket::GetTheirChallenge()
{
- return this->theirchallenge;
+ return capab->theirchallenge;
}
void TreeSocket::SetTheirChallenge(const std::string &c)
{
- this->theirchallenge = c;
+ capab->theirchallenge = c;
}
std::string TreeSocket::MakePass(const std::string &password, const std::string &challenge)
* Note: If m_sha256.so is not loaded, we MUST fall back to plaintext with no
* HMAC challenge/response.
*/
- Module* sha256 = Instance->Modules->Find("m_sha256.so");
+ HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
if (Utils->ChallengeResponse && sha256 && !challenge.empty())
{
- /* XXX: This is how HMAC is supposed to be done:
+ /* This is how HMAC is supposed to be done:
*
* sha256( (pass xor 0x5c) + sha256((pass xor 0x36) + m) )
*
- * Note that we are encoding the hex hash, not the binary
- * output of the hash which is slightly different to standard.
- *
- * Don't ask me why its always 0x5c and 0x36... it just is.
+ * 5c and 36 were chosen as part of the HMAC standard, because they
+ * flip the bits in a way likely to strengthen the function.
*/
std::string hmac1, hmac2;
for (size_t n = 0; n < password.length(); n++)
{
- hmac1 += static_cast<char>(password[n] ^ 0x5C);
- hmac2 += static_cast<char>(password[n] ^ 0x36);
+ hmac1.push_back(static_cast<char>(password[n] ^ 0x5C));
+ hmac2.push_back(static_cast<char>(password[n] ^ 0x36));
}
- hmac2 += challenge;
- HashResetRequest(Utils->Creator, sha256).Send();
- hmac2 = HashSumRequest(Utils->Creator, sha256, hmac2).Send();
-
- HashResetRequest(Utils->Creator, sha256).Send();
- std::string hmac = hmac1 + hmac2;
- hmac = HashSumRequest(Utils->Creator, sha256, hmac).Send();
+ if (proto_version >= 1202)
+ {
+ hmac2.append(challenge);
+ std::string hmac = sha256->hexsum(hmac1 + sha256->sum(hmac2));
- return "HMAC-SHA256:"+ hmac;
+ return "AUTH:" + hmac;
+ }
+ else
+ {
+ // version 1.2 used a weaker HMAC, using hex output in the intermediate step
+ hmac2.append(challenge);
+ hmac2 = sha256->hexsum(hmac2);
+
+ std::string hmac = hmac1 + hmac2;
+ hmac = sha256->hexsum(hmac);
+
+ return "HMAC-SHA256:"+ hmac;
+ }
}
else if (!challenge.empty() && !sha256)
- Instance->Log(DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
+ ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
return password;
}
{
char* randombuf = new char[ilength+1];
std::string out;
-#ifdef WINDOWS
- int f = -1;
-#else
+#ifndef WINDOWS
int f = open("/dev/urandom", O_RDONLY, 0);
-#endif
if (f >= 0)
{
-#ifndef WINDOWS
- read(f, randombuf, 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);
-#endif
}
else
+#endif
{
for (unsigned int i = 0; i < ilength; i++)
randombuf[i] = rand();
for (unsigned int i = 0; i < ilength; i++)
{
- char randchar = static_cast<char>((randombuf[i] & 0x7F) | 0x21);
- out += (randchar == '=' ? '_' : randchar);
+ char randchar = static_cast<char>(0x3F + (randombuf[i] & 0x3F));
+ out += randchar;
}
delete[] randombuf;
return out;
}
-bool TreeSocket::ComparePass(const std::string &ours, const std::string &theirs)
+bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
{
- if ((!strncmp(ours.c_str(), "HMAC-SHA256:", 12)) || (!strncmp(theirs.c_str(), "HMAC-SHA256:", 12)))
+ capab->auth_fingerprint = !link.Fingerprint.empty();
+ capab->auth_challenge = !capab->ourchallenge.empty() && !capab->theirchallenge.empty();
+
+ std::string fp;
+ if (GetIOHook())
{
- /* One or both of us specified hmac sha256, but we don't have sha256 module loaded!
- * We can't allow this password as valid.
- */
- if (!Instance->Modules->Find("m_sha256.so") || !Utils->ChallengeResponse)
+ SocketCertificateRequest req(this, Utils->Creator);
+ if (req.cert)
+ {
+ fp = req.cert->GetFingerprint();
+ }
+ }
+
+ if (capab->auth_challenge)
+ {
+ std::string our_hmac = MakePass(link.RecvPass, capab->ourchallenge);
+
+ /* Straight string compare of hashes */
+ if (our_hmac != theirs)
return false;
- else
- /* Straight string compare of hashes */
- return ours == theirs;
}
else
+ {
/* Straight string compare of plaintext */
- return ours == theirs;
-}
+ if (link.RecvPass != theirs)
+ return false;
+ }
+
+ if (capab->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\". "
+ "You can improve security by specifying this in <link:fingerprint>.", link.Name.c_str(), fp.c_str());
+ }
+ return true;
+}
projects / user / henk / code / inspircd.git / blobdiff