Merge pull request #1 from mariocandela/Tracer

Improve Tracer Event and configured on SSH Strategy

protocols/hypertextTransferProtocolStrategy.go

@@ -2,6 +2,7 @@ package protocols
 
 import (
 	"beelzebub/parser"
+	"beelzebub/tracer"
 	"fmt"
 	log "github.com/sirupsen/logrus"
 	"io"
@@ -15,7 +16,7 @@ type HypertextTransferProtocolStrategy struct {
 	beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration
 }
 
-func (httpStrategy HypertextTransferProtocolStrategy) Init(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration) error {
+func (httpStrategy HypertextTransferProtocolStrategy) Init(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration, tr tracer.Tracer) error {
 	httpStrategy.beelzebubServiceConfiguration = beelzebubServiceConfiguration
 	httpStrategy.serverMux = http.NewServeMux()
 

protocols/protocolManager.go

@@ -1,13 +1,19 @@
 package protocols
 
-import "beelzebub/parser"
+import (
+	"beelzebub/parser"
+	"beelzebub/tracer"
+)
 
 type ProtocolManager struct {
 	strategy ServiceStrategy
+	tracer   *tracer.Tracer
 }
 
 func (pm *ProtocolManager) InitServiceManager() *ProtocolManager {
-	return &ProtocolManager{}
+	return &ProtocolManager{
+		tracer: tracer.Init(),
+	}
 }
 
 func (pm *ProtocolManager) SetProtocolStrategy(strategy ServiceStrategy) {
@@ -15,5 +21,5 @@ func (pm *ProtocolManager) SetProtocolStrategy(strategy ServiceStrategy) {
 }
 
 func (pm *ProtocolManager) InitService(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration) error {
-	return pm.strategy.Init(beelzebubServiceConfiguration)
+	return pm.strategy.Init(beelzebubServiceConfiguration, *pm.tracer)
 }

protocols/protocolStrategy.go

@@ -1,7 +1,10 @@
 package protocols
 
-import "beelzebub/parser"
+import (
+	"beelzebub/parser"
+	"beelzebub/tracer"
+)
 
 type ServiceStrategy interface {
-	Init(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration) error
+	Init(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration, tracer tracer.Tracer) error
 }

protocols/secureShellStrategy.go

@@ -2,19 +2,21 @@ package protocols
 
 import (
 	"beelzebub/parser"
+	"beelzebub/tracer"
 	"fmt"
 	"github.com/gliderlabs/ssh"
 	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh/terminal"
 	"regexp"
+	"strings"
 	"time"
 )
 
 type SecureShellStrategy struct {
 }
 
-func (SSHStrategy *SecureShellStrategy) Init(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration) error {
+func (SSHStrategy *SecureShellStrategy) Init(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration, tr tracer.Tracer) error {
 	go func() {
 		server := &ssh.Server{
 			Addr:        beelzebubServiceConfiguration.Address,
@@ -23,14 +25,30 @@ func (SSHStrategy *SecureShellStrategy) Init(beelzebubServiceConfiguration parse
 			Version:     beelzebubServiceConfiguration.ServerVersion,
 			Handler: func(sess ssh.Session) {
 				uuidSession := uuid.New()
-				traceSessionStart(sess, uuidSession)
+
+				tr.TraceEvent(tracer.Event{
+					Msg:        "New SSH Session",
+					Protocol:   beelzebubServiceConfiguration.Protocol,
+					RemoteAddr: sess.RemoteAddr().String(),
+					Status:     tracer.Start,
+					ID:         uuidSession.String(),
+					Environ:    strings.Join(sess.Environ(), ","),
+					User:       sess.User(),
+				})
+
 				term := terminal.NewTerminal(sess, buildPrompt(sess.User(), beelzebubServiceConfiguration.ServerName))
 				for {
 					commandInput, err := term.ReadLine()
 					if err != nil {
 						break
 					}
-					traceCommand(commandInput, uuidSession)
+					tr.TraceEvent(tracer.Event{
+						Msg:        "New SSH Command",
+						RemoteAddr: sess.RemoteAddr().String(),
+						Status:     tracer.Interaction,
+						Command:    commandInput,
+						ID:         uuidSession.String(),
+					})
 					if commandInput == "exit" {
 						break
 					}
@@ -47,10 +65,21 @@ func (SSHStrategy *SecureShellStrategy) Init(beelzebubServiceConfiguration parse
 						}
 					}
 				}
-				traceSessionEnd(sess, uuidSession)
+				tr.TraceEvent(tracer.Event{
+					Msg:    "End SSH Session",
+					Status: tracer.End,
+					ID:     uuidSession.String(),
+				})
 			},
 			PasswordHandler: func(ctx ssh.Context, password string) bool {
-				traceAttempt(ctx, password)
+				tr.TraceEvent(tracer.Event{
+					Msg:        "New SSH attempt",
+					Status:     tracer.Stateless,
+					User:       ctx.User(),
+					Password:   password,
+					Client:     ctx.ClientVersion(),
+					RemoteAddr: ctx.RemoteAddr().String(),
+				})
 				matched, err := regexp.MatchString(beelzebubServiceConfiguration.PasswordRegex, password)
 				if err != nil {
 					log.Errorf("Error regex: %s, %s", beelzebubServiceConfiguration.PasswordRegex, err.Error())
@@ -75,39 +104,3 @@ func (SSHStrategy *SecureShellStrategy) Init(beelzebubServiceConfiguration parse
 func buildPrompt(user string, serverName string) string {
 	return fmt.Sprintf("%s@%s:~$ ", user, serverName)
 }
-
-func traceAttempt(ctx ssh.Context, password string) {
-	log.WithFields(log.Fields{
-		"remoteAddr": ctx.RemoteAddr(),
-		"user":       ctx.User(),
-		"password":   password,
-		"client":     ctx.ClientVersion(),
-	}).Info("New SSH attempt")
-}
-
-func traceSessionStart(sess ssh.Session, uuidSession uuid.UUID) {
-	log.WithFields(log.Fields{
-		"uuidSession": uuidSession,
-		"remoteAddr":  sess.RemoteAddr(),
-		"command":     sess.Command(),
-		"environ":     sess.Environ(),
-		"user":        sess.User(),
-	}).Info("New SSH Session")
-}
-
-func traceSessionEnd(sess ssh.Session, uuidSession uuid.UUID) {
-	log.WithFields(log.Fields{
-		"uuidSession": uuidSession,
-		"remoteAddr":  sess.RemoteAddr(),
-		"command":     sess.Command(),
-		"environ":     sess.Environ(),
-		"user":        sess.User(),
-	}).Info("End SSH Session")
-}
-
-func traceCommand(command string, uuidSession uuid.UUID) {
-	log.WithFields(log.Fields{
-		"uuidSession": uuidSession,
-		"command":     command,
-	}).Info("New SSH Command")
-}

tracer/tracer.go

@@ -0,0 +1,45 @@
+package tracer
+
+import (
+	log "github.com/sirupsen/logrus"
+)
+
+type Tracer struct {
+}
+
+func Init() *Tracer {
+	return &Tracer{}
+}
+
+func (tracer *Tracer) TraceEvent(event Event) {
+	log.WithFields(log.Fields{
+		"status": event.Status.String(),
+		"event":  event,
+	}).Info("New Event")
+}
+
+type Event struct {
+	RemoteAddr string
+	Protocol   string
+	Command    string
+	Status     Status
+	Msg        string
+	ID         string
+	Environ    string
+	User       string
+	Password   string
+	Client     string
+}
+
+type Status int
+
+const (
+	Start Status = iota
+	End
+	Stateless
+	Interaction
+)
+
+func (status Status) String() string {
+	return [...]string{"Start", "End", "Stateless", "Interaction"}[status]
+}