Skip to content

Log calls made from dom0 to the journal #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 2 commits into from
Jul 17, 2026
+23 −1
Merged

Log calls made from dom0 to the journal #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9ba1fe
Log calls made from dom0 to the journal
ben-grande May 28, 2026
da45b05
Install test dependencies
ben-grande May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions daemon/qrexec-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <fcntl.h>
#include <err.h>
#include <time.h>
#include <syslog.h>

#include "libqrexec-utils.h"
#include "qrexec-daemon-common.h"
Expand Down Expand Up @@ -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') {
Expand Down
12 changes: 11 additions & 1 deletion run-tests
View file
Open in desktop

@marmarek marmarek Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like this change, when user calls the script directly on their own system, it should at least ask for confirmation.
The failure you got in CI was because you forgot to add the package to CI config (.gitlab-ci.yml).

Original file line number Diff line number Diff line change
@@ -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
Expand Down