Merge branch 'main' into WE2-1045

Author: metsma

.github/workflows/cmake-linux-codeql.yml

@@ -19,26 +19,27 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
+        persist-credentials: false
 
-    - uses: github/codeql-action/init@v3
+    - uses: github/codeql-action/init@v4
       with:
         languages: cpp
         queries: +security-and-quality
 
-    - uses: github/codeql-action/autobuild@v3
+    - uses: github/codeql-action/autobuild@v4
 
-    - uses: github/codeql-action/analyze@v3
+    - uses: github/codeql-action/analyze@v4
       with:
         upload: False
         output: sarif-results
 
-    - uses: advanced-security/filter-sarif@develop
+    - uses: advanced-security/filter-sarif@v1
       with:
         patterns: |
           -**/*autogen*/**
         input: sarif-results/cpp.sarif
         output: sarif-results/cpp.sarif
 
-    - uses: github/codeql-action/upload-sarif@v3
+    - uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: sarif-results/cpp.sarif

.github/workflows/cmake-linux-coverity.yml

@@ -26,6 +26,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
+        persist-credentials: false
 
     - name: Configure CMake
       run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S .

.github/workflows/cmake-linux-fedora.yml

@@ -14,7 +14,7 @@ jobs:
     container: fedora:${{ matrix.container }}
     strategy:
       matrix:
-        container: [38, 39, 40]
+        container: [42, 43]
 
     steps:
       - name: Install Deps
