Merge pull request #701 from Yubico/5.0.5-pre

5.0.5 pre

Author: fdennis

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 89

.github/workflows/macOS.yml

@@ -3,14 +3,11 @@ name: macOS
 on: [push, pull_request]
 
 env:
-  PYTHON_VER: '3.8.2'
-  PYTHON_VER_SHORT: '3.8'
-  PYTHON_VER_SHORT_COMPACT: '38'
+  PYTHON_VER: '3.9.2'
+  PYTHON_VER_SHORT: '3.9'
+  PYTHON_VER_SHORT_COMPACT: '39'
   PYOTHERSIDE_VER: '1.5.9'
-  OPENSSL_VER: '1.1.1g'
-  LIBYUBIKEY_VER: '1.13'
-  LIBYKPERS_VER: '1.20.0'
-  LIBUSB_VER: '1.0.23'
+  OPENSSL_VER: '1.1.1i'
 
 jobs:
   build:
@@ -20,16 +17,26 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          version: '5.15.1'
+          host: 'mac'
+          target: 'desktop'
+
       - name: Install dependencies from homebrew
         run: |
+          pip install --upgrade pip
           brew update
-          brew install swig qt zlib curl coreutils
-          brew link qt -f
+          brew install swig zlib curl coreutils
 
       - name: Setup GPG
         run: |
-          gpg --keyserver hkps://keys.openpgp.org --recv-keys 0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A 2D347EA6AA65421D e3ff2839c048b25c084debe9b26995e310250568
-          gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 8657ABB260F056B1E5190839D9C4D26D0E604491
+          curl https://keys.openpgp.org/vks/v1/by-fingerprint/E3FF2839C048B25C084DEBE9B26995E310250568 | gpg --import
+          curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x7953ac1fbc3dc8b3b292393ed5e9e43f7df9ee8c" -o ./key1.asc
+          curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8657ABB260F056B1E5190839D9C4D26D0E604491" -o ./key2.asc
+          gpg --import ./key1.asc
+          gpg --import ./key2.asc
 
       - name: Build OpenSSL
         run: |
@@ -53,22 +60,19 @@ jobs:
           # otherwise it seems to break the linking for PyOtherSide build later.
           # Re-intall after, because it's needed for wget.
           brew uninstall gettext --ignore-dependencies
+          brew unlink python@3.9
           ./configure MACOSX_DEPLOYMENT_TARGET=10.13 CPPFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" CC=clang --enable-framework --with-openssl=/opt/openssl --enable-optimizations
           sudo make altinstall
+          brew link --overwrite python@3.9
           brew reinstall gettext
 
-
-
       - name: Install python dependencies from source
         run: |
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 CFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3.8 install cryptography --no-binary :all: --ignore-installed --force-reinstall --no-cache
-          /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3.8 download pyscard --no-binary :all:
-          tar -xvf pyscard*
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 CFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3.8 install ./pyscard* --no-binary :all: --ignore-installed --force-reinstall --no-cache
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 CFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3.8 install -r requirements.txt --no-binary :all:
-
+          sudo /Library/Frameworks/Python.framework/Versions/${PYTHON_VER_SHORT}/bin/pip${PYTHON_VER_SHORT} install --upgrade pip
+          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 CFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" /Library/Frameworks/Python.framework/Versions/${PYTHON_VER_SHORT}/bin/pip${PYTHON_VER_SHORT} install -r requirements.txt
+      
       - name: Change id for bundled Python
-        run: sudo sed -i '' 's/org.python.python/com.yubico.python/g' /Library/Frameworks/Python.framework/Versions/3.8/Resources/Python.app/Contents/Info.plist
+        run: sudo sed -i '' 's/org.python.python/com.yubico.python/g' /Library/Frameworks/Python.framework/Versions/${PYTHON_VER_SHORT}/Resources/Python.app/Contents/Info.plist
 
       - name: Build PyOtherSide QML plugin
         run: |
@@ -81,35 +85,6 @@ jobs:
           make
           sudo make install
 
