Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use buildHTTP for login page, it might be https! Copy entire uri!

Browse Source
This commit is contained in:
Liru Færs
2020-05-13 19:40:52 -04:00
parent bd92a09a48
commit cabaf0fd1c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llpanellogin.cpp
View File

@@ -926,10 +926,13 @@ void LLPanelLogin::loadLoginPage()
// add OS info // add OS info
params["os"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); params["os"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
auto&& uri_with_params = [](const LLURI& uri, const LLSD& params) {
return LLURI(uri.scheme(), uri.userName(), uri.password(), uri.hostName(), uri.hostPort(), uri.path(),
LLURI::mapToQueryString(params));
};
// Make an LLURI with this augmented info // Make an LLURI with this augmented info
LLURI login_uri(LLURI::buildHTTP(login_page.authority(), LLURI login_uri(uri_with_params(login_page, params));
login_page.path(),
params));
gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid()); gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid());
gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor()); gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());
@@ -938,7 +941,14 @@ void LLPanelLogin::loadLoginPage()
if (!singularity_splash_uri.empty()) if (!singularity_splash_uri.empty())
{ {
params["original_page"] = login_uri.asString(); params["original_page"] = login_uri.asString();
login_uri = LLURI::buildHTTP(singularity_splash_uri, gSavedSettings.getString("SingularitySplashPagePath"), params); login_uri = LLURI(singularity_splash_uri + gSavedSettings.getString("SingularitySplashPagePath"));
// Copy any existent splash path params
auto& params_map = params.map();
for (auto&& pair : login_uri.queryMap().map())
params_map.emplace(pair);
login_uri = uri_with_params(login_uri, params);
} }
LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html"); LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");