Merge pull request #3 from visioncritical/hostconfig

Added option to define/restrict host instead of using wildcard
matt-richardson · Sep 5, 2016 · 15cb332 · 15cb332
2 parents a422664 + 45b40a0
commit 15cb332
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/com/matt_richardson/gocd/websocket_notifier/GoNotificationPlugin.java b/src/main/java/com/matt_richardson/gocd/websocket_notifier/GoNotificationPlugin.java
@@ -29,12 +29,17 @@ public void initializeGoApplicationAccessor(GoApplicationAccessor goApplicationA
         if (pipelineListener == null) {
             PluginConfig pluginConfig = new PluginConfig();
             int port = pluginConfig.getPort();
+            String host = pluginConfig.getHost();
 
             //org.java_websocket.WebSocketImpl.DEBUG = true;
             PipelineWebSocketServer s;
             try {
                 LOGGER.info("Starting WebSocket server started on port: " + port);
-                s = new PipelineWebSocketServer(port);
+                if (pluginConfig.isHostSet()) {
+                	s = new PipelineWebSocketServer(host, port);
+                } else {
+                	s = new PipelineWebSocketServer(port);
+                }
                 s.start();
                 LOGGER.info("WebSocket server started on port: " + s.getPort());
                 pipelineListener = new WebSocketPipelineListener(s);

diff --git a/src/main/java/com/matt_richardson/gocd/websocket_notifier/PipelineWebSocketServer.java b/src/main/java/com/matt_richardson/gocd/websocket_notifier/PipelineWebSocketServer.java
@@ -16,6 +16,11 @@ public PipelineWebSocketServer(int port)
             throws UnknownHostException {
         super(new InetSocketAddress(port));
     }
+
+    public PipelineWebSocketServer(String host, int port)
+            throws UnknownHostException {
+        super(new InetSocketAddress(host, port));
+    }
 
     public void onOpen(WebSocket conn, ClientHandshake handshake) {
         LOGGER.debug(conn.getRemoteSocketAddress().getAddress().getHostAddress() + " connected");

diff --git a/src/main/java/com/matt_richardson/gocd/websocket_notifier/PluginConfig.java b/src/main/java/com/matt_richardson/gocd/websocket_notifier/PluginConfig.java
@@ -10,6 +10,7 @@ public class PluginConfig {
     private static Logger LOGGER = Logger.getLoggerFor(GoNotificationPlugin.class);
     private static final String PLUGIN_CONF = "gocd-websocket-notifier.conf";
     private int port = 8887;
+    private String host = "";
 
     public PluginConfig() {
         String userHome = System.getProperty("user.home");
@@ -22,9 +23,16 @@ public PluginConfig() {
             if (config.hasPath("port")) {
                 setPort(config.getInt("port"));
             }
+            if (config.hasPath("host")) {
+            	setHost(config.getString("host"));
+            }
         }
     }
 
     public int getPort() { return port; }
     public void setPort(int port) { this.port = port; }
+
+    public String getHost() { return host; }
+    public void setHost(String host) { this.host = host; }
+    public boolean isHostSet() { return !host.isEmpty(); }
 }