Verify if argument is file before handling it (#1353)

IB-8591

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

client/Application.cpp

@@ -87,7 +87,7 @@ using namespace std::chrono;
 const QStringList Application::CONTAINER_EXT {
 	QStringLiteral("asice"), QStringLiteral("sce"),
 	QStringLiteral("asics"), QStringLiteral("scs"),
-	QStringLiteral("bdoc"), QStringLiteral("edoc"),
+	QStringLiteral("bdoc"), QStringLiteral("edoc"), QStringLiteral("adoc"),
 };
 
 class DigidocConf final: public digidoc::XmlConfCurrent
@@ -623,7 +623,7 @@ bool Application::event(QEvent *event)
 	{
 	case REOpenEvent::Type:
 		if( !activeWindow() )
-			parseArgs();
+			showClient();
 		return true;
 	case QEvent::FileOpen:
 	{
@@ -841,7 +841,7 @@ void Application::parseArgs(QStringList args)
 		suffix.endsWith(QLatin1String(".cdoc"), Qt::CaseInsensitive) ||
 		suffix.endsWith(QLatin1String(".cdoc2"), Qt::CaseInsensitive))
 		crypto = true;
-	showClient(args, crypto, sign, newWindow);
+	showClient(std::move(args), crypto, sign, newWindow);
 }
 
 uint Application::readTSLVersion(const QString &path)
@@ -869,19 +869,28 @@ int Application::run()
 	return exec();
 }
 
