Merge branch 'master' into libcdoc

# Conflicts:
#	.github/workflows/build.yml

Author: metsma

.github/workflows/build.yml

@@ -42,13 +42,14 @@ jobs:
         key: vcpkg-macOS-${{ hashFiles('prepare_osx_build_environment.sh') }}
     - name: Build libraries
       run: |
-        mkdir -p ${LIBS_PATH}/Qt-6.10.1-OpenSSL
+        mkdir -p ${LIBS_PATH}/Qt-6.10.2-OpenSSL
         ./prepare_osx_build_environment.sh -p ${LIBS_PATH}
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.10.1
+        version: 6.10.2
         arch: clang_64
+        cache: true
     - name: Build
       run: |
         cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -140,10 +141,11 @@ jobs:
         path: build/qdigidoc4*.rpm
   windows:
     name: Build on Windows
-    runs-on: windows-2025
+    runs-on: ${{ matrix.platform == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
     strategy:
       matrix:
         vcver: [143]
+        platform: [x64, arm64]
     env:
       VER_SUFFIX: .VS${{ matrix.vcver }}
     steps:
@@ -153,7 +155,7 @@ jobs:
       with:
         workflow: build.yml
         branch: master
-        name: msi_${{ matrix.vcver }}_x64
+        name: msi_${{ matrix.vcver }}_${{ matrix.platform }}
         path: ./
         repo: open-eid/libdigidocpp
     - name: Install artifact
@@ -164,40 +166,35 @@ jobs:
       uses: actions/cache@v5
       with:
         path: ${{ github.workspace }}/vcpkg_cache
-        key: vcpkg-${{ matrix.vcver }}-${{ hashFiles('vcpkg.json') }}
-    - name: Prepare vcpkg
-      uses: lukka/run-vcpkg@v11
-      with:
-        vcpkgJsonGlob: ./vcpkg.json
-        runVcpkgInstall: true
-      env:
-        VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
-        VCPKG_INSTALLED_DIR: ${{ github.workspace }}/build/vcpkg_installed
+        key: vcpkg-${{ matrix.vcver }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json') }}
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.10.1
-        arch: win64_msvc2022_64
+        version: 6.10.2
+        arch: ${{ matrix.platform == 'arm64' && 'win64_msvc2022_arm64' || 'win64_msvc2022_64' }}
+        cache: true
     - name: Setup dev env
       uses: ilammy/msvc-dev-cmd@v1
       with:
-        arch: x64
+        arch: ${{ matrix.platform }}
     - name: Install WiX
       run: |
         dotnet tool install -g wix --version 6.0.2
         wix extension -g add WixToolset.UI.wixext/6.0.2
     - name: Build
+      env:
+        VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
       run: |
         cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-          -DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake `
+          -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
           -DVCPKG_MANIFEST_DIR=${{ github.workspace }}/client/libcdoc
         cmake --build build --target msi
         cmake --build build --target msishellext
         cmake --build build --target appx
     - name: Archive artifacts
       uses: actions/upload-artifact@v6
       with:
-        name: msi_${{ matrix.vcver }}_x64
+        name: msi_${{ matrix.vcver }}_${{ matrix.platform }}
         path: |
           build/*.msi
           build/*.appx

README.md

@@ -64,7 +64,7 @@
 3. Configure
 
         cmake -B build -S . \
-          -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.6.3-OpenSSL
+          -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.10.2-OpenSSL
           -DOPENSSL_ROOT_DIR=~/cmake_build/OpenSSL \
           -DLDAP_ROOT=~/cmake_build/OpenLDAP \
           -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
@@ -81,10 +81,11 @@
 ### Windows
 
 1. Install dependencies from
-    * [Visual Studio Community 2019](https://www.visualstudio.com/downloads/)
+    * [Visual Studio Community 2022](https://www.visualstudio.com/downloads/)
     * [http://www.cmake.org](http://www.cmake.org)
     * [http://qt-project.org](http://qt-project.org)
     * [libdigidocpp-*.msi](https://github.com/open-eid/libdigidocpp/releases)
+    * [vcpkg](https://vcpkg.io/)
 
 2. Fetch the source
 
@@ -93,7 +94,10 @@
 
 3. Configure
 
-        cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH=C:\Qt\6.6.3\msvc2019_x64  -DLibDigiDocpp_ROOT="C:\Program Files (x86)\libdigidocpp" -B build -S .
+        cmake -G"NMAKE Makefiles" -B build -S . `
+          -DCMAKE_PREFIX_PATH=C:\Qt\6.10.2\msvc2022_x64 `
+          -DLibDigiDocpp_ROOT="C:\Program Files (x86)\libdigidocpp" `
+          -DVCPKG_MANIFEST_DIR=client/libcdoc
 
 4. Build
 

client/Application.cpp

@@ -295,7 +295,7 @@ class Application::Private
 	std::unique_ptr<MacMenuBar> bar;
 	QSigner		*signer {};
 
-	QTranslator	appTranslator, commonTranslator, qtTranslator;
+	QTranslator	appTranslator, qtTranslator;
 	QString		lang;
 	QTimer		lastWindowTimer;
 	volatile bool ready = false;
@@ -419,7 +419,6 @@ Application::Application( int &argc, char **argv )
 	});
 
 	installTranslator( &d->appTranslator );
-	installTranslator( &d->commonTranslator );
 	installTranslator( &d->qtTranslator );
 	loadTranslation(Settings::LANGUAGE);
 
@@ -673,7 +672,6 @@ void Application::loadTranslation( const QString &lang )
 	else QLocale::setDefault(QLocale(QLocale::Estonian, QLocale::Estonia));
 
 	void(d->appTranslator.load(QLatin1String(":/translations/%1.qm").arg(lang)));
-	void(d->commonTranslator.load(QLatin1String(":/translations/common_%1.qm").arg(lang)));
 	void(d->qtTranslator.load(QLatin1String(":/translations/qtbase_%1.qm").arg(lang)));
 	if( d->closeAction ) d->closeAction->setText( tr("Close Window") );
 	if( d->newClientAction ) d->newClientAction->setText( tr("New Window") );

client/CMakeLists.txt

@@ -1,5 +1,3 @@
-get_target_property(qtCore_install_prefix Qt6::qmake IMPORTED_LOCATION)
-get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY)
 get_filename_component(TSL_FILENAME ${TSL_URL} NAME_WLE)
 set(TSL_LIST ${TSL_FILENAME} ${TSL_INCLUDE})
 list(TRANSFORM TSL_LIST APPEND .xml)
