From 1cac51ac2f8eeb47ecb59fa85bcef2fc043705ef Mon Sep 17 00:00:00 2001
From: unman <unman@thirdeyesecurity.org>
Date: Thu, 13 Jun 2024 15:29:12 +0000
Subject: [PATCH] Mullvad - ensure Browser is updated in clients

---
 mullvad.spec               |  5 +++--
 mullvad/browser.sls        | 10 ++++++++++
 mullvad/browser_client.sls |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/mullvad.spec b/mullvad.spec
index 183de64..47c87e4 100644
--- a/mullvad.spec
+++ b/mullvad.spec
@@ -4,7 +4,7 @@ Release:        3%{?dist}
 Summary:        Set up a Mullvad qube and disposable template
 
 License:        GPLv3+
-SOURCE0:	mullvad
+SOURCE0:        mullvad
 
 %description
 This package creates a template, loaded with the MullvadVPN GUI and Mullvad Browser. 
@@ -50,8 +50,9 @@ if [ $1 -eq 1 ]; then
   qubesctl --skip-dom0 --targets=sys-mullvad state.apply mullvad.configure
 elif [ $1 -eq 2 ]; then
   qubesctl --skip-dom0 --targets=template-mullvad state.apply mullvad.browser
-  qubesctl --skip-dom0 --targets=template-mullvad state.apply mullvad.browser_client
+  qubesctl --skip-dom0 --targets=sys-mullvad state.apply mullvad.browser_client
   qubesctl --skip-dom0 --targets=sys-mullvad state.apply mullvad.configure
+  qubesctl --skip-dom0 --targets=mullvad-dvm state.apply mullvad.browser_client
 fi
 
 %postun
diff --git a/mullvad/browser.sls b/mullvad/browser.sls
index b00fa67..f63aa67 100644
--- a/mullvad/browser.sls
+++ b/mullvad/browser.sls
@@ -1,3 +1,13 @@
+delete_old_mullvad_browser_version:
+  file.absent:
+    - name: '/etc/skel/mullvad-browser'
+
+{% for archive in salt['file.find']('/etc/skel/Downloads/', name='mullvad_browser*') %}
+{{ archive }}_remove:
+  file.absent:
+    - name: {{ archive }}
+{% endfor %}
+
 /etc/skel/Downloads/mullvad_browser-linux-x86_64-13.0.16.tar.xz:
   file.managed:
     - source:
diff --git a/mullvad/browser_client.sls b/mullvad/browser_client.sls
index 8d7f968..e7351d7 100644
--- a/mullvad/browser_client.sls
+++ b/mullvad/browser_client.sls
@@ -1,3 +1,9 @@
+{% for archive in salt['file.find']('/home/user/Downloads/', name='mullvad_browser*') %}
+{{ archive }}_remove:
+  file.absent:
+    - name: {{ archive }}
+{% endfor %}
+
 /home/user/Downloads/mullvad_browser-linux-x86_64-13.0.16.tar.xz:
   file.managed:
     - source: