Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Escape password and login to prevent errors with special characters (such as | or &)

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2017-11-05 19:11:27 +01:00
parent 8c4cf11534
commit bea0240cbb
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/ryzom/client/src/login_patch.cpp
View file

@ -897,9 +897,9 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
contentPrefix += "set STARTUPPATH=%~4\n"; contentPrefix += "set STARTUPPATH=%~4\n";
contentPrefix += toString("set UPGRADE_FILE=%%ROOTPATH%%\\%s\n", UpgradeBatchFilename.c_str()); contentPrefix += toString("set UPGRADE_FILE=%%ROOTPATH%%\\%s\n", UpgradeBatchFilename.c_str());
contentPrefix += "\n"; contentPrefix += "\n";
contentPrefix += "set LOGIN=%5\n"; contentPrefix += "set LOGIN=%~5\n";
contentPrefix += "set PASSWORD=%6\n"; contentPrefix += "set PASSWORD=%~6\n";
contentPrefix += "set SHARDID=%7\n"; contentPrefix += "set SHARDID=%~7\n";
#else #else
contentPrefix += "#!/bin/sh\n"; contentPrefix += "#!/bin/sh\n";
contentPrefix += "export RYZOM_CLIENT=\"$1\"\n"; contentPrefix += "export RYZOM_CLIENT=\"$1\"\n";
@ -908,9 +908,9 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
contentPrefix += "export STARTUPPATH=\"$4\"\n"; contentPrefix += "export STARTUPPATH=\"$4\"\n";
contentPrefix += toString("export UPGRADE_FILE=$ROOTPATH/%s\n", UpgradeBatchFilename.c_str()); contentPrefix += toString("export UPGRADE_FILE=$ROOTPATH/%s\n", UpgradeBatchFilename.c_str());
contentPrefix += "\n"; contentPrefix += "\n";
contentPrefix += "LOGIN=$5\n"; contentPrefix += "LOGIN=\"$5\"\n";
contentPrefix += "PASSWORD=$6\n"; contentPrefix += "PASSWORD=\"$6\"\n";
contentPrefix += "SHARDID=$7\n"; contentPrefix += "SHARDID=\"$7\"\n";
#endif #endif
contentPrefix += "\n"; contentPrefix += "\n";
@ -932,7 +932,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
if (wantRyzomRestart) if (wantRyzomRestart)
{ {
// client shouldn't be in memory anymore else it couldn't be overwritten // client shouldn't be in memory anymore else it couldn't be overwritten
contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%RYZOM_CLIENT%%\" %s %%LOGIN%% %%PASSWORD%% %%SHARDID%%\n", additionalParams.c_str()); contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%RYZOM_CLIENT%%\" %s \"%%LOGIN%%\ \"%%PASSWORD%%\" \"%%SHARDID%%\"\n", additionalParams.c_str());
} }
#else #else
if (wantRyzomRestart) if (wantRyzomRestart)
@ -955,9 +955,9 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
// launch new client // launch new client
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
// use exec command under OS X // use exec command under OS X
contentSuffix += toString("exec \"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str()); contentSuffix += toString("exec \"$RYZOM_CLIENT\" %s \"$LOGIN\" \"$PASSWORD\" \"$SHARDID\"\n", additionalParams.c_str());
#else #else
contentSuffix += toString("\"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID &\n", additionalParams.c_str()); contentSuffix += toString("\"$RYZOM_CLIENT\" %s \"$LOGIN\" \"$PASSWORD\" \"$SHARDID\" &\n", additionalParams.c_str());
#endif #endif
} }
#endif #endif