-
Notifications
You must be signed in to change notification settings - Fork 685
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GEODE-9064: Configure serial filter during ManagementAgent start (#6196)
The Geode JMX layer will configure the system property “jmx.remote.rmi.server.serial.filter.pattern" to only accept JDK classes identified as open-types required for JMX. If the system property already has a value then Geode will log a statement and leave the system property alone.
- Loading branch information
Showing
11 changed files
with
1,198 additions
and
16 deletions.
There are no files selected for viewing
115 changes: 115 additions & 0 deletions
115
...va/org/apache/geode/management/LocatorManagerConfiguresJmxSerialFilterAcceptanceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more contributor license | ||
| * agreements. See the NOTICE file distributed with this work for additional information regarding | ||
| * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance with the License. You may obtain a | ||
| * copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License | ||
| * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
| * or implied. See the License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
| package org.apache.geode.management; | ||
|
|
||
| import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast; | ||
| import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost; | ||
| import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts; | ||
| import static org.apache.geode.management.internal.JmxRmiOpenTypesSerialFilter.PROPERTY_NAME; | ||
| import static org.apache.geode.test.awaitility.GeodeAwaitility.await; | ||
| import static org.assertj.core.api.Assumptions.assumeThat; | ||
|
|
||
| import java.nio.file.Path; | ||
|
|
||
| import org.apache.commons.lang3.JavaVersion; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
|
|
||
| import org.apache.geode.test.assertj.LogFileAssert; | ||
| import org.apache.geode.test.junit.rules.RequiresGeodeHome; | ||
| import org.apache.geode.test.junit.rules.gfsh.GfshRule; | ||
|
|
||
| public class LocatorManagerConfiguresJmxSerialFilterAcceptanceTest { | ||
|
|
||
| private static final String NAME = "the-locator"; | ||
|
|
||
| private Path workingDir; | ||
| private int locatorPort; | ||
| private int jmxPort; | ||
| private Path locatorLogFile; | ||
|
|
||
| @Rule | ||
| public RequiresGeodeHome requiresGeodeHome = new RequiresGeodeHome(); | ||
| @Rule | ||
| public GfshRule gfshRule = new GfshRule(); | ||
|
|
||
| @Before | ||
| public void setUpOutputFiles() { | ||
| TemporaryFolder temporaryFolder = gfshRule.getTemporaryFolder(); | ||
|
|
||
| workingDir = temporaryFolder.getRoot().toPath().toAbsolutePath(); | ||
| locatorLogFile = workingDir.resolve(NAME + ".log"); | ||
| } | ||
|
|
||
| @Before | ||
| public void setUpRandomPorts() { | ||
| int[] ports = getRandomAvailableTCPPorts(2); | ||
|
|
||
| locatorPort = ports[0]; | ||
| jmxPort = ports[1]; | ||
| } | ||
|
|
||
| @Test | ||
| public void startingLocatorWithJmxManager_configuresSerialFilter_atLeastJava9() { | ||
| assumeThat(isJavaVersionAtLeast(JavaVersion.JAVA_9)).isTrue(); | ||
|
|
||
| String startLocatorCommand = String.join(" ", | ||
| "start locator", | ||
| "--name=" + NAME, | ||
| "--dir=" + workingDir, | ||
| "--port=" + locatorPort, | ||
| "--J=-Dgemfire.enable-cluster-configuration=false", | ||
| "--J=-Dgemfire.http-service-port=0", | ||
| "--J=-Dgemfire.jmx-manager=true", | ||
| "--J=-Dgemfire.jmx-manager-port=" + jmxPort, | ||
| "--J=-Dgemfire.jmx-manager-start=true"); | ||
|
|
||
| gfshRule.execute(startLocatorCommand); | ||
|
|
||
| await().untilAsserted(() -> { | ||
| LogFileAssert.assertThat(locatorLogFile.toFile()) | ||
| .as(locatorLogFile.toFile().getAbsolutePath()) | ||
| .exists() | ||
| .contains("System property " + PROPERTY_NAME + " is now configured with"); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void startingLocatorWithJmxManager_configuresSerialFilter_atMostJava8() { | ||
| assumeThat(isJavaVersionAtMost(JavaVersion.JAVA_1_8)).isTrue(); | ||
|
|
||
| String startLocatorCommand = String.join(" ", | ||
| "start locator", | ||
| "--name=" + NAME, | ||
| "--dir=" + workingDir, | ||
| "--port=" + locatorPort, | ||
| "--J=-Dgemfire.enable-cluster-configuration=false", | ||
| "--J=-Dgemfire.http-service-port=0", | ||
| "--J=-Dgemfire.jmx-manager=true", | ||
| "--J=-Dgemfire.jmx-manager-port=" + jmxPort, | ||
| "--J=-Dgemfire.jmx-manager-start=true"); | ||
|
|
||
| gfshRule.execute(startLocatorCommand); | ||
|
|
||
| await().untilAsserted(() -> { | ||
| LogFileAssert.assertThat(locatorLogFile.toFile()) | ||
| .as(locatorLogFile.toFile().getAbsolutePath()) | ||
| .exists() | ||
| .doesNotContain("System property " + PROPERTY_NAME + " is now configured with"); | ||
| }); | ||
| } | ||
| } |
111 changes: 111 additions & 0 deletions
111
...ava/org/apache/geode/management/ServerManagerConfiguresJmxSerialFilterAcceptanceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more contributor license | ||
| * agreements. See the NOTICE file distributed with this work for additional information regarding | ||
| * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance with the License. You may obtain a | ||
| * copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License | ||
| * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
| * or implied. See the License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
| package org.apache.geode.management; | ||
|
|
||
| import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast; | ||
| import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost; | ||
| import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPort; | ||
| import static org.apache.geode.management.internal.JmxRmiOpenTypesSerialFilter.PROPERTY_NAME; | ||
| import static org.apache.geode.test.awaitility.GeodeAwaitility.await; | ||
| import static org.assertj.core.api.Assumptions.assumeThat; | ||
|
|
||
| import java.nio.file.Path; | ||
|
|
||
| import org.apache.commons.lang3.JavaVersion; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
|
|
||
| import org.apache.geode.test.assertj.LogFileAssert; | ||
| import org.apache.geode.test.junit.rules.RequiresGeodeHome; | ||
| import org.apache.geode.test.junit.rules.gfsh.GfshRule; | ||
|
|
||
| public class ServerManagerConfiguresJmxSerialFilterAcceptanceTest { | ||
|
|
||
| private static final String NAME = "the-server"; | ||
|
|
||
| private Path workingDir; | ||
| private int jmxPort; | ||
| private Path serverLogFile; | ||
|
|
||
| @Rule | ||
| public RequiresGeodeHome requiresGeodeHome = new RequiresGeodeHome(); | ||
| @Rule | ||
| public GfshRule gfshRule = new GfshRule(); | ||
|
|
||
| @Before | ||
| public void setUpOutputFiles() { | ||
| TemporaryFolder temporaryFolder = gfshRule.getTemporaryFolder(); | ||
|
|
||
| workingDir = temporaryFolder.getRoot().toPath().toAbsolutePath(); | ||
| serverLogFile = workingDir.resolve(NAME + ".log"); | ||
| } | ||
|
|
||
| @Before | ||
| public void setUpRandomPorts() { | ||
| jmxPort = getRandomAvailableTCPPort(); | ||
| } | ||
|
|
||
| @Test | ||
| public void startingServerWithJmxManager_configuresSerialFilter_atLeastJava9() { | ||
| assumeThat(isJavaVersionAtLeast(JavaVersion.JAVA_9)).isTrue(); | ||
|
|
||
| String startServerCommand = String.join(" ", | ||
| "start server", | ||
| "--name=" + NAME, | ||
| "--dir=" + workingDir, | ||
| "--disable-default-server", | ||
| "--J=-Dgemfire.enable-cluster-configuration=false", | ||
| "--J=-Dgemfire.http-service-port=0", | ||
| "--J=-Dgemfire.jmx-manager=true", | ||
| "--J=-Dgemfire.jmx-manager-port=" + jmxPort, | ||
| "--J=-Dgemfire.jmx-manager-start=true"); | ||
|
|
||
| gfshRule.execute(startServerCommand); | ||
|
|
||
| await().untilAsserted(() -> { | ||
| LogFileAssert.assertThat(serverLogFile.toFile()) | ||
| .as(serverLogFile.toFile().getAbsolutePath()) | ||
| .exists() | ||
| .contains("System property " + PROPERTY_NAME + " is now configured with"); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void startingServerWithJmxManager_configuresSerialFilter_atMostJava8() { | ||
| assumeThat(isJavaVersionAtMost(JavaVersion.JAVA_1_8)).isTrue(); | ||
|
|
||
| String startServerCommand = String.join(" ", | ||
| "start server", | ||
| "--name=" + NAME, | ||
| "--dir=" + workingDir, | ||
| "--disable-default-server", | ||
| "--J=-Dgemfire.enable-cluster-configuration=false", | ||
| "--J=-Dgemfire.http-service-port=0", | ||
| "--J=-Dgemfire.jmx-manager=true", | ||
| "--J=-Dgemfire.jmx-manager-port=" + jmxPort, | ||
| "--J=-Dgemfire.jmx-manager-start=true"); | ||
|
|
||
| gfshRule.execute(startServerCommand); | ||
|
|
||
| await().untilAsserted(() -> { | ||
| LogFileAssert.assertThat(serverLogFile.toFile()) | ||
| .as(serverLogFile.toFile().getAbsolutePath()) | ||
| .exists() | ||
| .doesNotContain("System property " + PROPERTY_NAME + " is now configured with"); | ||
| }); | ||
| } | ||
| } |
Oops, something went wrong.