-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2014 Matthew Martin <phy1729@gmail.com>
+ * Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#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 "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/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 "modules/hash.h"
+#include "modules/ssl.h"
+
+#include "main.h"
+#include "link.h"
+#include "treesocket.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)
/* This is a simple (maybe a bit hacky?) HMAC algorithm, thanks to jilles for
* suggesting the use of HMAC to secure the password against various attacks.
*
- * Note: If m_sha256.so is not loaded, we MUST fall back to plaintext with no
+ * Note: If an sha256 provider is not available, we MUST fall back to plaintext with no
* HMAC challenge/response.
*/
- Module* sha256 = Instance->Modules->Find("m_sha256.so");
- if (Utils->ChallengeResponse && sha256 && !challenge.empty())
- {
- /* XXX: 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.
- */
- 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);
- }
-
- hmac2 += challenge;
- HashResetRequest(Utils->Creator, sha256).Send();
- hmac2 = HashSumRequest(Utils->Creator, sha256, hmac2).Send();
+ HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
+ if (sha256 && !challenge.empty())
+ return "AUTH:" + BinToBase64(sha256->hmac(password, challenge));
- HashResetRequest(Utils->Creator, sha256).Send();
- std::string hmac = hmac1 + hmac2;
- hmac = HashSumRequest(Utils->Creator, sha256, hmac).Send();
-
- return "HMAC-SHA256:"+ hmac;
- }
- else if (!challenge.empty() && !sha256)
- Instance->Logs->Log("m_spanningtree",DEFAULT,"Not authenticating to server using SHA256/HMAC because we don't have m_sha256 loaded!");
+ if (!challenge.empty() && !sha256)
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Not authenticating to server using SHA256/HMAC because we don't have an SHA256 provider (e.g. m_sha256) loaded!");
return password;
}
-std::string TreeSocket::RandString(unsigned int ilength)
+bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
{
- char* randombuf = new char[ilength+1];
- std::string out;
-#ifdef WINDOWS
- int f = -1;
-#else
- int f = open("/dev/urandom", O_RDONLY, 0);
-#endif
-
- if (f >= 0)
+ capab->auth_fingerprint = !link.Fingerprint.empty();
+ capab->auth_challenge = !capab->ourchallenge.empty() && !capab->theirchallenge.empty();
+
+ std::string fp = SSLClientCert::GetFingerprint(this);
+ if (capab->auth_fingerprint)
+ {
+ /* Require fingerprint to exist and match */
+ if (link.Fingerprint != fp)
+ {
+ ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL certificate fingerprint on link %s: need \"%s\" got \"%s\"",
+ link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str());
+ SendError("Invalid SSL certificate fingerprint " + fp + " - expected " + link.Fingerprint);
+ return false;
+ }
+ }
+
+ if (capab->auth_challenge)
{
-#ifndef WINDOWS
- if (read(f, randombuf, ilength) < 1)
- Instance->Logs->Log("m_spanningtree", DEFAULT, "There are crack smoking monkeys in your kernel (in other words, nonblocking /dev/urandom blocked.)");
- close(f);
-#endif
+ std::string our_hmac = MakePass(link.RecvPass, capab->ourchallenge);
+
+ // Use the timing-safe compare function to compare the hashes
+ if (!InspIRCd::TimingSafeCompare(our_hmac, theirs))
+ return false;
}
else
{
- for (unsigned int i = 0; i < ilength; i++)
- randombuf[i] = rand();
+ // Use the timing-safe compare function to compare the passwords
+ if (!InspIRCd::TimingSafeCompare(link.RecvPass, theirs))
+ return false;
}
- for (unsigned int i = 0; i < ilength; i++)
+ // Tell opers to set up fingerprint verification if it's not already set up and the SSL mod gave us a fingerprint
+ // this time
+ if ((!capab->auth_fingerprint) && (!fp.empty()))
{
- char randchar = static_cast<char>((randombuf[i] & 0x7F) | 0x21);
- out += (randchar == '=' ? '_' : randchar);
+ ServerInstance->SNO->WriteToSnoMask('l', "SSL certificate fingerprint for link %s is \"%s\". "
+ "You can improve security by specifying this in <link:fingerprint>.", link.Name.c_str(), fp.c_str());
}
- delete[] randombuf;
- return out;
-}
-
-bool TreeSocket::ComparePass(const std::string &ours, const std::string &theirs)
-{
- if ((!strncmp(ours.c_str(), "HMAC-SHA256:", 12)) || (!strncmp(theirs.c_str(), "HMAC-SHA256:", 12)))
- {
- /* 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)
- return false;
- else
- /* Straight string compare of hashes */
- return ours == theirs;
- }
- else
- /* Straight string compare of plaintext */
- return ours == theirs;
+ return true;
}
projects / user / henk / code / inspircd.git / blobdiff