From 8a850692f828427045a7a5ebe251eb7ef367924a Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Sun, 18 Sep 2022 23:30:29 -0400 Subject: [PATCH 1/6] Update qubesformation.py --- action_plugins/qubesformation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action_plugins/qubesformation.py b/action_plugins/qubesformation.py index b6369cd..d975592 100644 --- a/action_plugins/qubesformation.py +++ b/action_plugins/qubesformation.py @@ -99,7 +99,7 @@ class ActionModule(template): qubesdata = commonlib.inject_qubes(task_vars) task_vars["vms"] = generate_datastructure(qubesdata, task_vars) with tempfile.NamedTemporaryFile() as x: - x.write(contents) + x.write(contents.encode()) x.flush() self._task.args['src'] = x.name retval = template.run(self, tmp, task_vars) @@ -107,7 +107,7 @@ class ActionModule(template): return retval with tempfile.NamedTemporaryFile() as y: - y.write(topcontents) + y.write(topcontents.encode()) y.flush() # Create new tmp path -- the other was blown away. From 17303a9f922cb7de884cd9e97b3d6d32e88f2913 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Mon, 26 Sep 2022 22:09:50 -0400 Subject: [PATCH 2/6] Update bombshell-client --- bin/bombshell-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bombshell-client b/bin/bombshell-client index 73ea314..940dcfd 100755 --- a/bin/bombshell-client +++ b/bin/bombshell-client @@ -352,7 +352,7 @@ def main_master(): assert remote_command def anypython(exe): - return "` test -x %s && echo %s || echo python`" % ( + return "` test -x %s && echo %s || echo python3`" % ( quote(exe), quote(exe), ) From e3d1084c92dadd7b675f3857088c8f2cf47c127e Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Mon, 26 Sep 2022 23:40:59 -0400 Subject: [PATCH 3/6] Update qubes.py --- connection_plugins/qubes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connection_plugins/qubes.py b/connection_plugins/qubes.py index 85f7380..5dbbde6 100644 --- a/connection_plugins/qubes.py +++ b/connection_plugins/qubes.py @@ -313,7 +313,7 @@ class Connection(ConnectionBase): if not self._connected: remote_cmd = [to_bytes(x, errors='surrogate_or_strict') for x in [ # 'strace', '-s', '2048', '-o', '/tmp/log', - 'python', '-u', '-i', '-c', preamble + 'python3', '-u', '-i', '-c', preamble ]] addr = self._play_context.remote_addr proxy = to_bytes(self.get_option("management_proxy")) if self.get_option("management_proxy") else "" From 6eba5edf1f54bc3055d8b1bba18cf8e223b26acf Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Tue, 27 Sep 2022 16:32:15 -0400 Subject: [PATCH 4/6] Update commonlib.py --- action_plugins/commonlib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/action_plugins/commonlib.py b/action_plugins/commonlib.py index df4506e..ef7963d 100644 --- a/action_plugins/commonlib.py +++ b/action_plugins/commonlib.py @@ -96,6 +96,8 @@ def inject_qubes(inject): pass elif vmtype == "ProxyVM": add(flags, "proxy") + elif vmtype == "DispVM": + pass elif vmtype == "TemplateVM": try: qubes["source"] = qubes["template"] From aa712c35e00dc13ea6657050a16f89ba65c78581 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Fri, 30 Sep 2022 21:10:38 -0400 Subject: [PATCH 5/6] Update qubesformation.py --- action_plugins/qubesformation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/action_plugins/qubesformation.py b/action_plugins/qubesformation.py index d975592..ea3fbf1 100644 --- a/action_plugins/qubesformation.py +++ b/action_plugins/qubesformation.py @@ -97,6 +97,7 @@ class ActionModule(template): def run(self, tmp=None, task_vars=None): qubesdata = commonlib.inject_qubes(task_vars) + print(task_vars) task_vars["vms"] = generate_datastructure(qubesdata, task_vars) with tempfile.NamedTemporaryFile() as x: x.write(contents.encode()) From 9a592548e29343a1b18be04c26f5a0fb7666233f Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Sat, 1 Oct 2022 01:05:16 -0400 Subject: [PATCH 6/6] Update qubesformation.py --- action_plugins/qubesformation.py | 1 - 1 file changed, 1 deletion(-) diff --git a/action_plugins/qubesformation.py b/action_plugins/qubesformation.py index ea3fbf1..d975592 100644 --- a/action_plugins/qubesformation.py +++ b/action_plugins/qubesformation.py @@ -97,7 +97,6 @@ class ActionModule(template): def run(self, tmp=None, task_vars=None): qubesdata = commonlib.inject_qubes(task_vars) - print(task_vars) task_vars["vms"] = generate_datastructure(qubesdata, task_vars) with tempfile.NamedTemporaryFile() as x: x.write(contents.encode())