-      - name: Build libyubikey
-        run: |
-          wget https://developers.yubico.com/yubico-c/Releases/libyubikey-${LIBYUBIKEY_VER}.tar.gz
-          wget https://developers.yubico.com/yubico-c/Releases/libyubikey-${LIBYUBIKEY_VER}.tar.gz.sig
-          gpg --verify libyubikey-${LIBYUBIKEY_VER}.tar.gz.sig
-          tar -xzvf libyubikey-${LIBYUBIKEY_VER}.tar.gz
-          cd libyubikey-${LIBYUBIKEY_VER}
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 ./configure --with-backend=osx --prefix=/opt/libyubikey
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 make install
-
-      - name: Build libykpers
-        run: |
-          wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${LIBYKPERS_VER}.tar.gz
-          wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${LIBYKPERS_VER}.tar.gz.sig
-          gpg --verify ykpers-${LIBYKPERS_VER}.tar.gz.sig
-          tar -xzvf ykpers-${LIBYKPERS_VER}.tar.gz
-          cd ykpers-${LIBYKPERS_VER}
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 ./configure --disable-dependency-tracking --disable-silent-rules --with-backend=osx --with-libyubikey-prefix=/opt/libyubikey --prefix=/opt/ykpers
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 make install
-
-      - name: Build libusb
-        run: |
-          wget https://github.com/libusb/libusb/releases/download/v${LIBUSB_VER}/libusb-${LIBUSB_VER}.tar.bz2
-          echo "db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d libusb-${LIBUSB_VER}.tar.bz2" | sha256sum -c -
-          tar -xzvf libusb-${LIBUSB_VER}.tar.bz2
-          cd libusb-${LIBUSB_VER}
-          ./configure --disable-dependency-tracking --prefix=/opt/libusb
-          sudo env MACOSX_DEPLOYMENT_TARGET=10.13 make install
-
       - name: Build yubioath-desktop
         run: |
           qmake
@@ -118,10 +93,7 @@ jobs:
 
       - name: Copy over dynamic libraries
         run: |
-          sudo find /opt/libyubikey/ -name '*.dylib' -exec cp '{}' yubioath-desktop.app/Contents/Frameworks/ ';'
-          sudo find /opt/ykpers/ -name '*.dylib' -exec cp '{}' yubioath-desktop.app/Contents/Frameworks/ ';'
           sudo find /opt/openssl/ -name '*.dylib' -exec cp '{}' yubioath-desktop.app/Contents/Frameworks/ ';'
-          sudo find /opt/libusb/ -name '*.dylib' -exec cp '{}' yubioath-desktop.app/Contents/Frameworks/ ';'
 
       - name: Copy over Python.framework to app bundle
         run: |
@@ -143,11 +115,6 @@ jobs:
           sudo install_name_tool -change /opt/openssl/lib/libcrypto.1.1.dylib @executable_path/../Frameworks/libcrypto.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/${PYTHON_VER_SHORT}/lib/python${PYTHON_VER_SHORT}/site-packages/cryptography/hazmat/bindings/_openssl.abi3.so
           sudo install_name_tool -change /opt/openssl/lib/libssl.1.1.dylib @executable_path/../Frameworks/libssl.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/${PYTHON_VER_SHORT}/lib/python${PYTHON_VER_SHORT}/site-packages/cryptography/hazmat/bindings/_openssl.abi3.so
 
-      - name: Point ykpers dependencies to relative dylibs
-        run: |
-          sudo install_name_tool -change /opt/libyubikey/lib/libyubikey.0.dylib @executable_path/../Frameworks/libyubikey.0.dylib yubioath-desktop.app/Contents/Frameworks/libykpers-1.1.dylib
-          sudo install_name_tool -change /opt/libyubikey/lib/libyubikey.0.dylib @executable_path/../Frameworks/libyubikey.0.dylib yubioath-desktop.app/Contents/Frameworks/libykpers-1.dylib
-
       - name: Rename and archive app bundle
         run: |
           export REF=$(echo ${GITHUB_REF} | cut -d '/' -f 3)

.github/workflows/snap-ykman-settings.patch

