livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-16888 debug setting MFAHash value now gets saved to mfa_hash secure storage as well.

master
Brad Kittenbrink 2022-03-08 17:48:49 -08:00
parent 87b494f585
commit 9d1891aff1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/lllogininstance.cpp
View File

@ -231,11 +231,19 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia
LL_DEBUGS("LLLogin") << "Login parameters: " << LLSDOStreamer<LLSDNotationFormatter>(request_params) << LL_ENDL;
std::string mfa_hash = gSavedPerAccountSettings.getString("MFAHash"); //non-persistent to enable testing
if(mfa_hash.empty())
LLPointer<LLSecAPIHandler> basic_secure_store = getSecHandler(BASIC_SECHANDLER);
std::string grid(LLGridManager::getInstance()->getGridId());
if (basic_secure_store)
{
LLPointer<LLSecAPIHandler> basic_secure_store = getSecHandler(BASIC_SECHANDLER);
std::string grid(LLGridManager::getInstance()->getGridId());
mfa_hash = basic_secure_store->getProtectedData("mfa_hash", grid).asString();
if (mfa_hash.empty())
{
mfa_hash = basic_secure_store->getProtectedData("mfa_hash", grid).asString();
}
else
{
// SL-16888 the mfa_hash is being overridden for testing so save it for consistency for future login requests
basic_secure_store->setProtectedData("mfa_hash", grid, mfa_hash);
}
}
request_params["mfa_hash"] = mfa_hash;