@@ -23,14 +23,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+          persist-credentials: false
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -B build -S .
 
       - name: Build
         run: cmake --build build --config $BUILD_TYPE --target package
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: web-eid-app-fedora-build-fedora${{matrix.container}}-${{github.run_number}}
           path: build/*rpm

.github/workflows/cmake-linux-ubuntu.yml

@@ -13,24 +13,21 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04${{ matrix.arch == 'arm64' && '-arm' || '' }}
     container: ubuntu:${{matrix.container}}
     strategy:
       matrix:
-        container: ['20.04', '22.04', '24.04']
+        container: ['22.04', '24.04', '25.04', '25.10']
+        arch: ['amd64', 'arm64']
 
     steps:
       - name: Install dependencies
-        if: matrix.container == '20.04'
-        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev
-
-      - name: Install dependencies
-        if: matrix.container != '20.04'
-        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev
+        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
 
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+          persist-credentials: false
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S .
@@ -44,7 +41,7 @@ jobs:
       - name: Test package
         run: lintian build/*.deb
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
-          name: web-eid-app-ubuntu-build-ubuntu${{matrix.container}}-${{github.run_number}}
+          name: web-eid-app-ubuntu-build-ubuntu${{matrix.container}}-${{ matrix.arch }}-${{github.run_number}}
           path: build/*.*deb

.github/workflows/cmake-macos.yml

@@ -10,17 +10,18 @@ env:
   GTest_ROOT: ${{ github.workspace }}/gtest-binary
   QT_QPA_PLATFORM: offscreen
   CMAKE_BUILD_PARALLEL_LEVEL: 3
-  MACOSX_DEPLOYMENT_TARGET: 12.0
+  MACOSX_DEPLOYMENT_TARGET: 13.0
 
 jobs:
   build:
     runs-on: macos-latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
+          persist-credentials: false
 
       - name: Cache
         uses: actions/cache@v4
@@ -39,16 +40,16 @@ jobs:
             -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
             -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
             -DCMAKE_INSTALL_PREFIX=${GTest_ROOT} \
-            -DCMAKE_CXX_STANDARD=17
+            -DCMAKE_CXX_STANDARD=20
           cmake --build gtest-build --target install
 
       - name: Build OpenSSL
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0
+          git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.5
           cd openssl
           for ARCH in x86_64 arm64; do
-            ./Configure darwin64-${ARCH} --prefix=${OPENSSL_ROOT_DIR} no-shared no-module no-tests enable-ec_nistp_64_gcc_128
+            ./Configure darwin64-${ARCH} --prefix=${OPENSSL_ROOT_DIR} no-apps no-shared no-module no-tests enable-ec_nistp_64_gcc_128
             MAKEFLAGS=-j1 make -s install_sw
             mv ${OPENSSL_ROOT_DIR}{,.${ARCH}}
             make distclean
@@ -64,7 +65,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.7.2
+          version: 6.10.0
           arch: clang_64
 
       - name: Configure
@@ -80,7 +81,7 @@ jobs:
       #  run: ctest -V -C ${BUILD_TYPE} --test-dir ${BUILD_DIR}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: web-eid-app-macos-build-${{github.run_number}}
           path: |

.github/workflows/cmake-windows.yml

@@ -6,55 +6,63 @@ env:
   BUILD_TYPE: RelWithDebInfo
   BUILD_NUMBER: ${{github.run_number}}
   CMAKE_BUILD_PARALLEL_LEVEL: 4
+  VCPKG_INSTALLED_DIR: ${{ github.workspace }}/build/vcpkg_installed
+  # Use libelectronic-id vcpkg manifest for dependencies
+  VCPKG_MANIFEST_DIR: ./lib/libelectronic-id/.github
 
 jobs:
   build:
-    runs-on: ${{ matrix.image }}
+    runs-on: windows-2025
     strategy:
       matrix:
-        vcver: [142, 143]
-        include:
-        - vcver: 142
-          image: windows-2019
-        - vcver: 143
-          image: windows-2022
+        arch: [x64, arm64]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
+          persist-credentials: false
+
+      - name: Cache vcpkg
+        uses: actions/cache@v4
+        with:
+          path: ${{ github.workspace }}/vcpkg_cache
+          key: vcpkg-${{ matrix.arch }}-${{ hashFiles(format('{0}/vcpkg.json', env.VCPKG_MANIFEST_DIR)) }}
 
       - name: Prepare vcpkg and libraries
-        uses: lukka/run-vcpkg@v7
+        uses: lukka/run-vcpkg@v11
         with:
-          vcpkgArguments: gtest openssl
-          vcpkgTriplet: x64-windows
-          vcpkgGitCommitId: 1f619be01b436b796dab797dd1e1721c5676f8ac
+          vcpkgJsonGlob: ${{ env.VCPKG_MANIFEST_DIR }}/vcpkg.json
+          runVcpkgInstall: true
+        env:
+          VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
+          VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.7.2
-          arch: win64_msvc2019_64
+          version: 6.9.3
+          arch: ${{ matrix.arch == 'arm64' && 'win64_msvc2022_arm64_cross_compiled' || 'win64_msvc2022_64' }}
 
       - name: Setup MS Visual C++ dev env
         uses: ilammy/msvc-dev-cmd@v1
         with:
-          arch: x64
+          arch: ${{ matrix.arch == 'arm64' && 'amd64_arm64' || 'amd64' }}
 
       - name: Install WiX
         run: |
-          dotnet tool install --global wix --version 5.0.1
-          wix extension -g add WixToolset.UI.wixext/5.0.1
-          wix extension -g add WixToolset.Util.wixext/5.0.1
-          wix extension -g add WixToolset.BootstrapperApplications.wixext/5.0.1
+          dotnet tool install --global wix --version 6.0.2
+          wix extension -g add WixToolset.UI.wixext/6.0.2
+          wix extension -g add WixToolset.Util.wixext/6.0.2
+          wix extension -g add WixToolset.BootstrapperApplications.wixext/6.0.2
 
       - name: Configure
         run: |
           cmake "-GNinja" -S . -B build `
             "-DCMAKE_TOOLCHAIN_FILE=${env:RUNVCPKG_VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
-            "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}"
+            "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" `
+            "-DVCPKG_MANIFEST_DIR=${{ env.VCPKG_MANIFEST_DIR }}"
 
       - name: Build
         run: |
@@ -63,12 +71,13 @@ jobs:
           cmake --build build --config ${env:BUILD_TYPE} --target bundle
 
       - name: Test
+        if: ${{ matrix.arch == 'x64' }}
         run: ctest -V -C ${env:BUILD_TYPE} --test-dir build
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
-          name: web-eid-app-windows-build-VC${{matrix.vcver}}-${{github.run_number}}
+          name: web-eid-app-windows-build-${{matrix.arch}}-${{github.run_number}}
           path: |
             build/src/app/*.msi
             build/src/app/*.exe

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.22)
 
 if(NOT EXISTS "${CMAKE_SOURCE_DIR}/lib/libelectronic-id/README.md")
     message(FATAL_ERROR "libelectronic-id submodule directory empty, did you 'git clone --recursive'?")
@@ -11,7 +11,10 @@ elseif($ENV{CI_PIPELINE_IID})
 else()
     set(BUILD_NUMBER 0)
 endif()
-project(web-eid VERSION 2.6.0.${BUILD_NUMBER})
+project(web-eid VERSION 2.9.0.${BUILD_NUMBER}
+    DESCRIPTION "Web eID browser extension helper application"
+    HOMEPAGE_URL https://github.com/web-eid/web-eid-app
+)
 
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_TWEAK})
@@ -32,10 +35,7 @@ set(SIGNCERT "" CACHE STRING "Common name of certificate to used sign binaries,
 set(CROSSSIGNCERT "" CACHE STRING "Common name of certificate to used cross sign binaries, empty skips signing (Windows)")
 set(SAFARI_PROVISIONPROFILE "" CACHE STRING "Provision profile to include in application (macOS)")
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.12.0 REQUIRED COMPONENTS Core Widgets Network Test LinguistTools Svg)
-get_target_property(qtCore_install_prefix Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
-get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY)
+find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network Test LinguistTools SvgWidgets)
 
 add_subdirectory(lib/libelectronic-id)
 

README.md

@@ -280,13 +280,13 @@ sudo apt install \
 
 ### Windows
 
-- Download Visual Studio 2019 community installer from https://visualstudio.microsoft.com/ and install _Desktop C++ Development_
+- Download Visual Studio 2022 community installer from https://visualstudio.microsoft.com/ and install _Desktop C++ Development_
 - Install WIX toolset
 
-      dotnet tool install --global wix --version 5.0.0
-      wix extension -g add WixToolset.UI.wixext/5.0.0
-      wix extension -g add WixToolset.Util.wixext/5.0.0
-      wix extension -g add WixToolset.Bal.wixext/5.0.0
+      dotnet tool install --global wix --version 6.0.2
+      wix extension -g add WixToolset.UI.wixext/6.0.2
+      wix extension -g add WixToolset.Util.wixext/6.0.2
+      wix extension -g add WixToolset.Bal.wixext/6.0.2
 
 - Download and install Git for Windows from https://git-scm.com/download/win
 - Download and install CMake from https://cmake.org/download/
@@ -297,12 +297,8 @@ sudo apt install \
       .\bootstrap-vcpkg.bat
       .\vcpkg integrate install
 
-- Install _Google Test_ and _OpenSSL_ with _vcpkg_:
-
-      .\vcpkg install --recurse --triplet x64-windows --clean-after-build gtest openssl
-
 - Install _Qt_ with the official [_Qt Online Installer_](https://www.qt.io/download-qt-installer),
-  choose _Custom installation > Qt 6.6.3 > MSVC 2019 64-bit_.
+  choose _Custom installation > Qt 6.10.0 > MSVC 2022 64-bit_.
 
 ### macOS
 
@@ -317,7 +313,7 @@ sudo apt install \
 - Create symlink to _OpenSSL_ location and setup environment variables required
   by _CMake_:
 
-      export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1
+      export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3.0
       export QT_DIR=/usr/local/opt/qt6/lib/cmake/Qt6
 
 ## Building and testing
@@ -334,7 +330,7 @@ Use _Powershell_ to run the following commands to build the project.
 
 - Set the _Qt_ installation directory variable:
 
-      $QT_ROOT = "C:\Qt\6.2.4\msvc2019_64"
+      $QT_ROOT = "C:\Qt\6.10.0\msvc2022_64"
 
 - Set the _vcpkg_ installation directory variable:
 
@@ -346,11 +342,11 @@ Use _Powershell_ to run the following commands to build the project.
 
 - Run _CMake_:
 
-Optionally, WIX Toolset v3 is required for the installer, and the WIX environment variable should be set for the installed target.
-
-      cmake "-DCMAKE_PREFIX_PATH=${QT_ROOT}" `
+      cmake -A x64 -B build -S .
+          "-DCMAKE_PREFIX_PATH=${QT_ROOT}" `
           "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
-          "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" -A x64 -B build -S .
+          "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" `
+          "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github"
 
 - Run the build and installer build:
 
@@ -367,9 +363,9 @@ Optionally, WIX Toolset v3 is required for the installer, and the WIX environmen
 
 ## Adding and updating translations
 
-You can use the free [Qt Linguist application](https://doc.qt.io/qt-5/qtlinguist-index.html)
+You can use the free [Qt Linguist application](https://doc.qt.io/qt-6/qtlinguist-index.html)
 to add and edit translations.
 
 Run the following command to update Qt Linguist TS files:
 
-      lupdate src/ -ts ./src/ui/translations/*.ts
+      cmake --build build --config ${BUILD_TYPE} --target update_translations

build.ps1

@@ -1,8 +1,10 @@
 param(
   [string]$cmake = "C:\Program Files\CMake\bin\cmake.exe",
   [string]$vcpkgroot = "C:\vcpkg",
-  [string]$qtdir = "C:\Qt\6.5.2\msvc2019_64"
+  [string]$qtdir = "C:\Qt\6.10.0\msvc2022_64",
+  [string]$buildtype = "RelWithDebInfo",
+  [string]$arch = "x64"
 )
 
-& $cmake -A x64 "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DQt6_DIR=$qtdir" -S . -B build
-& $cmake --build build
+& $cmake -S . -B build\windows -A $arch -DCMAKE_BUILD_TYPE=$buildtype "-DCMAKE_PREFIX_PATH=$qtdir" "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github"
+& $cmake --build build\windows --config $buildtype