@@ -1,25 +1,13 @@
-From 373b80b420c04f897fccd10288f994bb66825011 Mon Sep 17 00:00:00 2001
-From: Dag Heyman <dag@yubico.com>
-Date: Tue, 3 Mar 2020 08:29:16 +0100
-Subject: [PATCH] ykman: use SNAP directory for settings
-
----
- ykman/settings.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/ykman/settings.py b/ykman/settings.py
-index ef76670..5b7b942 100644
+index 77ca6d4..d64908e 100644
 --- a/ykman/settings.py
 +++ b/ykman/settings.py
-@@ -42,7 +42,7 @@ def _get_conf_dir():
- 
- class Settings(dict):
+@@ -41,7 +41,7 @@ class Settings(dict):
+     _config_dir = HOME_CONFIG
+
      def __init__(self, name):
--        self.fname = os.path.join(_get_conf_dir(), name + '.json')
+-        self.fname = Path(self._config_dir).expanduser().resolve() / (name + ".json")
 +        self.fname = os.path.join(os.getenv('SNAP_USER_DATA'), '.config', '.ykman', name + '.json')
-         if os.path.isfile(self.fname):
-             with open(self.fname, 'r') as f:
-                 self.update(json.load(f))
--- 
-2.20.1
-
+         if self.fname.is_file():
+             with self.fname.open("r") as fd:
+                 self.update(json.load(fd))

.github/workflows/windows-x64.yml

@@ -3,7 +3,6 @@ name: windows 64 bit
 on: [push, pull_request]
 
 env:
-  PYTHON_VER: '3.8.7'
   PYTHON_VER_DIRNAME: 'python38'
   PYOTHERSIDE_VER: '1.5.9'
 
@@ -16,7 +15,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: ${{ env.PYTHON_VER }}
+          python-version: '3.8.x'
           architecture: 'x64'
 
       - name: Install Qt
@@ -30,22 +29,17 @@ jobs:
 
       - name: Download dependencies
         run: |
+          $py_ver = python -V
+          $py_ver -match "python (?<content>.*)"
+          $version = $matches['content']
           wget https://download.qt.io/official_releases/jom/jom.zip -OutFile jom.zip
           wget https://github.com/thp/pyotherside/archive/$env:PYOTHERSIDE_VER.zip -OutFile pyotherside-$env:PYOTHERSIDE_VER.zip
-          wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win64.zip -OutFile ykpers-1.20.0-win64.zip
-          wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win64.zip.sig -OutFile ykpers-1.20.0-win64.zip.sig
-          wget https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.7z -OutFile libusb-1.0.22.7z
-          wget https://www.python.org/ftp/python/$env:PYTHON_VER/python-$env:PYTHON_VER-embed-amd64.zip -OutFile python-$env:PYTHON_VER-embed-amd64.zip
+          wget https://www.python.org/ftp/python/$version/python-$version-embed-amd64.zip -OutFile python-$version-embed-amd64.zip
         shell: powershell
 
       - name: Fetch GPG keys
         run: gpg --no-default-keyring --keyring yubico --keyserver hkps://keys.openpgp.org --recv-keys 0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A
 
-      - name: Verify signature/checksums of downloaded files
-        run: |
-          sha256sum -c ./.github/workflows/windows-libs.sha256sum
-          gpg --no-default-keyring --keyring yubico --verify ykpers-1.20.0-win64.zip.sig ykpers-1.20.0-win64.zip
-
       - name: Install swig
         run: choco install swig
 
@@ -55,11 +49,14 @@ jobs:
 
       - name: Prepare pyotherside
         run: |
+          $py_ver = python -V
+          $py_ver -match "python (?<content>.*)"
+          $version = $matches['content']
           7z x pyotherside-$env:PYOTHERSIDE_VER.zip
           cd pyotherside-$env:PYOTHERSIDE_VER
           (Get-Content .\src\qmldir).replace('pyothersideplugin', 'pyothersideplugin1') | Set-Content .\src\qmldir
           Clear-Content python.pri