-void Application::showClient(const QStringList &params, bool crypto, bool sign, bool newWindow)
+void Application::showClient(QStringList files, bool crypto, bool sign, bool newWindow)
 {
+	// Make sure all parameters are files
+	for(auto i = files.begin(); i != files.end(); )
+	{
+		if(QFileInfo(*i).isFile())
+			++i;
+		else
+			i = files.erase(i);
+	}
+
 	if(sign)
-		sign = params.size() != 1 || !CONTAINER_EXT.contains(QFileInfo(params.value(0)).suffix(), Qt::CaseInsensitive);
+		sign = files.size() != 1 || !CONTAINER_EXT.contains(QFileInfo(files.value(0)).suffix(), Qt::CaseInsensitive);
+
 	MainWindow *w = nullptr;
-	if(!newWindow && params.isEmpty())
-	{
-		// If no files selected (e.g. restoring minimized window), select first
+	if(newWindow)
+		w = nullptr;
+	else if(files.isEmpty()) // If no files selected (e.g. restoring minimized window), select first
 		w = qobject_cast<MainWindow*>(mainWindow());
-	}
-	else if(!newWindow)
+	else
 	{
-		// else select first window with no open files
+		// select first window with no open files
 		for(auto *widget : topLevelWidgets())
 		{
 			if(auto *main = qobject_cast<MainWindow*>(widget);
@@ -923,12 +932,13 @@ void Application::showClient(const QStringList &params, bool crypto, bool sign,
 	w->show();
 	w->activateWindow();
 	w->raise();
-	if(!params.isEmpty())
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
-		QMetaObject::invokeMethod(w, [&] { w->open(params, crypto, sign); });
-#else
-		QMetaObject::invokeMethod(w, &MainWindow::open, params, crypto, sign);
-#endif
+	if(files.isEmpty())
+		return;
+	QMetaObject::invokeMethod(w, [&] {
+		using enum ria::qdigidoc4::Pages;
+		w->selectPage(crypto && !sign ? CryptoIntro : SignIntro);
+		w->openFiles(files, false, sign);
+	});
 }
 
 void Application::showWarning( const QString &msg, const digidoc::Exception &e )

client/Application.h

@@ -73,7 +73,7 @@ class Application final: public BaseApplication
 	static QWidget* mainWindow();
 	static void openHelp();
 	static uint readTSLVersion(const QString &path);
-	static void showClient(const QStringList &params = {}, bool crypto = false, bool sign = false, bool newWindow = false);
+	static void showClient(QStringList params = {}, bool crypto = false, bool sign = false, bool newWindow = false);
 	static void updateTSLCache(const QDateTime &tslTime);
 #if defined(Q_OS_MAC)
 	static QString groupContainerPath();

client/Application_mac.mm

@@ -27,6 +27,17 @@
 
 using namespace Qt::StringLiterals;
 
+static auto fetchPaths(NSPasteboard *pboard)
+{
+	QStringList result;
+	NSArray<NSURL *> *urls = [pboard readObjectsForClasses:@[[NSURL class]]
+		options:@{ NSPasteboardURLReadingFileURLsOnlyKey : @YES }];
+	for (NSURL *url in urls) {
+		result.append(QString::fromNSString(url.path).normalized(QString::NormalizationForm_C));
+	}
+	return result;
+}
+
 @implementation NSApplication (ApplicationObjC)
 
 - (void)appReopen:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
@@ -40,30 +51,21 @@ - (void)openClient:(NSPasteboard *)pboard userData:(NSString *)data error:(NSStr
 {
 	Q_UNUSED(data)
 	Q_UNUSED(error)
-	QStringList result;
-	for( NSString *filename in [pboard propertyListForType:NSFilenamesPboardType] )
-		result.append(QString::fromNSString(filename).normalized(QString::NormalizationForm_C));
-	Application::showClient(result);
+	Application::showClient(fetchPaths(pboard));
 }
 
 - (void)signClient:(NSPasteboard *)pboard userData:(NSString *)data error:(NSString **)error
 {
 	Q_UNUSED(data)
 	Q_UNUSED(error)
-	QStringList result;
-	for(NSString *filename in [pboard propertyListForType:NSFilenamesPboardType])
-		result.append(QString::fromNSString(filename).normalized(QString::NormalizationForm_C));
-	Application::showClient(result, false, true);
+	Application::showClient(fetchPaths(pboard), false, true);
 }
 
 - (void)openCrypto:(NSPasteboard *)pboard userData:(NSString *)data error:(NSString **)error
 {
 	Q_UNUSED(data)
 	Q_UNUSED(error)
-	QStringList result;
-	for( NSString *filename in [pboard propertyListForType:NSFilenamesPboardType] )
-		result.append(QString::fromNSString(filename).normalized(QString::NormalizationForm_C));
-	Application::showClient(result, true);
+	Application::showClient(fetchPaths(pboard), true);
 }
 @end
 

client/MainWindow.cpp

@@ -614,16 +614,6 @@ void MainWindow::openFiles(const QStringList &files, bool addFile, bool forceCre
 		navigateToPage(page, content, create);
 }
 
-void MainWindow::open(const QStringList &files, bool crypto, bool sign)
-{
-	if (crypto && !sign)
-		selectPage(Pages::CryptoIntro);
-	else
-		selectPage(Pages::SignIntro);
-	if(!files.isEmpty())
-		openFiles(files, false, sign);
-}
-
 void MainWindow::openContainer(bool signature)
 {
 	QString filter = QFileDialog::tr("All Files (*)") + QStringLiteral(";;") + tr("Documents (%1)");

client/MainWindow.h

@@ -44,7 +44,8 @@ class MainWindow final : public QWidget
 	explicit MainWindow(QWidget *parent = nullptr);
 	~MainWindow() final;
 
-	void open(const QStringList &files, bool crypto, bool sign);
+	void openFiles(const QStringList &files, bool addFile = false, bool forceCreate = false);
+	void selectPage(ria::qdigidoc4::Pages page);
 	void showSettings(int page);
 
 protected:
@@ -73,7 +74,6 @@ class MainWindow final : public QWidget
 	void onCryptoAction(int action, const QString &id, const QString &phone);
 	void onSignAction(int action, const QString &info1, const QString &info2);
 	void openContainer(bool signature);
-	void openFiles(const QStringList &files, bool addFile = false, bool forceCreate = false);
 	void pageSelected(int page, bool checked = true);
 	void pinUnblock(QSmartCardData::PinType type, bool isForgotPin);
 	void pinPukChange( QSmartCardData::PinType type );
@@ -85,7 +85,6 @@ class MainWindow final : public QWidget
 	void removeSignatureFile(int index);
 	bool save(bool saveAs = false);
 	QString selectFile( const QString &title, const QString &filename, bool fixedExt );
-	void selectPage(ria::qdigidoc4::Pages page);
 	template <typename F>
 	void sign(F &&sign);
 	void updateCardWarnings(const QSmartCardData &data);