Skip to content

Allow restricting qubesdb write acccess on Linux #72

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
Jun 15, 2026
Merged

Allow restricting qubesdb write acccess on Linux #72

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
e567724
Remove trailing spaces
ArrayBolt3 May 6, 2026
d755337
Allow restricting qubesdb write acccess on Linux
ArrayBolt3 May 7, 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
33 changes: 30 additions & 3 deletions client/qdb-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,49 @@ static int connect_to_daemon(struct qdb_handle *qh) {
int len;
int fd;

/* Try RW socket first */
if ((fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) == -1) {
perror("socket");
goto error;
}

remote.sun_family = AF_UNIX;
if (qh->vmname) {
snprintf(remote.sun_path, sizeof(remote.sun_path), QDB_DAEMON_PATH_PATTERN, qh->vmname);
snprintf(remote.sun_path, sizeof(remote.sun_path), QDB_DAEMON_PATH_RW_PATTERN, qh->vmname);
} else {
snprintf(remote.sun_path, sizeof(remote.sun_path), QDB_DAEMON_LOCAL_PATH);
snprintf(remote.sun_path, sizeof(remote.sun_path), QDB_DAEMON_LOCAL_RW_PATH);
}

len = strlen(remote.sun_path) + sizeof(remote.sun_family);
if (connect(fd, (struct sockaddr *) &remote, len) == -1) {
if (connect(fd, (struct sockaddr *) &remote, len) != -1) {
goto success;
}

/* Cleanup if that fails */
if (fd >= 0)
close(fd);

/* Try RO socket next */
if ((fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) == -1) {
perror("socket");
goto error;
}

remote.sun_family = AF_UNIX;
if (qh->vmname) {
snprintf(remote.sun_path, sizeof(remote.sun_path), QDB_DAEMON_PATH_RO_PATTERN, qh->vmname);
} else {
snprintf(remote.sun_path, sizeof(remote.sun_path), QDB_DAEMON_LOCAL_RO_PATH);
}

len = strlen(remote.sun_path) + sizeof(remote.sun_family);
if (connect(fd, (struct sockaddr *) &remote, len) != -1) {
goto success;
}

goto error;

success:
qh->fd = fd;
return 1;

Expand Down
14 changes: 14 additions & 0 deletions daemon/db-cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,13 @@ static int handle_write(struct db_daemon_data *d, struct client *client,
char untrusted_data[QDB_MAX_DATA];
char *data;

#ifndef _WIN32
if (client != NULL && !client->can_write) {
fprintf(stderr, "write attempted by read-only client\n");
return discard_data_and_send_error(d, client, hdr);
}
#endif

if (!read_vchan_or_client(d, client, untrusted_data, hdr->data_len)) {
return 0;
}
Expand Down Expand Up @@ -448,6 +455,13 @@ static int handle_write(struct db_daemon_data *d, struct client *client,
/* this command is valid on both client socket and vchan */
static int handle_rm(struct db_daemon_data *d, struct client *client,
struct qdb_hdr *hdr) {
#ifndef _WIN32
if (client != NULL && !client->can_write) {
fprintf(stderr, "write attempted by read-only client\n");
return discard_data_and_send_error(d, client, hdr);
}
#endif

if (hdr->data_len > 0) {
fprintf(stderr, "CMD_RM shouldn't have data field\n");
/* recovery path */
Expand Down
Loading