-          Add-Content python.pri "PYTHON_CONFIG = python3-config`nQMAKE_LIBS += -LC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x64\libs -l$env:PYTHON_VER_DIRNAME`nQMAKE_CXXFLAGS += -IC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x64\include`n"
+          Add-Content python.pri "PYTHON_CONFIG = python3-config`nQMAKE_LIBS += -LC:\hostedtoolcache\windows\Python\$version\x64\libs -l$env:PYTHON_VER_DIRNAME`nQMAKE_CXXFLAGS += -IC:\hostedtoolcache\windows\Python\$version\x64\include`n"
         shell: powershell
 
       - name: Build and install pyotherside
@@ -90,20 +87,18 @@ jobs:
       - name: Copy over files to release folder
         shell: powershell
         run: |
+          $py_ver = python -V
+          $py_ver -match "python (?<content>.*)"
+          $version = $matches['content']
+
           Copy-Item .\pymodules .\release -recurse
           Get-ChildItem -File -Include *.pyc -Recurse | Remove-Item -Force
           Get-ChildItem -Include __pycache__ -Recurse | Remove-Item -Force
           Get-ChildItem -Include *.cpp -Recurse | Remove-Item -Force
           Get-ChildItem -Include *.obj -Recurse | Remove-Item -Force
-
-          7z x ykpers-1.20.0-win64.zip
-          Copy-Item .\bin\*.dll .\release\pymodules\ykman\native -Force
-
-          7z x libusb-1.0.22.7z
-          Copy-Item .\MS64\dll\*.dll .\release\pymodules\ykman\native -Force
-
+          
           cd .\release
-          7z x ..\python-$env:PYTHON_VER-embed-amd64.zip
+          7z x ..\python-$version-embed-amd64.zip
 
       - name: Create .zip artifact
         shell: powershell

.github/workflows/windows-x86.yml

@@ -3,7 +3,6 @@ name: windows 32bit
 on: [push, pull_request]
 
 env:
-  PYTHON_VER: '3.8.7'
   PYTHON_VER_DIRNAME: 'python38'
   PYOTHERSIDE_VER: '1.5.9'
 
@@ -16,7 +15,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: ${{ env.PYTHON_VER }}
+          python-version: '3.8.x'
           architecture: 'x86'
 
       - name: Install Qt
@@ -30,22 +29,17 @@ jobs:
 
       - name: Download dependencies
         run: |
+          $py_ver = python -V
+          $py_ver -match "python (?<content>.*)"
+          $version = $matches['content']
           wget https://download.qt.io/official_releases/jom/jom.zip -OutFile jom.zip
           wget https://github.com/thp/pyotherside/archive/$env:PYOTHERSIDE_VER.zip -OutFile pyotherside-$env:PYOTHERSIDE_VER.zip
-          wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win32.zip -OutFile ykpers-1.20.0-win32.zip
-          wget https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0-win32.zip.sig -OutFile ykpers-1.20.0-win32.zip.sig
-          wget https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.7z -OutFile libusb-1.0.22.7z
-          wget https://www.python.org/ftp/python/$env:PYTHON_VER/python-$env:PYTHON_VER-embed-win32.zip -OutFile python-$env:PYTHON_VER-embed-win32.zip
+          wget https://www.python.org/ftp/python/$version/python-$version-embed-win32.zip -OutFile python-$version-embed-win32.zip
         shell: powershell
 
       - name: Fetch GPG keys
         run: gpg --no-default-keyring --keyring yubico --keyserver hkps://keys.openpgp.org --recv-keys 0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A
 
-      - name: Verify signature/checksums of downloaded files
-        run: |
-          sha256sum -c ./.github/workflows/windows-x86-libs.sha256sum
-          gpg --no-default-keyring --keyring yubico --verify ykpers-1.20.0-win32.zip.sig ykpers-1.20.0-win32.zip
-
       - name: Install swig
         run: choco install swig
 
@@ -56,11 +50,15 @@ jobs:
 
       - name: Prepare pyotherside
         run: |
