Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

JsonApiServer::isAuthTokenValid avoid timing attack

Browse Source 
Thanks Cyril for review :)
This commit is contained in:
Gioacchino Mazzurco 2018-09-25 17:15:06 +02:00
parent ccabf82e60
commit 95e0fd338f
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libretroshare/src/jsonapi/jsonapi.cpp
View File

@ -23,6 +23,7 @@
#include <memory>
#include <restbed>
#include <vector>
#include <openssl/crypto.h>
#include "util/rsjson.h"
#include "retroshare/rsfiles.h"
@ -294,7 +295,25 @@ bool JsonApiServer::requestNewTokenAutorization(const std::string& token)
bool JsonApiServer::isAuthTokenValid(const std::string& token)
{
RS_STACK_MUTEX(configMutex);
return mAuthTokenStorage.mAuthorizedTokens.count(token);
// attempt avoiding +else CRYPTO_memcmp+ being optimized away
int noOptimiz = 1;
/* Do not use mAuthTokenStorage.mAuthorizedTokens.count(token), because
* std::string comparison is usually not constant time on content to be
* faster, so an attacker may use timings to guess authorized tokens */
for(const std::string& vTok : mAuthTokenStorage.mAuthorizedTokens)
{
if( token.size() == vTok.size() &&
( noOptimiz = CRYPTO_memcmp( token.data(), vTok.data(),
vTok.size() ) ) == 0 )
return true;
// Make token size guessing harder
else noOptimiz = CRYPTO_memcmp(token.data(), token.data(), token.size());
}
// attempt avoiding +else CRYPTO_memcmp+ being optimized away
return static_cast<uint32_t>(noOptimiz) + 1 == 0;
}
std::set<std::string> JsonApiServer::getAuthorizedTokens()