From 6bc152d3d0a72ec2c0d292ec10f4c971f82fa82d Mon Sep 17 00:00:00 2001
From: Lukas Raska <lukas@raska.me>
Date: Wed, 11 Dec 2019 18:56:03 +0100
Subject: [PATCH] Fire events to all syndics when using tcp transport and
 syndic topology

---
 salt/transport/tcp.py            |  2 +-
 tests/unit/transport/test_tcp.py | 74 +++++++++++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
index e1542a72b08e..bb4521d07219 100644
--- a/salt/transport/tcp.py
+++ b/salt/transport/tcp.py
@@ -1544,7 +1544,7 @@ def publish(self, load):
         int_payload = {'payload': self.serial.dumps(payload)}
 
         # add some targeting stuff for lists only (for now)
-        if load['tgt_type'] == 'list':
+        if load['tgt_type'] == 'list' and not self.opts.get("order_masters", False):
             if isinstance(load['tgt'], six.string_types):
                 # Fetch a list of minions that match
                 _res = self.ckminions.check_minions(load['tgt'],
diff --git a/tests/unit/transport/test_tcp.py b/tests/unit/transport/test_tcp.py
index 525016f65a9d..5a1e1ebc8e4b 100644
--- a/tests/unit/transport/test_tcp.py
+++ b/tests/unit/transport/test_tcp.py
@@ -22,7 +22,7 @@
 import salt.transport.client
 import salt.exceptions
 from salt.ext.six.moves import range
-from salt.transport.tcp import SaltMessageClientPool, SaltMessageClient
+from salt.transport.tcp import SaltMessageClientPool, SaltMessageClient, TCPPubServerChannel
 
 # Import Salt Testing libs
 from tests.support.unit import TestCase, skipIf
@@ -223,7 +223,7 @@ def tearDown(self):
         for k, v in six.iteritems(self.io_loop._handlers):
             if self._start_handlers.get(k) != v:
                 failures.append((k, v))
-        if len(failures) > 0:
+        if failures:
             raise Exception('FDs still attached to the IOLoop: {0}'.format(failures))
         del self.channel
         del self._start_handlers
@@ -359,3 +359,73 @@ def stop(*args, **kwargs):
             orig_loop.stop = orig_loop.real_stop
             del orig_loop.real_stop
             del orig_loop.stop_called
+
+
+class TCPPubServerChannelTest(TestCase, AdaptedConfigurationTestCaseMixin):
+    @patch('salt.master.SMaster.secrets')
+    @patch('salt.crypt.Crypticle')
+    @patch('salt.utils.asynchronous.SyncWrapper')
+    def test_publish_filtering(self, sync_wrapper, crypticle, secrets):
+        opts = self.get_temp_config('master')
+        opts["sign_pub_messages"] = False
+        channel = TCPPubServerChannel(opts)
+
+        wrap = MagicMock()
+        crypt = MagicMock()
+        crypt.dumps.return_value = {"test": "value"}
+
+        secrets.return_value = {"aes": {"secret": None}}
+        crypticle.return_value = crypt
+        sync_wrapper.return_value = wrap
+
+        # try simple publish with glob tgt_type
+        channel.publish({"test": "value", "tgt_type": "glob", "tgt": "*"})
+        payload = wrap.send.call_args[0][0]
+
+        # verify we send it without any specific topic
+        assert "topic_lst" not in payload
+
+        # try simple publish with list tgt_type
+        channel.publish({"test": "value", "tgt_type": "list", "tgt": ["minion01"]})
+        payload = wrap.send.call_args[0][0]
+
+        # verify we send it with correct topic
+        assert "topic_lst" in payload
+        self.assertEqual(payload["topic_lst"], ["minion01"])
+
+        # try with syndic settings
+        opts['order_masters'] = True
+        channel.publish({"test": "value", "tgt_type": "list", "tgt": ["minion01"]})
+        payload = wrap.send.call_args[0][0]
+
+        # verify we send it without topic for syndics
+        assert "topic_lst" not in payload
+
+    @patch('salt.utils.minions.CkMinions.check_minions')
+    @patch('salt.master.SMaster.secrets')
+    @patch('salt.crypt.Crypticle')
+    @patch('salt.utils.asynchronous.SyncWrapper')
+    def test_publish_filtering_str_list(self, sync_wrapper, crypticle, secrets, check_minions):
+        opts = self.get_temp_config('master')
+        opts["sign_pub_messages"] = False
+        channel = TCPPubServerChannel(opts)
+
+        wrap = MagicMock()
+        crypt = MagicMock()
+        crypt.dumps.return_value = {"test": "value"}
+
+        secrets.return_value = {"aes": {"secret": None}}
+        crypticle.return_value = crypt
+        sync_wrapper.return_value = wrap
+        check_minions.return_value = {"minions": ["minion02"]}
+
+        # try simple publish with list tgt_type
+        channel.publish({"test": "value", "tgt_type": "list", "tgt": "minion02"})
+        payload = wrap.send.call_args[0][0]
+
+        # verify we send it with correct topic
+        assert "topic_lst" in payload
+        self.assertEqual(payload["topic_lst"], ["minion02"])
+
+        # verify it was correctly calling check_minions
+        check_minions.assert_called_with("minion02", tgt_type="list")