From f114abc84c0719c0ee256fce8fb717ccfee8dfa1 Mon Sep 17 00:00:00 2001 From: Jared Stewart Date: Thu, 29 Sep 2016 10:43:30 -0700 Subject: [PATCH 1/2] GEODE-1548: Specifying --J=-Dgemfire.jmx-manager-hostname-for-clients now automatically sets -Djava.rmi.server.hostname --- .../management/internal/ManagementAgent.java | 7 ++- .../security/JavaRmiServerNameJunitTest.java | 55 +++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameJunitTest.java diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java index f1daa7840fb8..3af508e5fb4a 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java @@ -348,7 +348,7 @@ private void configureAndStart() throws IOException { final int port = this.config.getJmxManagerPort(); final String hostname; final InetAddress bindAddr; - if (this.config.getJmxManagerBindAddress().equals("")) { + if (StringUtils.isBlank(this.config.getJmxManagerBindAddress())) { hostname = SocketCreator.getLocalHost().getHostName(); bindAddr = null; } else { @@ -356,6 +356,11 @@ private void configureAndStart() throws IOException { bindAddr = InetAddress.getByName(hostname); } + String jmxManagerHostnameForClients = this.config.getJmxManagerHostnameForClients(); + if (!StringUtils.isBlank(jmxManagerHostnameForClients)) { + System.setProperty("java.rmi.server.hostname", jmxManagerHostnameForClients); + } + final SocketCreator socketCreator = SocketCreatorFactory.getSocketCreatorForComponent(SecurableCommunicationChannel.JMX); final boolean ssl = socketCreator.useSSL(); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameJunitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameJunitTest.java new file mode 100644 index 000000000000..72219b349d25 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameJunitTest.java @@ -0,0 +1,55 @@ +/* + * 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.internal.security; + +import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.junit.Assert.*; + +import java.util.Properties; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.internal.AvailablePort; +import org.apache.geode.test.junit.categories.UnitTest; + +@Category(UnitTest.class) +public class JavaRmiServerNameJunitTest { + + private static final String JMX_HOST = "myHostname"; + + private static int jmxManagerPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); + + //https://issues.apache.org/jira/browse/GEODE-1548 + @Test + public void testThatJavaRmiServerNameGetsSet() { + Properties properties = new Properties(); + properties.put(LOCATORS, ""); + properties.put(MCAST_PORT, "0"); + properties.put(JMX_MANAGER, "true"); + properties.put(JMX_MANAGER_START, "true"); + properties.put(JMX_MANAGER_PORT, String.valueOf(jmxManagerPort)); + properties.put("jmx-manager-hostname-for-clients", JMX_HOST); + + new CacheFactory(properties).create(); + assertEquals (JMX_HOST, System.getProperty("java.rmi.server.hostname")); + } + +} From 2d7f4fa5f4b33b6aaece9b8357a65d57de95a345 Mon Sep 17 00:00:00 2001 From: Jared Stewart Date: Fri, 30 Sep 2016 13:10:05 -0700 Subject: [PATCH 2/2] GEODE-1548: Corrected test category from UnitTest to IntegrationTest. --- ...erverNameJunitTest.java => JavaRmiServerNameTest.java} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename geode-core/src/test/java/org/apache/geode/management/internal/security/{JavaRmiServerNameJunitTest.java => JavaRmiServerNameTest.java} (89%) diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameJunitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java similarity index 89% rename from geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameJunitTest.java rename to geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java index 72219b349d25..c544e6fe0f8d 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameJunitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java @@ -28,10 +28,10 @@ import org.apache.geode.cache.CacheFactory; import org.apache.geode.internal.AvailablePort; -import org.apache.geode.test.junit.categories.UnitTest; +import org.apache.geode.test.junit.categories.IntegrationTest; -@Category(UnitTest.class) -public class JavaRmiServerNameJunitTest { +@Category(IntegrationTest.class) +public class JavaRmiServerNameTest { private static final String JMX_HOST = "myHostname"; @@ -49,7 +49,7 @@ public void testThatJavaRmiServerNameGetsSet() { properties.put("jmx-manager-hostname-for-clients", JMX_HOST); new CacheFactory(properties).create(); - assertEquals (JMX_HOST, System.getProperty("java.rmi.server.hostname")); + assertEquals(JMX_HOST, System.getProperty("java.rmi.server.hostname")); } }