Skip to content

Commit 0f59eaf

Browse files
shs96cshs96c
committed
Revert "Add sever and client keys to eventbus (#8698)"
This reverts commit b03e108. This is because it caused the EndToEndTest to fail, which means we can't actually spin up a Grid.
1 parent a3b92da commit 0f59eaf

2 files changed

Lines changed: 0 additions & 21 deletions

File tree

‎java/server/src/org/openqa/selenium/events/zeromq/BoundZmqEventBus.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.zeromq.SocketType;
2525
import org.zeromq.ZContext;
2626
import org.zeromq.ZMQ;
27-
import zmq.io.mechanism.curve.Curve;
2827

2928
import java.net.Inet6Address;
3029
import java.net.InetAddress;
@@ -43,32 +42,22 @@ class BoundZmqEventBus implements EventBus {
4342
private final ZMQ.Socket xsub;
4443
private final ExecutorService executor;
4544

46-
4745
BoundZmqEventBus(ZContext context, String publishConnection, String subscribeConnection) {
4846
String address = new NetworkUtils().getHostAddress();
4947
Addresses xpubAddr = deriveAddresses(address, publishConnection);
5048
Addresses xsubAddr = deriveAddresses(address, subscribeConnection);
5149

52-
Curve curve = new Curve();
53-
String[] serverKeys = curve.keypairZ85();
54-
String[] clientKeys = curve.keypairZ85();
55-
5650
LOG.info(String.format("XPUB binding to %s, XSUB binding to %s", xpubAddr, xsubAddr));
5751

5852
xpub = context.createSocket(SocketType.XPUB);
5953
xpub.setIPv6(xpubAddr.isIPv6);
6054
xpub.setImmediate(true);
6155
xpub.bind(xpubAddr.bindTo);
62-
xpub.setCurvePublicKey(serverKeys[0].getBytes());
63-
xpub.setCurveSecretKey(serverKeys[1].getBytes());
6456

6557
xsub = context.createSocket(SocketType.XSUB);
6658
xsub.setIPv6(xsubAddr.isIPv6);
6759
xsub.setImmediate(true);
6860
xsub.bind(xsubAddr.bindTo);
69-
xsub.setCurvePublicKey(clientKeys[0].getBytes());
70-
xsub.setCurveSecretKey(clientKeys[1].getBytes());
71-
xsub.setCurveServerKey(serverKeys[0].getBytes());
7261

7362
executor = Executors.newCachedThreadPool(r -> {
7463
Thread thread = new Thread(r, "Message Bus Proxy");

‎java/server/src/org/openqa/selenium/events/zeromq/UnboundZmqEventBus.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.zeromq.SocketType;
2929
import org.zeromq.ZContext;
3030
import org.zeromq.ZMQ;
31-
import zmq.io.mechanism.curve.Curve;
3231

3332
import java.net.Inet6Address;
3433
import java.net.InetAddress;
@@ -70,10 +69,6 @@ class UnboundZmqEventBus implements EventBus {
7069
return thread;
7170
});
7271

73-
Curve curve = new Curve();
74-
String[] serverKeys = curve.keypairZ85();
75-
String[] clientKeys = curve.keypairZ85();
76-
7772
String connectionMessage = String.format("Connecting to %s and %s", publishConnection, subscribeConnection);
7873
LOG.info(connectionMessage);
7974

@@ -90,15 +85,10 @@ class UnboundZmqEventBus implements EventBus {
9085
sub.setIPv6(isSubAddressIPv6(publishConnection));
9186
sub.connect(publishConnection);
9287
sub.subscribe(new byte[0]);
93-
sub.setCurvePublicKey(clientKeys[0].getBytes());
94-
sub.setCurveSecretKey(clientKeys[1].getBytes());
95-
sub.setCurveServerKey(serverKeys[0].getBytes());
9688

9789
pub = context.createSocket(SocketType.PUB);
9890
pub.setIPv6(isSubAddressIPv6(subscribeConnection));
9991
pub.connect(subscribeConnection);
100-
pub.setCurvePublicKey(serverKeys[0].getBytes());
101-
pub.setCurveSecretKey(serverKeys[1].getBytes());
10292
}
10393
);
10494
// Connections are already established

0 commit comments

Comments
 (0)