@@ -9,14 +7,11 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${TSL_FILENAME}.xml)
 else()
 	set(TSL_DIR ${CMAKE_CURRENT_BINARY_DIR})
 	list(TRANSFORM TSL_LIST PREPEND ${TSL_DIR}/)
-	add_executable(TSLDownload TSLDownload.cpp)
-	target_link_libraries(TSLDownload Qt6::Network)
-	set_target_properties(TSLDownload PROPERTIES AUTOMOC OFF)
+	find_package(Python REQUIRED)
 	add_custom_command(
 		OUTPUT ${TSL_LIST}
-		DEPENDS TSLDownload
-		COMMAND $<TARGET_FILE:TSLDownload> ${CMAKE_CURRENT_BINARY_DIR} ${TSL_URL} ${TSL_INCLUDE}
-		WORKING_DIRECTORY ${qtCore_install_prefix}
+		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/download_tsl.py
+		COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/download_tsl.py ${CMAKE_CURRENT_BINARY_DIR} ${TSL_URL} ${TSL_INCLUDE}
 	)
 endif()
 
@@ -91,9 +86,6 @@ qt_add_translations(${PROJECT_NAME} TS_FILES
 	translations/en.ts
 	translations/et.ts
 	translations/ru.ts
-	../common/translations/common_en.ts
-	../common/translations/common_et.ts
-	../common/translations/common_ru.ts
 	../common/translations/qtbase_et.ts
 	../common/translations/qtbase_ru.ts
 	RESOURCE_PREFIX /translations
@@ -222,10 +214,11 @@ elseif(WIN32)
 		${CMAKE_SOURCE_DIR}/common/WelcomeDlg.wxs
 		${CMAKE_SOURCE_DIR}/common/WixUI_Minimal.wxs
 	)
