From 6f850674b48894999aa9501543c493cec3abb77c Mon Sep 17 00:00:00 2001
From: Sam Bashton <sam.bashton@claranet.uk>
Date: Tue, 30 Jan 2018 15:46:01 +0000
Subject: [PATCH] Make Lumberjack SSL optional

---
 input/filebeat/lumberjack.go | 42 +++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/input/filebeat/lumberjack.go b/input/filebeat/lumberjack.go
index 3cc951f..c1691bc 100644
--- a/input/filebeat/lumberjack.go
+++ b/input/filebeat/lumberjack.go
@@ -11,10 +11,10 @@ import (
 )
 
 type Config struct {
-	Host   string `yaml:"host"`
-	SSLCrt string `yaml:"ssl_crt"`
-	SSLKey string `yaml:"ssl_key"`
-	SampleSize *int `yaml:"sample_size,omitempty"`
+	Host       string `yaml:"host"`
+	SSLCrt     string `yaml:"ssl_crt,omitempty"`
+	SSLKey     string `yaml:"ssl_key,omitempty"`
+	SampleSize *int   `yaml:"sample_size,omitempty"`
 }
 
 type LJServer struct {
@@ -25,7 +25,7 @@ type LJServer struct {
 }
 
 func New() input.Input {
-        return &LJServer{term: make(chan bool, 1)}
+	return &LJServer{term: make(chan bool, 1)}
 }
 
 // lumberConn handles an incoming connection from a lumberjack client
@@ -55,9 +55,26 @@ func (lj *LJServer) Init(name string, config yaml.MapSlice, r input.Receiver) er
 }
 
 func (lj *LJServer) Start() error {
-	cert, err := tls.LoadX509KeyPair(lj.Config.SSLCrt, lj.Config.SSLKey)
-	if err != nil {
-		return fmt.Errorf("Error loading keys: %v", err)
+	var ln net.Listener
+
+	if lj.Config.SSLCrt != "" {
+		cert, err := tls.LoadX509KeyPair(lj.Config.SSLCrt, lj.Config.SSLKey)
+		if err != nil {
+			return fmt.Errorf("Error loading keys: %v", err)
+		}
+
+		conn, err := net.Listen("tcp", lj.Config.Host)
+		if err != nil {
+			return fmt.Errorf("Listener failed: %v", err)
+		}
+		config := tls.Config{Certificates: []tls.Certificate{cert}}
+		ln = tls.NewListener(conn, &config)
+	} else {
+		var err error
+		ln, err = net.Listen("tcp", lj.Config.Host)
+		if err != nil {
+			return fmt.Errorf("TCP Listener failed: %v", err)
+		}
 	}
 
 	if lj.Config.SampleSize == nil {
@@ -66,15 +83,6 @@ func (lj *LJServer) Start() error {
 	}
 	log.Printf("[%s] Setting Sample Size to %d%%", lj.name, *lj.Config.SampleSize)
 
-	conn, err := net.Listen("tcp", lj.Config.Host)
-	if err != nil {
-		return fmt.Errorf("Listener failed: %v", err)
-	}
-
-	config := tls.Config{Certificates: []tls.Certificate{cert}}
-
-	ln := tls.NewListener(conn, &config)
-
 	log.Printf("[%s] Started Lumberjack Instance", lj.name)
 	for {
 		select {