code cleanup

This commit is contained in:
Guenter Obiltschnig 2017-02-17 16:22:14 +01:00
parent 158db947cb
commit dc84b22c99

View File

@ -60,15 +60,6 @@ namespace
return kvm; return kvm;
} }
std::string hashCredentials(const std::string& username, const std::string& password)
{
Poco::MD5Engine md5;
md5.update(username);
md5.update(std::string(":mongo:"));
md5.update(password);
return Poco::DigestEngine::digestToHex(md5.digest());
}
std::string decodeBase64(const std::string& base64) std::string decodeBase64(const std::string& base64)
{ {
Poco::MemoryInputStream istr(base64.data(), base64.size()); Poco::MemoryInputStream istr(base64.data(), base64.size());
@ -105,6 +96,15 @@ namespace
return encodeBase64(digestToBinaryString(engine)); return encodeBase64(digestToBinaryString(engine));
} }
std::string hashCredentials(const std::string& username, const std::string& password)
{
Poco::MD5Engine md5;
md5.update(username);
md5.update(std::string(":mongo:"));
md5.update(password);
return digestToHexString(md5);
}
std::string createNonce() std::string createNonce()
{ {
Poco::MD5Engine md5; Poco::MD5Engine md5;
@ -267,7 +267,7 @@ bool Database::authSCRAM(Connection& connection, const std::string& username, co
if (pDoc->getInteger("ok") == 1) if (pDoc->getInteger("ok") == 1)
{ {
Binary::Ptr pPayload = pDoc->get<Binary::Ptr>("payload"); Binary::Ptr pPayload = pDoc->get<Binary::Ptr>("payload");
serverSecondMsg.assign(reinterpret_cast<const char*>(pPayload->buffer().begin()), pPayload->buffer().size()); serverSecondMsg = pPayload->toRawString();
} }
else return false; else return false;
} }