+	get_filename_component(QT_BASE_DIR "${Qt6_DIR}/../../.." ABSOLUTE)
 	add_custom_target(msi DEPENDS ${PROJECT_NAME}
 		COMMAND ${WIX_CMD} -o "${MSI_FILE}.msi"
 		#Build MSI with QT
-		COMMAND ${WIX_CMD} -d qt_path=${qtCore_install_prefix} -o "${MSI_FILE}.qt.msi"
+		COMMAND ${WIX_CMD} -d qt_path=${QT_BASE_DIR}/bin -o "${MSI_FILE}.qt.msi"
 		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 	)
 	if(SIGNCERT)
@@ -242,11 +235,16 @@ elseif(WIN32)
 	endif()
 	set(PLATFORM $ENV{PLATFORM})
 	configure_file(${CMAKE_SOURCE_DIR}/AppxManifest.xml.cmake ${CMAKE_BINARY_DIR}/AppxManifest.xml)
-	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(OPENSSL_SUFFIX "-x64")
-	else()
+	if(PLATFORM STREQUAL "x86")
 		set(OPENSSL_SUFFIX "")
+	else()
+		set(OPENSSL_SUFFIX "-${PLATFORM}")
 	endif()
+	set(QT_PATHS ${QT_BASE_DIR}/bin/qtpaths.exe)
+	if(EXISTS ${QT_BASE_DIR}/bin/host-qtpaths.bat)
+		set(QT_PATHS ${QT_BASE_DIR}/bin/host-qtpaths.bat)
+	endif()
+
 	add_custom_target(appx DEPENDS ${PROJECT_NAME}
 		COMMAND ${CMAKE_COMMAND} -E remove ${MSI_FILE}.appx
 		COMMAND ${CMAKE_COMMAND} -E remove_directory appx
@@ -264,7 +262,7 @@ elseif(WIN32)
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.conf appx
 		COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Assets appx/Assets
 		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBS_PATH}/schema appx/schema
-		COMMAND Qt::windeployqt --no-translations --no-compiler-runtime --no-patchqt --force-openssl
+		COMMAND Qt::windeployqt --no-translations --no-compiler-runtime --no-patchqt --force-openssl --qtpaths ${QT_PATHS}
 			--skip-plugin-types generic,networkinformation,iconengines --exclude-plugins qjpeg,qico,qgif,qcertonlybackend,qschannelbackend appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidoc-tool.exe appx
 		COMMAND makeappx.exe pack -d appx -p ${MSI_FILE}.appx

client/TSLDownload.cpp

@@ -125,6 +125,7 @@ background-color: #007aff;
 			return returnError(tr("Failed to connect with service server. Please check your network settings or try again later."));
 		case QNetworkReply::HostNotFoundError:
 		case QNetworkReply::AuthenticationRequiredError:
