From c9ba1fe906e83b82f95071ad562b08beebffadca Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Thu, 28 May 2026 18:10:30 +0200 Subject: [PATCH 1/2] Log calls made from dom0 to the journal Follow dom0 calls: sudo journalctl -f SYSLOG_IDENTIFER=qrexec-client --- daemon/qrexec-client.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/daemon/qrexec-client.c b/daemon/qrexec-client.c index 1d041bb7..d34fcd74 100644 --- a/daemon/qrexec-client.c +++ b/daemon/qrexec-client.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "libqrexec-utils.h" #include "qrexec-daemon-common.h" @@ -272,6 +273,16 @@ int main(int argc, char **argv) usage(argv[0], 1); } + if (access("/run/qubes-service/qrexec-debug", F_OK) == 0) { + char * src_domain_for_log; + if (src_domain_name == NULL) + src_domain_for_log = "dom0"; + else + src_domain_for_log = src_domain_name; + openlog("qrexec-client", LOG_PID, LOG_USER); + syslog(LOG_INFO, "qrexec: %s: %s -> %s", remote_cmdline, src_domain_for_log, domname); + closelog(); + } if (target_refers_to_dom0(domname)) { if (request_id != NULL) { if (request_id[0] == '\0') { From da45b05fba82e8ad21aaba163b0a68256c6358db Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Fri, 29 May 2026 10:12:00 +0200 Subject: [PATCH 2/2] Install test dependencies --- .gitlab-ci.yml | 1 + run-tests | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4cffbdfe..37d3d714 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ include: - sudo dnf install -y python3-pip python3-gobject gtk3 python3-pytest python3-coverage python3-devel pam-devel pandoc gcc git make findutils clang xorg-x11-server-Xvfb python3-pytest-asyncio python3-inotify sequoia-sqv + python3-gbulb - git config --global --add safe.directory "${CI_PROJECT_DIR}" - git clone https://github.com/QubesOS/qubes-core-vchan-socket ~/qubes-core-vchan-socket - make -C ~/qubes-core-vchan-socket all diff --git a/run-tests b/run-tests index c3accbd8..9e465ab4 100755 --- a/run-tests +++ b/run-tests @@ -1,8 +1,18 @@ #!/bin/bash -ex case $0 in (/*) cd "${0%/*}/";; (*/*) cd "./${0%/*}";; esac + +install_rpm_deps(){ + set -- python3dist\({coverage,pytest,gbulb,pyinotify,pytest-asyncio}\) pam-devel + if ! test -f /etc/qubes-release; then + sudo dnf install "${@}" || : # we don’t actually care if this succeeds + return + fi + set -- "${@}" qubes-libvchan-xen-devel + sudo qubes-dom0-update "${@}" || : +} if command -v dnf >/dev/null; then - sudo dnf install python3dist\({coverage,pytest,gbulb,pyinotify,pytest-asyncio}\) qubes-libvchan-xen-devel pam-devel || : + install_rpm_deps fi if pkg-config vchan-socket; then if [[ -n "${USE_ASAN-}" ]]; then