Skip to content

Make Lumberjack SSL optional #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bashtoni wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make Lumberjack SSL optional #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions input/filebeat/lumberjack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down