GEODE-10690: Carry all configured options into the JMX RMI connector server environment

Author: JinwooHwang

geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java

@@ -444,6 +444,14 @@ private void configureAndStart() throws IOException {
         String[].class.getName(),
         String.class.getName()});
 
+    // Carry the connector options that are configured as system properties into the
+    // environment of this manually constructed connector server, so that they take
+    // effect here as they would for a connector server created by the platform.
+    String configuredPattern = System.getProperty(RMIConnectorServer.SERIAL_FILTER_PATTERN);
+    if (configuredPattern != null) {
+      env.put(RMIConnectorServer.SERIAL_FILTER_PATTERN, configuredPattern);
+    }
+
     // Manually creates and binds a JMX RMI Connector Server stub with the
     // registry created above: the port we pass here is the port that can
     // be specified in "service:jmx:rmi://"+hostname+":"+port - where the

geode-serialization/src/main/java/org/apache/geode/internal/serialization/filter/OpenMBeanFilterPattern.java

@@ -22,21 +22,22 @@
 import javax.management.ObjectName;
 import javax.management.openmbean.ArrayType;
 import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
 import javax.management.openmbean.CompositeType;
 import javax.management.openmbean.OpenType;
 import javax.management.openmbean.SimpleType;
 import javax.management.openmbean.TabularData;
+import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
 
 /**
- * Defines a serial filter pattern that accepts all open MBean data types and rejects everything
- * not included in the pattern.
+ * Defines a serial filter pattern that accepts all open MBean data types and the container types
+ * that operation parameters are composed of, and rejects everything not included in the pattern.
  */
 public class OpenMBeanFilterPattern implements FilterPattern {
 
   @Override
   public String pattern() {
-    // note: java.util.* may also be needed
     return new StringJoiner(";")
 
         // accept all open MBean data types
@@ -54,13 +55,20 @@ public String pattern() {
         .add(ObjectName.class.getName())
         .add(OpenType.class.getName())
         .add(CompositeData.class.getName())
+        .add(CompositeDataSupport.class.getName())
         .add(TabularData.class.getName())
+        .add(TabularDataSupport.class.getName())
         .add(SimpleType.class.getName())
         .add(CompositeType.class.getName())
         .add(TabularType.class.getName())
         .add(ArrayType.class.getName())
         .add(MarshalledObject.class.getName())
 
+        // accept the container and management types that operation parameters and queries use
+        .add(Object.class.getName())
+        .add("java.util.*")
+        .add("javax.management.*")
+
         // reject all others
         .add("!*")
         .toString();

geode-serialization/src/test/java/org/apache/geode/internal/serialization/filter/OpenMBeanFilterPatternTest.java

@@ -23,9 +23,11 @@
 import javax.management.ObjectName;
 import javax.management.openmbean.ArrayType;
 import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
 import javax.management.openmbean.CompositeType;
 import javax.management.openmbean.SimpleType;
 import javax.management.openmbean.TabularData;
+import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
 
 import org.junit.Before;
@@ -135,6 +137,31 @@ public void includesMarshalledObject() {
     assertThat(defaultPattern).contains(MarshalledObject.class.getName());
   }
 
+  @Test
+  public void includesCompositeDataSupport() {
+    assertThat(defaultPattern).contains(CompositeDataSupport.class.getName());
+  }
+
+  @Test
+  public void includesTabularDataSupport() {
+    assertThat(defaultPattern).contains(TabularDataSupport.class.getName());
+  }
+
+  @Test
+  public void includesObject() {
+    assertThat(defaultPattern).contains(Object.class.getName());
+  }
+
+  @Test
+  public void includesUtilTypes() {
+    assertThat(defaultPattern).contains("java.util.*");
+  }
+
+  @Test
+  public void includesManagementTypes() {
+    assertThat(defaultPattern).contains("javax.management.*");
+  }
+
   @Test
   public void rejectsAllOtherTypes() {
     assertThat(defaultPattern).endsWith(";!*");