Rename VMs per freedomofpress/securedrop-workstation#285

The file extension for export/print archives is still called `.sd-export`

MANIFEST.in

@@ -10,7 +10,7 @@ include files/mimeapps.list
 include files/open-in-dvm.desktop
 include files/securedrop-client
 include files/securedrop-client.desktop
-include files/sd-svs-qubes-gpg-domain.sh
+include files/sd-app-qubes-gpg-domain.sh
 include files/usr.bin.securedrop-client
 
 recursive-include alembic *

README.md

@@ -180,7 +180,7 @@ We support running the [developer environment on a non-Qubes OS](#developer-envi
 
 ### Staging environment
 
-* Run by directly invoking the client `python -m securedrop_client` on the `sd-svs` AppVM
+* Run by directly invoking the client `python -m securedrop_client` on the `sd-app` AppVM
 * Requires that `make all` in the `securedrop-workstation` repository has completed successfully
 * Uses `~/.securedrop_client` as its configuration directory
 * Uses the gpg key in the `sd-gpg` AppVM configured during `make all`
@@ -189,7 +189,7 @@ We support running the [developer environment on a non-Qubes OS](#developer-envi
 
 ### Production environment
 
-* Run by executing `securedrop-client` in the `sd-svs` AppVM (see [workstation documentation here](https://github.com/freedomofpress/securedrop-workstation/#using-the-securedrop-client))
+* Run by executing `securedrop-client` in the `sd-app` AppVM (see [workstation documentation here](https://github.com/freedomofpress/securedrop-workstation/#using-the-securedrop-client))
 * Requires that `make all` in the `securedrop-workstation` repository has completed successfully
 * Uses `~/.securedrop_client` as its configuration directory
 * Uses the gpg key in the `sd-gpg` AppVM configured during `make all`

files/open-in-dvm.desktop

@@ -4,7 +4,7 @@ Version=1.0
 Name=Open in Disposable VM
 Comment=Open file in a Disposable VM
 TryExec=/usr/bin/qvm-open-in-vm
-Exec=/usr/bin/qvm-open-in-vm '@dispvm:sd-svs-disp' %f
+Exec=/usr/bin/qvm-open-in-vm '@dispvm:sd-viewer' %f
 Icon=/usr/share/icons/Qubes/dispvm-gray.png
 Terminal=false
 Categories=Qubes;Utility;

securedrop_client/export.py

@@ -117,7 +117,7 @@ def _export_archive(cls, archive_path: str) -> str:
             output = subprocess.check_output(
                 [
                     quote('qvm-open-in-vm'),
-                    quote('sd-export-usb'),
+                    quote('sd-devices'),
                     quote(archive_path),
                     '--view-only'
                 ],

securedrop_client/logic.py

@@ -657,7 +657,7 @@ def on_file_open(self, file_uuid: str) -> None:
             self.data_dir, file.filename, file.original_filename)
 
         command = "qvm-open-in-vm"
-        args = ['$dispvm:sd-svs-disp', path_to_file_with_original_name]
+        args = ['$dispvm:sd-viewer', path_to_file_with_original_name]
         process = QProcess(self)
         process.start(command, args)
 

tests/test_export.py

@@ -346,4 +346,4 @@ def test__export_archive_with_evil_command(mocker):
     export._export_archive('somefile; rm -rf ~')
 
     check_output.assert_called_once_with(
-        ['qvm-open-in-vm', 'sd-export-usb', "'somefile; rm -rf ~'", '--view-only'], stderr=-2)
+        ['qvm-open-in-vm', 'sd-devices', "'somefile; rm -rf ~'", '--view-only'], stderr=-2)