+          $py_ver = python -V
+          $py_ver -match "python (?<content>.*)"
+          $version = $matches['content']
+
           7z x pyotherside-$env:PYOTHERSIDE_VER.zip
           cd pyotherside-$env:PYOTHERSIDE_VER
           (Get-Content .\src\qmldir).replace('pyothersideplugin', 'pyothersideplugin1') | Set-Content .\src\qmldir
           Clear-Content python.pri
-          Add-Content python.pri "PYTHON_CONFIG = python3-config`nQMAKE_LIBS += -LC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86\libs -l$env:PYTHON_VER_DIRNAME`nQMAKE_CXXFLAGS += -IC:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86\include`n"
+          Add-Content python.pri "PYTHON_CONFIG = python3-config`nQMAKE_LIBS += -LC:\hostedtoolcache\windows\Python\$version\x86\libs -l$env:PYTHON_VER_DIRNAME`nQMAKE_CXXFLAGS += -IC:\hostedtoolcache\windows\Python\$version\x86\include`n"
         shell: powershell
 
       - name: Build and install pyotherside
@@ -75,7 +73,10 @@ jobs:
 
       - name: Build app
         run: |
-          set PATH=C:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86\Scripts;C:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86;D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH%
+          $py_ver = python -V
+          $py_ver -match "python (?<content>.*)"
+          $version = $matches['content']
+          set PATH=C:\hostedtoolcache\windows\Python\$version\x86\Scripts;C:\hostedtoolcache\windows\Python\$version\x86;D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH%
           call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86
           qmake
           jom
@@ -90,20 +91,18 @@ jobs:
 
       - name: Copy over files to release folder
         run: |
+          $py_ver = python -V
+          $py_ver -match "python (?<content>.*)"
+          $version = $matches['content']
+
           Copy-Item .\pymodules .\release -recurse
           Get-ChildItem -File -Include *.pyc -Recurse | Remove-Item -Force
           Get-ChildItem -Include __pycache__ -Recurse | Remove-Item -Force
           Get-ChildItem -Include *.cpp -Recurse | Remove-Item -Force
           Get-ChildItem -Include *.obj -Recurse | Remove-Item -Force
 
-          7z x ykpers-1.20.0-win32.zip
-          Copy-Item .\bin\*.dll .\release\pymodules\ykman\native -Force
-
-          7z x libusb-1.0.22.7z
-          Copy-Item .\MS32\dll\*.dll .\release\pymodules\ykman\native -Force
-
           cd .\release
-          7z x ..\python-$env:PYTHON_VER-embed-win32.zip
+          7z x ..\python-$version-embed-win32.zip
 
       - name: Create .zip artifact
         run: |

NEWS

@@ -1,3 +1,8 @@
+* Version 5.0.5 (released 2021-04-14)
+ ** Compatibility update for ykman 4.0.
+ ** Add additional product names.
+ ** Linux: Use the embedded version of ykman in AppImage.
+
 * Version 5.0.4 (released 2020-05-14)
  ** New app icons on all platforms
  ** Adjust the behaviour of the search bar, do not search accounts without having focus

docker/xenial-appimage/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get install -y git make build-essential g++ libssl-dev zlib1g-dev libbz2
     qt515sensors qt515serialbus qt515serialport qt515x11extras qt515quickcontrols2 \
     qt515connectivity qt515scxml qt515wayland qt515remoteobjects qtbase5-dev \
     desktop-file-utils libglib2.0-bin qtchooser python3-pip python mesa-common-dev curl swig \
-    libpcsclite-dev libffi-dev libykpers-1-1
+    libpcsclite-dev libffi-dev
 ENV QT_BASE_DIR=/opt/qt515 \
     QT_DIR=/opt/qt515 \
     PYTHON_CFLAGS=-fPIC \
@@ -40,8 +40,6 @@ RUN mkdir -p yubioath-desktop/appDir/usr \
     && pip3 install --upgrade pip \
     && pip3 install -r requirements.txt \
     && cp -R /root/.pyenv/versions/3.8.7/* appDir/usr \
-    && apt-get download libykpers-1-1 \
-    && dpkg -x libykpers*.deb appDir/ \
     && qmake \
     && make \
     && cp resources/com.yubico.yubioath.desktop appDir/ \