WIP

Author: moreati

ansible_mitogen/mixins.py

@@ -460,23 +460,27 @@ def _low_level_execute_command(self, cmd, sudoable=True, in_data=None,
         # chicken-and-egg issue, mitogen needs a python to run low_level_execute_command
         # which is required by Ansible's discover_interpreter function
         if self._mitogen_discovering_interpreter:
-            possible_pythons = [
-                'python3',
-                'python2',
-                'python'
-            ]
+            if self._connection.transport in {'ssh'}:
+                possible_pythons = [
+                    '$(for p in python3 python2 python; do command -v "$p" 2>/dev/null && break; done;)',
+                ]
+            else:
+                possible_pythons = ['python3' 'python2', 'python']
         else:
             # not used, just adding a filler value
             possible_pythons = ['python']
 
         for possible_python in possible_pythons:
             try:
+                LOG.debug('_low_level_execute_command(): trying possible_python=%r', possible_python)
                 self._mitogen_interpreter_candidate = possible_python
                 rc, stdout, stderr = self._connection.exec_command(
                     cmd, in_data, sudoable, mitogen_chdir=chdir,
                 )
+                LOG.debug('_low_level_execute_command(): got rc=%d, stdout=%r, stderr=%r', rc, stdout, stderr)
             # TODO: what exception is thrown?
-            except:
+            except BaseException as exc:
+                LOG.debug('%r._low_level_execute_command for possible_python=%r: %s, %r', self, possible_python, type(exc), exc)
                 # we've reached the last python attempted and failed
                 if possible_python == possible_pythons[-1]:
                     raise

mitogen/parent.py

@@ -1454,7 +1454,7 @@ def get_python_argv(self):
             return self.options.python_path
         return [self.options.python_path]
 
-    def get_boot_command(self):
+    def _first_stage_base64(self):
         source = inspect.getsource(self._first_stage)
         source = textwrap.dedent('\n'.join(source.strip().split('\n')[2:]))
         source = source.replace('    ', ' ')
@@ -1464,17 +1464,23 @@ def get_boot_command(self):
                                 str(len(preamble_compressed)))
         compressed = zlib.compress(source.encode(), 9)
         encoded = binascii.b2a_base64(compressed).replace(b('\n'), b(''))
+        return encoded.decode('ascii')
 
+    def _bootstrap_argv(self):
         # Just enough to decode, decompress, and exec the first stage.
         # Priorities: wider compatibility, faster startup, shorter length.
         # `import os` here, instead of stage 1, to save a few bytes.
         # `sys.path=...` for https://github.com/python/cpython/issues/115911.
-        return self.get_python_argv() + [
+        return [
             '-c',
             'import sys;sys.path=[p for p in sys.path if p];import binascii,os,zlib;'
-            'exec(zlib.decompress(binascii.a2b_base64("%s")))' % (encoded.decode(),),
+            'exec(zlib.decompress(binascii.a2b_base64(sys.argv[1])))',
+            self._first_stage_base64(),
         ]
 
+    def get_boot_command(self):
+        return self.get_python_argv() + self._bootstrap_argv()
+
     def get_econtext_config(self):
         assert self.options.max_message_size is not None
         parent_ids = mitogen.parent_ids[:]
@@ -1510,7 +1516,7 @@ def _get_name(self):
 
     def start_child(self):
         args = self.get_boot_command()
-        LOG.debug('command line for %r: %s', self, Argv(args))
+        LOG.debug('command line for %r: %s', self, args)
         try:
             return self.create_child(args=args, **self.create_child_args)
         except OSError:

mitogen/ssh.py

@@ -296,10 +296,8 @@ def get_boot_command(self):
         if self.options.ssh_args:
             bits += self.options.ssh_args
         bits.append(self.options.hostname)
-        base = super(Connection, self).get_boot_command()
 
-        base_parts = []
-        for s in base:
-            val = s if s in self.SHLEX_IGNORE else shlex_quote(s).strip()
-            base_parts.append(val)
-        return bits + base_parts
+        # https://datatracker.ietf.org/doc/html/rfc4254#section-6.5
+        python_argv = self.get_python_argv()
+        bootstrap_argv = self._bootstrap_argv()
+        return bits + python_argv + [shlex_quote(s) for s in bootstrap_argv]