From a95d3e9ffc83de25cdd6e2c064cb19442daae09c Mon Sep 17 00:00:00 2001
From: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Mon, 20 May 2024 20:27:48 -0400
Subject: [PATCH] Add qubes.UnsafeFileCopy service

This is mostly identical to qubes.Filecopy, but it skips character set
checking.

In the future, this might be replaced by arguments to the qubes.Filecopy
service, but for now, the explicit "Unsafe" in the service name is
easier for users to understand.
---
 debian/qubes-core-agent.install | 1 +
 qubes-rpc/Makefile              | 3 ++-
 qubes-rpc/qubes.UnsafeFileCopy  | 6 ++++++
 rpm_spec/core-agent.spec.in     | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 qubes-rpc/qubes.UnsafeFileCopy

diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 633a212a..36ac16d4 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -13,6 +13,7 @@ etc/qubes-rpc/qubes.ShowInTerminal
 etc/qubes-rpc/qubes.Backup
 etc/qubes-rpc/qubes.DetachPciDevice
 etc/qubes-rpc/qubes.Filecopy
+etc/qubes-rpc/qubes.UnsafeFileCopy
 etc/qubes-rpc/qubes.GetAppmenus
 etc/qubes-rpc/qubes.GetImageRGBA
 etc/qubes-rpc/qubes.InstallUpdatesGUI
diff --git a/qubes-rpc/Makefile b/qubes-rpc/Makefile
index 71867d85..bf3020e3 100644
--- a/qubes-rpc/Makefile
+++ b/qubes-rpc/Makefile
@@ -55,7 +55,8 @@ install:
 	install -t $(DESTDIR)$(BINDIR) -m 4755 qfile-unpacker
 	install -d $(DESTDIR)$(QUBESRPCCMDDIR)
 	install -t $(DESTDIR)$(QUBESRPCCMDDIR) \
-		qubes.Filecopy qubes.OpenInVM qubes.VMShell \
+		qubes.Filecopy qubes.UnsafeFileCopy \
+		qubes.OpenInVM qubes.VMShell \
 		qubes.VMRootShell \
 		qubes.VMExec \
 		qubes.OpenURL \
diff --git a/qubes-rpc/qubes.UnsafeFileCopy b/qubes-rpc/qubes.UnsafeFileCopy
new file mode 100644
index 00000000..fa39491d
--- /dev/null
+++ b/qubes-rpc/qubes.UnsafeFileCopy
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -f /usr/lib/qubes/qvm_nautilus_bookmark.sh ]
+then
+  /usr/lib/qubes/qvm_nautilus_bookmark.sh >/dev/null 2>&1 </dev/null
+fi
+exec /usr/lib/qubes/qfile-unpacker --allow-unsafe-characters
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 70082a19..31126e7e 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -882,6 +882,7 @@ rm -f %{name}-%{version}
 %dir /etc/qubes-rpc
 %config(noreplace) /etc/qubes-rpc/qubes.ShowInTerminal
 %config(noreplace) /etc/qubes-rpc/qubes.Filecopy
+%config(noreplace) /etc/qubes-rpc/qubes.UnsafeFileCopy
 %config(noreplace) /etc/qubes-rpc/qubes.OpenInVM
 %config(noreplace) /etc/qubes-rpc/qubes.OpenURL
 %config(noreplace) /etc/qubes-rpc/qubes.GetAppmenus