Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: restore the --parent-window option #289

Merged
merged 1 commit into from
Sep 25, 2023
Merged

fix: restore the --parent-window option #289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/controller/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,16 @@ void Application::loadTranslations(const QString& lang)

CommandWithArgumentsPtr Application::parseArgs()
{
QCommandLineOption argumentFromExtension(
QStringLiteral("argument-from-extension"),
QStringLiteral("The first argument from the extension. "
"This could be the path to the app manifest (Firefox) or "
"the origin of the extension that started it (Chrome)."),
QStringLiteral("argument-from-extension"));
// On Windows Chrome, the native messaging host is also passed a command line argument with a
// handle to the calling Chrome native window: --parent-window=<decimal handle value>.
// We don't use it, but need to support it to avoid unknown option errors.
QCommandLineOption parentWindow(QStringLiteral("parent-window"),
QStringLiteral("Parent window handle (unused)"),
QStringLiteral("parent-window"));

QCommandLineOption aboutArgument(QStringLiteral("about"),
QStringLiteral("Show Web-eID about window"));

QCommandLineParser parser;
parser.setApplicationDescription(QStringLiteral(
"Application that communicates with the Web eID browser extension via standard input and "
Expand All @@ -135,7 +137,7 @@ CommandWithArgumentsPtr Application::parseArgs()
"Command-line mode, read commands from command line arguments instead of "
"standard input."},
aboutArgument,
argumentFromExtension});
parentWindow});

static const auto COMMANDS = "'" + CMDLINE_GET_SIGNING_CERTIFICATE + "', '"
+ CMDLINE_AUTHENTICATE + "', '" + CMDLINE_SIGN + "'.";
Expand Down Expand Up @@ -164,9 +166,9 @@ CommandWithArgumentsPtr Application::parseArgs()
}
throw ArgumentError("The command has to be one of " + COMMANDS.toStdString());
}
if (parser.isSet(argumentFromExtension)) {
if (parser.isSet(parentWindow)) {
// https://bugs.chromium.org/p/chromium/issues/detail?id=354597#c2
qDebug() << "Argument from extension is unused" << parser.value(argumentFromExtension);
qDebug() << "Parent window handle is unused" << parser.value(parentWindow);
}
if (parser.isSet(aboutArgument)) {
return std::make_unique<CommandWithArguments>(CommandType::ABOUT, QVariantMap());
Expand Down