Add more transport types to the denied list for JMX

Add on multicast and zeroconf to the list of denied transports through
JMX

Follow on to #1918

Author: cshannon

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java

@@ -44,7 +44,8 @@ public class BrokerView implements BrokerViewMBean {
 
     private static final Logger LOG = LoggerFactory.getLogger(BrokerView.class);
 
-    private static final Set<String> DENIED_TRANSPORT_SCHEMES = Set.of("vm", "http");
+    private static final Set<String> DENIED_TRANSPORT_SCHEMES = Set.of("vm", "http",
+            "multicast", "zeroconf");
 
     ManagedRegionBroker broker;
 

activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java

@@ -2070,6 +2070,18 @@ public void testAddVmConnectorBlockedBrokerView() throws Exception {
         testAddTransportConnectorBlockedBrokerView("vm");
     }
 
+    // Test to verify multicast transport is not allowed to be added as a connector
+    // through the Broker MBean
+    public void testAddMulticastConnectorBlockedBrokerView() throws Exception {
+        testAddTransportConnectorBlockedBrokerView("multicast");
+    }
+
+    // Test to verify zeroconf transport is not allowed to be added as a connector
+    // through the Broker MBean
+    public void testAddZeroconfConnectorBlockedBrokerView() throws Exception {
+        testAddTransportConnectorBlockedBrokerView("zeroconf");
+    }
+
     protected void testAddTransportConnectorBlockedBrokerView(String scheme) throws Exception {
         ObjectName brokerName = assertRegisteredObjectName(domain + ":type=Broker,brokerName=localhost");
         BrokerViewMBean brokerView = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, brokerName, BrokerViewMBean.class, true);

activemq-unit-tests/src/test/java/org/apache/activemq/jmx/JmxCreateNCTest.java

@@ -88,6 +88,16 @@ public void testHttpBridgeBlocked() throws Exception {
         testDeniedBridgeBlocked("http");
     }
 
+    @Test
+    public void testMulticastBridgeBlocked() throws Exception {
+        testDeniedBridgeBlocked("multicast");
+    }
+
+    @Test
+    public void testZeroconfBridgeBlocked() throws Exception {
+        testDeniedBridgeBlocked("zeroconf");
+    }
+
     protected void testDeniedBridgeBlocked(String scheme) throws Exception {
         // Test composite network connector uri
         try {
@@ -97,13 +107,6 @@ protected void testDeniedBridgeBlocked(String scheme) throws Exception {
             assertEquals("Transport scheme '" + scheme + "' is not allowed", e.getMessage());
         }
 
-        try {
-            proxy.addNetworkConnector("multicast:(" + scheme + "://localhost)");
-            fail("Should have failed trying to add connector bridge");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Transport scheme '" + scheme + "' is not allowed", e.getMessage());
-        }
-
         // verify direct connector as well
         try {
             proxy.addNetworkConnector(scheme + "://localhost");