1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

androiddeployqt: Fix signing of paths with spaces

Browse Source 
Only use shellQuote() if the path is actually passed to a native API.
For QFile API, use the unquoted path.

Fixes: QTBUG-97649
Change-Id: I9d8131819010bbd2faa8a81eef367245d90a767f
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 6598a26a138aaab13e28905a28e7ce21011d30b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2021-12-03 08:45:56 +01:00 committed by Qt Cherry-pick Bot
parent 3dc20d8094
commit 44f6c0ed1e
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/tools/androiddeployqt/main.cpp
View File

@ -2678,7 +2678,7 @@ QString packagePath(const Options &options, PackageType pt)
path += QLatin1String(".aab"); path += QLatin1String(".aab");
} }
} }
return shellQuote(path); return path;
} }
bool installApk(const Options &options) bool installApk(const Options &options)
@ -2805,8 +2805,9 @@ bool jarSignerSignPackage(const Options &options)
auto signPackage = [&](const QString &file) { auto signPackage = [&](const QString &file) {
fprintf(stdout, "Signing file %s\n", qPrintable(file)); fprintf(stdout, "Signing file %s\n", qPrintable(file));
fflush(stdout); fflush(stdout);
QString command = jarSignerTool + QLatin1String(" %1 %2") QString command = jarSignerTool
.arg(file) + QLatin1String(" %1 %2")
.arg(shellQuote(file))
.arg(shellQuote(options.keyStoreAlias)); .arg(shellQuote(options.keyStoreAlias));
FILE *jarSignerCommand = openProcess(command); FILE *jarSignerCommand = openProcess(command);
@ -2855,8 +2856,8 @@ bool jarSignerSignPackage(const Options &options)
zipAlignTool = QLatin1String("%1%2 -f 4 %3 %4") zipAlignTool = QLatin1String("%1%2 -f 4 %3 %4")
.arg(shellQuote(zipAlignTool), .arg(shellQuote(zipAlignTool),
options.verbose ? QLatin1String(" -v") : QLatin1String(), options.verbose ? QLatin1String(" -v") : QLatin1String(),
packagePath(options, UnsignedAPK), shellQuote(packagePath(options, UnsignedAPK)),
packagePath(options, SignedAPK)); shellQuote(packagePath(options, SignedAPK)));
FILE *zipAlignCommand = openProcess(zipAlignTool); FILE *zipAlignCommand = openProcess(zipAlignTool);
if (zipAlignCommand == 0) { if (zipAlignCommand == 0) {
@ -2921,10 +2922,11 @@ bool signPackage(const Options &options)
return pclose(zipAlignCommand) == 0; return pclose(zipAlignCommand) == 0;
}; };
const QString verifyZipAlignCommandLine = QLatin1String("%1%2 -c 4 %3") const QString verifyZipAlignCommandLine =
QLatin1String("%1%2 -c 4 %3")
.arg(shellQuote(zipAlignTool), .arg(shellQuote(zipAlignTool),
options.verbose ? QLatin1String(" -v") : QLatin1String(), options.verbose ? QLatin1String(" -v") : QLatin1String(),
packagePath(options, UnsignedAPK)); shellQuote(packagePath(options, UnsignedAPK)));
if (zipalignRunner(verifyZipAlignCommandLine)) { if (zipalignRunner(verifyZipAlignCommandLine)) {
if (options.verbose) if (options.verbose)
@ -2941,11 +2943,12 @@ bool signPackage(const Options &options)
if (options.verbose) if (options.verbose)
fprintf(stdout, "APK not aligned, aligning it for signing.\n"); fprintf(stdout, "APK not aligned, aligning it for signing.\n");
const QString zipAlignCommandLine = QLatin1String("%1%2 -f 4 %3 %4") const QString zipAlignCommandLine =
QLatin1String("%1%2 -f 4 %3 %4")
.arg(shellQuote(zipAlignTool), .arg(shellQuote(zipAlignTool),
options.verbose ? QLatin1String(" -v") : QLatin1String(), options.verbose ? QLatin1String(" -v") : QLatin1String(),
packagePath(options, UnsignedAPK), shellQuote(packagePath(options, UnsignedAPK)),
packagePath(options, SignedAPK)); shellQuote(packagePath(options, SignedAPK)));
if (!zipalignRunner(zipAlignCommandLine)) { if (!zipalignRunner(zipAlignCommandLine)) {
fprintf(stderr, "zipalign command failed.\n"); fprintf(stderr, "zipalign command failed.\n");
@ -2970,8 +2973,7 @@ bool signPackage(const Options &options)
if (options.verbose) if (options.verbose)
apkSignCommand += QLatin1String(" --verbose"); apkSignCommand += QLatin1String(" --verbose");
apkSignCommand += QLatin1String(" %1") apkSignCommand += QLatin1String(" %1").arg(shellQuote(packagePath(options, SignedAPK)));
.arg(packagePath(options, SignedAPK));
auto apkSignerRunner = [](const QString &command, bool verbose) { auto apkSignerRunner = [](const QString &command, bool verbose) {
FILE *apkSigner = openProcess(command); FILE *apkSigner = openProcess(command);
@ -2998,8 +3000,9 @@ bool signPackage(const Options &options)
if (!apkSignerRunner(apkSignCommand, options.verbose)) if (!apkSignerRunner(apkSignCommand, options.verbose))
return false; return false;
const QString apkVerifyCommand = QLatin1String("%1 verify --verbose %2") const QString apkVerifyCommand =
.arg(shellQuote(apksignerTool), packagePath(options, SignedAPK)); QLatin1String("%1 verify --verbose %2")
.arg(shellQuote(apksignerTool), shellQuote(packagePath(options, SignedAPK)));
// Verify the package and remove the unsigned apk // Verify the package and remove the unsigned apk
return apkSignerRunner(apkVerifyCommand, true) && QFile::remove(packagePath(options, UnsignedAPK)); return apkSignerRunner(apkVerifyCommand, true) && QFile::remove(packagePath(options, UnsignedAPK));