You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2020/03/24 23:21:00 UTC
[geode] 01/02: add a plain-text gateway socket factory
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/plain-text-gateway-wip
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1d39423e12021aa6c43e2307ca94f5b47c8d3aac
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Tue Mar 24 13:04:57 2020 -0700
add a plain-text gateway socket factory
---
.../geode/cache/client/SocketFactoryDUnitTest.java | 32 +++-------------------
...ies.java => PlainTextGatewaySocketFactory.java} | 26 ++++++++++--------
...ketFactories.java => PlainTextProxySocket.java} | 32 ++++++++++++++--------
.../cache/client/proxy/ProxySocketFactories.java | 4 +++
4 files changed, 43 insertions(+), 51 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/SocketFactoryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/SocketFactoryDUnitTest.java
index 0538a67..8cf3c51 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/SocketFactoryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/SocketFactoryDUnitTest.java
@@ -29,6 +29,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.geode.DataSerializable;
+import org.apache.geode.cache.client.proxy.ProxySocketFactories;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
@@ -37,7 +38,7 @@ import org.apache.geode.test.dunit.rules.ClusterStartupRule;
public class SocketFactoryDUnitTest {
@Rule
- public ClusterStartupRule cluster = new ClusterStartupRule();
+ public ClusterStartupRule cluster = new ClusterStartupRule(2);
private int locatorPort;
private int serverPort;
@@ -53,7 +54,7 @@ public class SocketFactoryDUnitTest {
// Add a locator with the wrong hostname
.addPoolLocator("notarealhostname", locatorPort)
// Set a socket factory that switches the hostname back
- .setPoolSocketFactory(new ChangeHostSocketFactory("localhost"))
+ .setPoolSocketFactory(ProxySocketFactories.plainText("localhost"))
.create();
// Verify the socket factory switched the hostname so we can connect
@@ -66,7 +67,7 @@ public class SocketFactoryDUnitTest {
// Add a locator with the wrong hostname
.addPoolServer("notarealhostname", serverPort)
// Set a socket factory that switches the hostname back
- .setPoolSocketFactory(new ChangeHostSocketFactory("localhost"))
+ .setPoolSocketFactory(ProxySocketFactories.plainText("localhost"))
.create();
@@ -100,29 +101,4 @@ public class SocketFactoryDUnitTest {
}
}
-
-
- private static class ChangeHostSocketFactory implements SocketFactory {
-
- private final String newHost;
-
- private ChangeHostSocketFactory(String newHost) {
- this.newHost = newHost;
- }
-
- @Override
- public Socket createSocket() {
- return new ChangeHostSocket();
- }
-
- private class ChangeHostSocket extends Socket {
-
- @Override
- public void connect(SocketAddress endpoint, int timeout) throws IOException {
- InetSocketAddress oldEndpoint = (InetSocketAddress) endpoint;
- super.connect(new InetSocketAddress(newHost, oldEndpoint.getPort()), timeout);
- }
- }
- }
-
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/PlainTextGatewaySocketFactory.java
similarity index 69%
copy from geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
copy to geode-core/src/main/java/org/apache/geode/cache/client/proxy/PlainTextGatewaySocketFactory.java
index 1271433..8e9341e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/PlainTextGatewaySocketFactory.java
@@ -14,19 +14,23 @@
*/
package org.apache.geode.cache.client.proxy;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
import org.apache.geode.cache.client.SocketFactory;
-public class ProxySocketFactories {
+public class PlainTextGatewaySocketFactory implements SocketFactory {
+ private final String hostname;
+
+ public PlainTextGatewaySocketFactory(String hostname) {
+ this.hostname = hostname;
+ }
- /**
- * Create a {@link SocketFactory} that will connect a geode client through
- * the configured SNI proxy.
- *
- *
- * @param hostname the hostname of the sni proxy
- * @param port the port of the sni proxy
- */
- public static SocketFactory sni(String hostname, int port) {
- return new SniSocketFactory(hostname, port);
+ @Override
+ public Socket createSocket() throws IOException {
+ return new PlainTextProxySocket(hostname);
}
+
+
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/PlainTextProxySocket.java
similarity index 56%
copy from geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
copy to geode-core/src/main/java/org/apache/geode/cache/client/proxy/PlainTextProxySocket.java
index 1271433..a0ff56c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/PlainTextProxySocket.java
@@ -14,19 +14,27 @@
*/
package org.apache.geode.cache.client.proxy;
-import org.apache.geode.cache.client.SocketFactory;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
-public class ProxySocketFactories {
+public class PlainTextProxySocket extends Socket {
+ private String proxyHost;
+ private InetSocketAddress endpoint;
- /**
- * Create a {@link SocketFactory} that will connect a geode client through
- * the configured SNI proxy.
- *
- *
- * @param hostname the hostname of the sni proxy
- * @param port the port of the sni proxy
- */
- public static SocketFactory sni(String hostname, int port) {
- return new SniSocketFactory(hostname, port);
+ public PlainTextProxySocket(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ @Override
+ public void connect(SocketAddress endpoint, int timeout) throws IOException {
+ this.endpoint = (InetSocketAddress) endpoint;
+ super.connect(new InetSocketAddress(proxyHost, this.endpoint.getPort()), timeout);
+ }
+
+ @Override
+ public SocketAddress getRemoteSocketAddress() {
+ return endpoint;
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
index 1271433..0f363fd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
@@ -29,4 +29,8 @@ public class ProxySocketFactories {
public static SocketFactory sni(String hostname, int port) {
return new SniSocketFactory(hostname, port);
}
+
+ public static SocketFactory plainText(String hostname) {
+ return new PlainTextGatewaySocketFactory(hostname);
+ }
}