[3001.6] Fix Runners in SSE (#174)

* Runners fix

* Rework runner fix

* Add changelog for sse fix

Author: dwoz

changelog/165.fixed

@@ -0,0 +1 @@
+Fix runners that broke when patching for CVE-2021-25281

changelog/166.fixed

@@ -0,0 +1 @@
+Fix Runners in SSE

salt/client/mixins.py

@@ -485,7 +485,7 @@ class AsyncClientMixin(object):
     client = None
     tag_prefix = None
 
-    def _proc_function(self, fun, low, user, tag, jid, daemonize=True):
+    def _proc_function_remote(self, fun, low, user, tag, jid, daemonize=True):
         """
         Run this method in a multiprocess target to execute the function on the
         master and fire the return data on the event bus
@@ -509,7 +509,7 @@ def _proc_function(self, fun, low, user, tag, jid, daemonize=True):
         except salt.exceptions.EauthAuthenticationError as exc:
             log.error(exc)
 
-    def _proc_function_local(self, fun, low, user, tag, jid, daemonize=True):
+    def _proc_function(self, fun, low, user, tag, jid, daemonize=True):
         """
         Run this method in a multiprocess target to execute the function
         locally and fire the return data on the event bus
@@ -556,15 +556,15 @@ def _gen_async_pub(self, jid=None):
         tag = salt.utils.event.tagify(jid, prefix=self.tag_prefix)
         return {"tag": tag, "jid": jid}
 
-    def asynchronous(self, fun, low, user="UNKNOWN", pub=None, local=False):
+    def asynchronous(self, fun, low, user="UNKNOWN", pub=None, local=True):
         """
         Execute the function in a multiprocess and return the event tag to use
         to watch for the return
         """
         if local:
-            proc_func = self._proc_function_local
-        else:
             proc_func = self._proc_function
+        else:
+            proc_func = self._proc_function_remote
         async_pub = pub if pub is not None else self._gen_async_pub()
         proc = salt.utils.process.SignalHandlingProcess(
             target=proc_func,

salt/runner.py

@@ -287,7 +287,7 @@ def run(self):
                         outputter = None
                     display_output(ret, outputter, self.opts)
                 else:
-                    ret = self._proc_function_local(
+                    ret = self._proc_function(
                         self.opts["fun"],
                         low,
                         user,

salt/wheel/__init__.py

@@ -124,7 +124,7 @@ def cmd_async(self, low):
             {'jid': '20131219224744416681', 'tag': 'salt/wheel/20131219224744416681'}
         """
         fun = low.get("fun")
-        return self.asynchronous(fun, low)
+        return self.asynchronous(fun, low, local=False)
 
     def cmd(
         self,