GUI rework for source-only builds + CLI security fixes + packaging + cross-platform scaffolding
Fixes the "GUI functions don't work on GNU Guix" report and a batch of
adversarial-audit findings across the CLI, decoder, crypto and packaging.
GUI (gui/src/zupt_gui.py)
- Root cause of the broken GUI: every encryption path defaulted to the
libzuptsdk "SDK v2" modes, which are absent from the source-only build and
exit 1. Reworked Keys/Compress/Extract around the native modes with a
build-aware PQ-mode selector: Hybrid (--pq, default), Full PQ (--pq-only),
and SDK v2 only when the binary reports WITH_SDK support. Capability is
detected from `version` ("Build:"/"KDF:" lines) with a `help` fallback.
- Extract/Verify gain a PQ private-key input with auto-detect (reads the
archive via `info` to pick --pq vs --pq-only). Verify could not verify any
PQ archive before (password field only).
- run_async now holds a LIST of in-flight (thread, worker) refs; DiskTab's two
buttons previously shared one slot, so a second op GC'd the first QThread
mid-run. About tab corrected (codec 2.60.4, PBKDF2 default, --pq-only, URL).
CLI (src/zupt_main.c)
- compress -p <archive> <files> swallowed the archive name as the password and
truncated the first input file (silent data loss, exit 0). Added a
data-loss guard: refuse to overwrite an existing non-.zupt file as the output
archive unless -y/--force; plus a self-overwrite guard.
- compress <archive> <src> -p <pw> wrote an UNENCRYPTED archive (exit 0)
because options after the first positional were treated as files. Now errors
on a misplaced option (with a `--` escape for real dashed filenames).
- Removed duplicated dead --pq-box/--pq-sdk branches. version/banner/usage now
state the build's real KDF (PBKDF2 on source-only) and repo URL; examples
lead with native --pq / --pq-only.
Security (audit findings)
- vv_decoder.c: the two AVX2 fast-path token decoders read a 2-/3-byte match
offset after only checking 1 byte remained -> heap over-read on a crafted
archive. Added the `ip + off_bytes > ip_end` guard the tail path already had.
- zupt_crypto.c: wipe ML-KEM/X25519 secret-key buffers when hybrid decrypt
init fails on key read (matches the pq-only path).
- zupt_format.c: bound attacker-controlled encryption_header_off before the
(off_t)+7 arithmetic in the info enc_type reader (avoid signed-overflow UB).
Packaging (would fail source-only)
- debian/rules (staged into debian/zupt, installed vendored .so), aur/PKGBUILD,
nix/flake.nix, homebrew (vendored .so + nonexistent AUDIT.md, stale /zupt
URLs) now build source-only. opensuse spec %files ships the shell completions
make install writes (rpmbuild no longer fails on unpackaged files);
_service + debian/control point at the vaptvupt repo; KDF claim corrected.
Cross-platform GUI packaging (new)
- packaging/portable/: OS-agnostic GUI package (zupt_gui.py + .bat/.command/.sh
launchers + README) that runs on Windows/macOS/Linux/BSD with Python+PySide6.
- .github/workflows/cross-platform.yml: builds real native binaries on
windows-latest + macos-latest runners (CLI, PyInstaller GUI, Inno Setup
installer, .dmg) and the portable zip, attaching them to the release on tag.
- packaging/windows/vaptvupt-gui.iss: Inno Setup installer script.
Validation: make check 16/16 (all distro-safe checks), GUI imports + command
contracts verified against the fixed CLI. test_help_consistency updated to
assert the truthful (build-aware) default KDF.
This commit is contained in:
parent
e8f7b3adb2
commit
43d6306a06
19 changed files with 750 additions and 169 deletions
57
packaging/portable/README.txt
Normal file
57
packaging/portable/README.txt
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
VaptVupt GUI — portable cross-platform package
|
||||
==============================================
|
||||
|
||||
The VaptVupt GUI is a single Python file (zupt_gui.py) built on Qt for Python
|
||||
(PySide6, or PyQt6 as a fallback). It runs on Windows, macOS, Linux and the
|
||||
BSDs — anywhere Python 3 and a Qt binding are installed. This portable package
|
||||
contains the GUI plus a launcher for each platform; it drives the `vaptvupt`
|
||||
command-line tool under the hood.
|
||||
|
||||
Contents
|
||||
--------
|
||||
zupt_gui.py The GUI (PySide6 / PyQt6).
|
||||
vaptvupt-gui.bat Windows launcher.
|
||||
vaptvupt-gui.command macOS launcher (double-clickable in Finder).
|
||||
vaptvupt-gui.sh Linux / BSD launcher.
|
||||
assets/zupt-icon.png Application icon.
|
||||
|
||||
Requirements
|
||||
------------
|
||||
1. Python 3.8 or newer.
|
||||
Windows: https://python.org (tick "Add python.exe to PATH")
|
||||
macOS: python.org, or `brew install python`
|
||||
Linux: your distro's python3 package
|
||||
FreeBSD: pkg install python311
|
||||
OpenBSD: pkg_add python%3
|
||||
2. A Qt binding:
|
||||
pip (any OS): python3 -m pip install PySide6
|
||||
Debian/Ubuntu: sudo apt install python3-pyqt6
|
||||
Fedora/RHEL: sudo dnf install python3-pyqt6
|
||||
FreeBSD: pkg install py311-pyside6
|
||||
OpenBSD: pkg_add py3-pyside6
|
||||
3. The vaptvupt CLI, either:
|
||||
* placed next to the launcher (vaptvupt.exe on Windows, vaptvupt
|
||||
elsewhere) — the launcher auto-detects it via VAPTVUPT_BIN, or
|
||||
* installed on PATH (deb/rpm/AppImage/Homebrew/pkg — see the project
|
||||
release page).
|
||||
|
||||
Running
|
||||
-------
|
||||
Windows: double-click vaptvupt-gui.bat
|
||||
macOS: double-click vaptvupt-gui.command
|
||||
(first run: right-click > Open to bypass Gatekeeper for an
|
||||
unsigned script, or `xattr -dr com.apple.quarantine .`)
|
||||
Linux/BSD: ./vaptvupt-gui.sh
|
||||
|
||||
Troubleshooting
|
||||
---------------
|
||||
* "requires PySide6 or PyQt6" -> install a Qt binding (requirement 2).
|
||||
* "vaptvupt not found" -> put the CLI next to the launcher or on PATH.
|
||||
* Set VAPTVUPT_DEBUG=1 to print the binary-discovery log to stderr.
|
||||
|
||||
Fully self-contained native installers (Windows .exe/.msi, macOS .dmg) that
|
||||
bundle Python + Qt + the CLI are produced by the project's CI on real Windows
|
||||
and macOS runners — see the release page. This portable package is the
|
||||
dependency-light option that works identically on every platform.
|
||||
|
||||
License: AGPL-3.0-or-later. Project: https://git.securityops.co/cristiancmoises/vaptvupt
|
||||
31
packaging/portable/vaptvupt-gui.bat
Normal file
31
packaging/portable/vaptvupt-gui.bat
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
@echo off
|
||||
rem SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
rem VaptVupt GUI launcher for Windows (portable package).
|
||||
rem
|
||||
rem Requirements on the target machine:
|
||||
rem * Python 3.8+ (https://python.org — tick "Add python.exe to PATH")
|
||||
rem * PySide6 or PyQt6: py -m pip install PySide6
|
||||
rem * The vaptvupt CLI: vaptvupt.exe next to this file, or on PATH.
|
||||
rem
|
||||
rem If vaptvupt.exe sits beside this launcher we pin it via VAPTVUPT_BIN so the
|
||||
rem GUI drives the bundled CLI rather than any other copy on PATH.
|
||||
setlocal
|
||||
set "HERE=%~dp0"
|
||||
if exist "%HERE%vaptvupt.exe" set "VAPTVUPT_BIN=%HERE%vaptvupt.exe"
|
||||
|
||||
rem Prefer the py launcher, fall back to python on PATH.
|
||||
where py >nul 2>nul
|
||||
if %ERRORLEVEL%==0 (
|
||||
py -3 "%HERE%zupt_gui.py" %*
|
||||
) else (
|
||||
python "%HERE%zupt_gui.py" %*
|
||||
)
|
||||
set "RC=%ERRORLEVEL%"
|
||||
if not "%RC%"=="0" (
|
||||
echo.
|
||||
echo vaptvupt-gui exited with code %RC%.
|
||||
echo If you saw an import error, install the Qt binding: py -m pip install PySide6
|
||||
echo If the CLI was not found, put vaptvupt.exe next to this launcher or on PATH.
|
||||
pause
|
||||
)
|
||||
endlocal
|
||||
17
packaging/portable/vaptvupt-gui.command
Normal file
17
packaging/portable/vaptvupt-gui.command
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/bash
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
# VaptVupt GUI launcher for macOS (portable package).
|
||||
# Double-clickable in Finder (.command). Requirements on the target Mac:
|
||||
# * Python 3.8+ (python.org, Homebrew `brew install python`, or Xcode CLT)
|
||||
# * PySide6 or PyQt6: python3 -m pip install PySide6
|
||||
# * The vaptvupt CLI: `vaptvupt` next to this file, or on PATH
|
||||
# (Homebrew: `brew install cristiancmoises/tap/vaptvupt`).
|
||||
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
[ -x "$HERE/vaptvupt" ] && export VAPTVUPT_BIN="$HERE/vaptvupt"
|
||||
|
||||
PY="$(command -v python3 || command -v python || true)"
|
||||
if [ -z "$PY" ]; then
|
||||
osascript -e 'display alert "VaptVupt GUI" message "Python 3 not found. Install it from python.org or `brew install python`, then run: python3 -m pip install PySide6"' 2>/dev/null
|
||||
echo "Python 3 not found." >&2; exit 1
|
||||
fi
|
||||
exec "$PY" "$HERE/zupt_gui.py" "$@"
|
||||
21
packaging/portable/vaptvupt-gui.sh
Normal file
21
packaging/portable/vaptvupt-gui.sh
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
# VaptVupt GUI launcher for Linux and the BSDs (portable package).
|
||||
# Requirements on the target system:
|
||||
# * Python 3.8+
|
||||
# * PySide6 or PyQt6
|
||||
# Debian/Ubuntu: sudo apt install python3-pyqt6
|
||||
# Fedora/RHEL: sudo dnf install python3-pyqt6
|
||||
# FreeBSD: pkg install py311-pyside6 (or py311-qt6-pyqt)
|
||||
# OpenBSD: pkg_add py3-pyside6
|
||||
# any OS via pip: python3 -m pip install PySide6
|
||||
# * The vaptvupt CLI: `vaptvupt` next to this file, or on PATH.
|
||||
HERE="$(cd "$(dirname "$0")" && pwd)"
|
||||
[ -x "$HERE/vaptvupt" ] && export VAPTVUPT_BIN="$HERE/vaptvupt"
|
||||
|
||||
PY="$(command -v python3 || command -v python || true)"
|
||||
if [ -z "$PY" ]; then
|
||||
echo "vaptvupt-gui: Python 3 not found on PATH." >&2
|
||||
exit 1
|
||||
fi
|
||||
exec "$PY" "$HERE/zupt_gui.py" "$@"
|
||||
Loading…
Reference in a new issue