From 95e2d11e61ff87418eeadb48c500711636dafe8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Tue, 30 Apr 2019 11:42:38 +0200
Subject: [PATCH] Add qvm-showterminal

---
 Makefile                        |  2 ++
 debian/qubes-core-agent.install |  1 +
 misc/qvm-showterminal           | 24 ++++++++++++++++++++++++
 rpm_spec/core-agent.spec.in     |  1 +
 4 files changed, 28 insertions(+)
 create mode 100755 misc/qvm-showterminal

diff --git a/Makefile b/Makefile
index 4dbca0d..ccac628 100644
--- a/Makefile
+++ b/Makefile
@@ -317,6 +317,8 @@ install-common: install-doc
 	
 	install -m 0755 misc/tinyproxy-wrapper $(DESTDIR)/usr/lib/qubes/tinyproxy-wrapper
 
+	install -m 0755 misc/qvm-showterminal $(DESTDIR)$(BINDIR)/qvm-showterminal
+
 	install -d $(DESTDIR)/var/run/qubes
 	install -d $(DESTDIR)/rw
 
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 4a09cab..daa64f2 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -100,6 +100,7 @@ usr/bin/qvm-move-to-vm
 usr/bin/qvm-open-in-dvm
 usr/bin/qvm-open-in-vm
 usr/bin/qvm-run-vm
+usr/bin/qvm-showterminal
 usr/bin/qvm-sync-clock
 usr/bin/xenstore-watch-qubes
 usr/lib/python2.7/dist-packages/qubesagent-*.egg-info/*
diff --git a/misc/qvm-showterminal b/misc/qvm-showterminal
new file mode 100755
index 0000000..c7f84ad
--- /dev/null
+++ b/misc/qvm-showterminal
@@ -0,0 +1,24 @@
+#!/bin/bash
+QREXEC_REQUESTED_TARGET="$1"
+
+qrexec_console() {
+    QREXEC_REQUESTED_TARGET="$1"
+
+    qrexec-client-vm "$QREXEC_REQUESTED_TARGET" qubes.ShowTerminal 2>/dev/null
+
+    # exit code 200 is flock exit code in qubes.ShowTerminal
+    exit_code=$?
+    if [ $exit_code -gt 0 ]; then
+        if [ $exit_code -ne 200 ]; then
+            printf "Cannot connect to %s" "$QREXEC_REQUESTED_TARGET"
+        else
+            printf "A qube is already connected to %s" "$QREXEC_REQUESTED_TARGET"
+        fi
+        exit 1
+    fi
+}
+
+export -f qrexec_console
+
+socat file:/dev/tty,rawer,escape=0x0f SYSTEM:"qrexec_console $QREXEC_REQUESTED_TARGET" 2>/dev/null
+printf '\n'
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 0d3e3a1..c9c4740 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -627,6 +627,7 @@ rm -f %{name}-%{version}
 /usr/bin/qubes-run-terminal
 /usr/bin/qubes-open
 /usr/bin/qubes-session-autostart
+/usr/bin/qvm-showterminal
 %dir /usr/lib/qubes
 /usr/lib/qubes/prepare-suspend
 /usr/lib/qubes/qfile-agent