+		case QNetworkReply::InternalServerError:
 			return returnError(tr("Failed to send request. Check your %1 service access settings.").arg(tr("mobile-ID")));
 		default:
 		{
@@ -154,19 +155,19 @@ background-color: #007aff;
 		if(result.isEmpty())
 			return returnError(tr("Failed to parse JSON content"));
 
-		if(result.contains(QStringLiteral("error")))
+		if(result.contains(QLatin1String("error")))
 		{
-			QString error =result[QStringLiteral("error")].toString();
-			if(error == QStringLiteral("phoneNumber must contain of + and numbers(8-30)"))
+			QString error = result[QLatin1String("error")].toString();
+			if(error == QLatin1String("phoneNumber must contain of + and numbers(8-30)"))
 				returnError(tr("Please include correct country code."));
 			else
 				returnError(tr(error.toUtf8().constData()));
 			return;
 		}
-		if(result.contains(QStringLiteral("cert")))
+		if(result.contains(QLatin1String("cert")))
 		{
 			try {
-				QByteArray b64 = QByteArray::fromBase64(result.value(QStringLiteral("cert")).toString().toUtf8());
+				QByteArray b64 = QByteArray::fromBase64(result.value(QLatin1String("cert")).toString().toUtf8());
 				d->cert = X509Cert((const unsigned char*)b64.constData(), size_t(b64.size()), X509Cert::Der);
 				d->hide();
 				d->l.exit(QDialog::Accepted);
@@ -175,32 +176,32 @@ background-color: #007aff;
 			}
 			return;
 		}
-		if(result.contains(QStringLiteral("sessionID")))
-			d->sessionID = result.value(QStringLiteral("sessionID")).toString();
-		else if(result.value(QStringLiteral("state")).toString() != QStringLiteral("RUNNING"))
+		if(result.contains(QLatin1String("sessionID")))
+			d->sessionID = result.value(QLatin1String("sessionID")).toString();
+		else if(result.value(QLatin1String("state")).toString() != QLatin1String("RUNNING"))
 		{
-			QString endResult = result.value(QStringLiteral("result")).toString();
-			if(endResult == QStringLiteral("OK"))
+			QString endResult = result.value(QLatin1String("result")).toString();
+			if(endResult == QLatin1String("OK"))
 			{
 				QByteArray b64 = QByteArray::fromBase64(
-					result.value(QStringLiteral("signature")).toObject().value(QStringLiteral("value")).toString().toUtf8());
+					result.value(QLatin1String("signature")).toObject().value(QLatin1String("value")).toString().toUtf8());
 				d->signature.assign(b64.cbegin(), b64.cend());
 				d->hide();
 				d->l.exit(QDialog::Accepted);
 			}
-			else if(endResult == QStringLiteral("NOT_MID_CLIENT") || endResult == QStringLiteral("NOT_FOUND") || endResult == QStringLiteral("NOT_ACTIVE"))
+			else if(endResult == QLatin1String("NOT_MID_CLIENT") || endResult == QLatin1String("NOT_FOUND") || endResult == QLatin1String("NOT_ACTIVE"))
 				returnError(tr("User is not a mobile-ID client"));
-			else if(endResult == QStringLiteral("USER_CANCELLED"))
+			else if(endResult == QLatin1String("USER_CANCELLED"))
 				returnError(tr("User denied or cancelled"));
-			else if(endResult == QStringLiteral("TIMEOUT"))
+			else if(endResult == QLatin1String("TIMEOUT"))
 				returnError(tr("Your mobile-ID transaction has expired. Please try again."));
-			else if(endResult == QStringLiteral("PHONE_ABSENT"))
+			else if(endResult == QLatin1String("PHONE_ABSENT"))
 				returnError(tr("Phone is not in coverage area"));
-			else if(endResult == QStringLiteral("DELIVERY_ERROR"))
+			else if(endResult == QLatin1String("DELIVERY_ERROR"))
 				returnError(tr("Request sending error"));
-			else if(endResult == QStringLiteral("SIM_ERROR"))
+			else if(endResult == QLatin1String("SIM_ERROR"))
 				returnError(tr("SIM error"));
-			else if(endResult == QStringLiteral("SIGNATURE_HASH_MISMATCH"))
+			else if(endResult == QLatin1String("SIGNATURE_HASH_MISMATCH"))
 				returnError(tr("Your mobile-ID transaction has failed. Please contact your mobile network operator."));
 			else
 				returnError(tr("Service result:") + endResult);
@@ -227,8 +228,8 @@ bool MobileProgress::init(const QString &ssid, const QString &cell)
 	if(!d->UUID.isEmpty() && QUuid(d->UUID).isNull())
 	{
 		WarningDialog::create(d->parentWidget())
-			->withText(tr("Failed to send request. Check your %1 service access settings.").arg(tr("mobile-ID")))
 			->withTitle(QCoreApplication::translate("DigiDoc", "Failed to sign container"))
+			->withText(tr("Failed to send request. Check your %1 service access settings.").arg(tr("mobile-ID")))
 			->open();
 		return false;
 	}