Skip to content
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

Jump to bottom

qubes.WaitForSession: refactor by waiting for qrexec-fork-server socket #192

Merged
merged 2 commits into from
Nov 13, 2019
Merged

qubes.WaitForSession: refactor by waiting for qrexec-fork-server socket #192

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
a44e739
qubes.WaitForSession: refactor by waiting for qrexec-fork-server socket
fepitre Nov 2, 2019
71ef524
vm-file-editor: drop old wait-for-session mechanism
fepitre Nov 11, 2019
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
18 changes: 5 additions & 13 deletions qubes-rpc/qubes.WaitForSession
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
#!/bin/sh

# old API - get the user from caller
#read -r IGNORE_USERNAME
USERNAME="$(qubesdb-read /default-user || echo 'user')"

# use default user provided in QubesDB, or hardcoded 'user' - this must be the
# same as the X session owner
USERNAME=$(qubesdb-read /default-user || echo 'user')
cmd='echo $$ >> /tmp/qubes-session-waiter; [ ! -f /tmp/qubes-session-env ] && exec sleep inf'
if [ "$(id -un)" = "$USERNAME" ]; then
sh -c "$cmd" 2>/dev/null
else
su -s /bin/sh -c "$cmd" - "$USERNAME" 2> /dev/null
fi
# the above line is _expected_ to be terminated by a signal, don't treat this as a failure
exit 0
while ! [ -e "/var/run/qubes/qrexec-server.$USERNAME.sock" ]
do
sleep 0.1
done
35 changes: 2 additions & 33 deletions qubes-rpc/vm-file-editor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,10 @@ void send_file_back(const char * filename)
int
main()
{
struct stat stat_pre, stat_post, session_stat;
struct stat stat_pre, stat_post;
int view_only = 0;
char *filename = get_filename(&view_only);
int child, status, log_fd, null_fd;
FILE *waiter_pidfile;

copy_file_by_name(filename);
if (view_only) {
Expand All @@ -162,37 +161,7 @@ main()
perror("stat pre");
exit(1);
}
#ifdef DEBUG
fprintf(stderr, "time=%s, waiting for qubes-session\n", gettime());
#endif
// wait for X server to starts (especially in DispVM)
if (stat("/tmp/qubes-session-env", &session_stat)) {
switch (child = fork()) {
case -1:
perror("fork");
exit(1);
case 0:
waiter_pidfile = fopen("/tmp/qubes-session-waiter", "a");
if (waiter_pidfile == NULL) {
perror("fopen waiter_pidfile");
exit(1);
}
fprintf(waiter_pidfile, "%d\n", getpid());
fclose(waiter_pidfile);
// check the second time, to prevent race
if (stat("/tmp/qubes-session-env", &session_stat)) {
// wait for qubes-session notify
pause();
}
exit(0);
default:
waitpid(child, &status, 0);
if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
//propagate exit code from child
exit(WEXITSTATUS(status));
}
}
}

#ifdef DEBUG
fprintf(stderr, "time=%s, starting editor\n", gettime());
#endif
Expand Down