From 71c5e231f442e782196157c8c4677593b0912389 Mon Sep 17 00:00:00 2001 From: Alexei Barantsev Date: Tue, 24 Dec 2013 23:41:33 +0400 Subject: [PATCH] Restricting the host where grid hub is listening if -host option is specified. Fixes issue 4589 --- java/server/src/org/openqa/grid/web/Hub.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/server/src/org/openqa/grid/web/Hub.java b/java/server/src/org/openqa/grid/web/Hub.java index 045cd701a1555..e16995be74fdb 100644 --- a/java/server/src/org/openqa/grid/web/Hub.java +++ b/java/server/src/org/openqa/grid/web/Hub.java @@ -54,6 +54,7 @@ public class Hub { private final int port; private final String host; + private final boolean isHostRestricted; private final Registry registry; private final Map> extraServlet = Maps.newHashMap(); @@ -77,9 +78,11 @@ public Hub(GridHubConfiguration config) { if (config.getHost() != null) { host = config.getHost(); + isHostRestricted = true; } else { NetworkUtils utils = new NetworkUtils(); host = utils.getIp4NonLoopbackAddressOfThisMachine().getHostAddress(); + isHostRestricted = false; } this.port = config.getPort(); @@ -101,6 +104,9 @@ private void initServer() { server = new Server(); SocketConnector socketListener = new SocketConnector(); socketListener.setMaxIdleTime(60000); + if (isHostRestricted) { + socketListener.setHost(host); + } socketListener.setPort(port); server.addConnector(socketListener);