Remove old smtp and port stuff

cmd/apiary.go

@@ -11,8 +11,6 @@ import (
 
 	"git.t-juice.club/torjus/apiary"
 	"git.t-juice.club/torjus/apiary/config"
-	"git.t-juice.club/torjus/apiary/honeypot/ports"
-	"git.t-juice.club/torjus/apiary/honeypot/smtp"
 	"git.t-juice.club/torjus/apiary/honeypot/ssh"
 	"git.t-juice.club/torjus/apiary/honeypot/ssh/store"
 	"git.t-juice.club/torjus/apiary/web"
@@ -146,60 +144,6 @@ func ActionServe(c *cli.Context) error {
 		web.TLSConfig = tlsConfig
 	}
 
-	// Setup portlistener, if configured
-	if cfg.Ports.Enable {
-		portsCtx, cancel := context.WithCancel(rootCtx)
-		defer cancel()
-
-		// TODO: Add more stores
-		store := &ports.MemoryStore{}
-		portsServer := ports.New(store)
-		portsServer.Logger = loggers.portsLogger
-		for _, port := range cfg.Ports.TCPPorts {
-			portsServer.AddTCPPort(port)
-		}
-
-		go func() {
-			loggers.rootLogger.Info("Starting ports server.")
-			if err := portsServer.Start(portsCtx); err != nil {
-				loggers.rootLogger.Warnw("Ports server returned error.", "err", err)
-			}
-		}()
-	}
-
-	// Setup smtp honeypot if enabled
-	if cfg.SMTP.Enable {
-		honeypot, err := smtp.NewSMTPHoneypot()
-		if err != nil {
-			loggers.rootLogger.Warnw("Error seting up SMTP honeypot.", "error", err)
-		}
-		honeypot.Addr = cfg.SMTP.Addr
-		honeypot.Logger = loggers.smtpLogger
-		if cfg.SMTP.EnableMetrics {
-			honeypot.Store = smtp.NewMetricsStore(&smtp.DiscardStore{})
-		} else {
-			honeypot.Store = &smtp.DiscardStore{}
-		}
-
-		// Start smtp honeypot
-		go func() {
-			loggers.rootLogger.Info("Starting SMTP server.")
-			if err := honeypot.ListenAndServe(); err != nil {
-				loggers.rootLogger.Warnw("SMTP server returned error.", "error", err)
-			}
-		}()
-
-		// Wait for smtp shutdown
-		go func() {
-			<-serversCtx.Done()
-			loggers.rootLogger.Info("SMTP server shutdown started.")
-			if err := honeypot.Shutdown(); err != nil {
-				loggers.rootLogger.Errorw("Error shutting down SMTP server.", "error", err)
-			}
-			loggers.rootLogger.Info("SMTP server shutdown complete.")
-		}()
-	}
-
 	// Handle interrupt
 	go func() {
 		<-interruptChan
@@ -312,8 +256,6 @@ type loggerCollection struct {
 	honeypotLogger  *zap.SugaredLogger
 	webAccessLogger *zap.SugaredLogger
 	webServerLogger *zap.SugaredLogger
-	portsLogger     *zap.SugaredLogger
-	smtpLogger      *zap.SugaredLogger
 }
 
 func setupLoggers(cfg config.Config) *loggerCollection {
@@ -353,8 +295,6 @@ func setupLoggers(cfg config.Config) *loggerCollection {
 		honeypotLogger:  rootLogger.Named("HON").Sugar(),
 		webAccessLogger: rootLogger.Named("ACC").Sugar(),
 		webServerLogger: rootLogger.Named("WEB").Sugar(),
-		portsLogger:     rootLogger.Named("PRT").Sugar(),
-		smtpLogger:      rootLogger.Named("SMT").Sugar(),
 	}
 }