Merge pull request #149 from freedomofpress/127-fix-feedback-on-sd-jo…

…urnalist

Fixes GUI feedback in sd-journalist

dom0/sd-journalist.sls

@@ -36,9 +36,14 @@ require:
     - group: root
     - mode: 644
 
-# Temporary workaround to bootstrap Salt support on target.
-qvm-run -a whonix-ws-14 "sudo apt-get install -qq python-futures":
-  cmd.run
+# Temporary workarounds for sd-journalist:
+#
+#   * python-futures required bootstrap Salt support
+#   * python-qt4 required for sd-process-feedback GUI integration
+#
+install python-qt4 and python-futures:
+  cmd.run:
+    - name: qvm-run -a whonix-ws-14 'sudo apt-get update && sudo apt-get install -qq python-futures python-qt4'
 
 # When our Qubes bug is fixed, this will *not* be used
 sd-journalist-dom0-qubes.OpenInVM:

sd-decrypt/decrypt-sd-submission

@@ -17,7 +17,7 @@ def send_progress(msg):
                          "sd-process.Feedback"],
                          close_fds=True,
                          stdin=subprocess.PIPE)
-    p.communicate(msg)
+    p.communicate(bytes(msg.encode('utf-8')))
 
 
 input = sys.argv[1]

sd-journalist/sd-process-download

@@ -68,7 +68,7 @@ wait_for_sigfile(sigfile)
 if os.path.isfile(fn) is False:
     c = subprocess.Popen(["/usr/local/bin/sd-process-feedback"],
                          stdin=subprocess.PIPE)
-    c.communicate('DOWNLOAD_FILE_MISSING\n')
+    c.communicate(bytes("DOWNLOAD_FILE_MISSING\n".encode('utf-8')))
     sys.exit()
 
 fh = tempfile.NamedTemporaryFile(suffix=".sd-xfer", delete=False)
@@ -81,7 +81,7 @@ fh.close()
 # from the same machine? This can only happen on sd-journalist.
 c = subprocess.Popen(["/usr/local/bin/sd-process-feedback"],
                      stdin=subprocess.PIPE)
-c.communicate(input="DOWNLOAD_BUNDLE_CREATED\n")
+c.communicate(bytes("DOWNLOAD_BUNDLE_CREATED\n".encode('utf-8')))
 
 # ship this to the next phase
 subprocess.call(["qvm-open-in-vm", "sd-decrypt", fh.name])

sd-journalist/sd-process-feedback

@@ -5,7 +5,7 @@ import posix
 import sys
 import os
 
-arg = sys.stdin.readline()
+arg = sys.stdin.readline().encode('utf-8')
 
 try:
     fifo = os.open('/home/user/sdfifo', posix.O_WRONLY | posix.O_NONBLOCK)

sd-svs/accept-sd-xfer-extracted

@@ -13,7 +13,7 @@ def send_progress(msg):
                          "sd-process.Feedback"],
                          close_fds=True,
                          stdin=subprocess.PIPE)
-    p.communicate(msg)
+    p.communicate(bytes(msg.encode('utf-8')))
 
 
 send_progress("DECRYPTED_BUNDLE_ON_SVS")