From b526fcff5e490f926832d9aad43015eef67b0ad5 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 31 Jul 2021 18:20:03 +0300 Subject: more on configurable colors --- cmd/dserver/main.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 07f5270..5993481 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -12,7 +12,6 @@ import ( "syscall" "time" - "github.com/mimecast/dtail/internal/color" "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/logger" "github.com/mimecast/dtail/internal/server" @@ -25,7 +24,7 @@ func main() { var cfgFile string var debugEnable bool var displayVersion bool - var noColor bool + var color bool var pprof int var shutdownAfter int var sshPort int @@ -35,16 +34,15 @@ func main() { flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages") flag.BoolVar(&displayVersion, "version", false, "Display version") flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)") - flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors") + flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port") flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Automatically shutdown after so many seconds") flag.IntVar(&sshPort, "port", 2222, "SSH server port") flag.StringVar(&cfgFile, "cfg", "", "Config file path") flag.Parse() - config.Read(cfgFile, sshPort) - color.Colored = !noColor + config.Client.TermColorsEnabled = color if displayVersion { version.PrintAndExit() -- cgit v1.2.3 From 1cd0902b40fcddbe35ba9d29daccb9084d19fd6e Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 12 Aug 2021 10:56:36 +0300 Subject: add missing brush and also add color client configs plus jsonschema --- cmd/dserver/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 5993481..5f72cb8 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -42,11 +42,12 @@ func main() { flag.Parse() config.Read(cfgFile, sshPort) - config.Client.TermColorsEnabled = color + config.Client.TermColorsEnable = color if displayVersion { version.PrintAndExit() } + version.Print() ctx, cancel := context.WithCancel(context.Background()) if shutdownAfter > 0 { -- cgit v1.2.3 From 67d464f8a6e6ad6e1820feeb181c4db4751d8973 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 21 Aug 2021 09:10:31 +0300 Subject: can specify logDir of dserver via command line --- cmd/dserver/main.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 5f72cb8..f5f0536 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -22,27 +22,32 @@ import ( // The evil begins here. func main() { var cfgFile string + var color bool var debugEnable bool var displayVersion bool - var color bool + var logDir string var pprof int var shutdownAfter int var sshPort int user.NoRootCheck() + flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") + flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)") flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages") flag.BoolVar(&displayVersion, "version", false, "Display version") - flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)") - flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port") flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Automatically shutdown after so many seconds") flag.IntVar(&sshPort, "port", 2222, "SSH server port") flag.StringVar(&cfgFile, "cfg", "", "Config file path") + flag.StringVar(&logDir, "logDir", "", "Log dir path") flag.Parse() config.Read(cfgFile, sshPort) config.Client.TermColorsEnable = color + if logDir != "" { + config.Common.LogDir = logDir + } if displayVersion { version.PrintAndExit() -- cgit v1.2.3 From 00c3b6be33448d0389e17e45582c7c41d5d61fc2 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 21 Aug 2021 09:15:13 +0300 Subject: assume daily log strategy when logDir specified via command line arg --- cmd/dserver/main.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index f5f0536..89f9dca 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -47,6 +47,9 @@ func main() { config.Client.TermColorsEnable = color if logDir != "" { config.Common.LogDir = logDir + if config.Common.LogStrategy == "" { + config.Common.LogStrategy = "daily" + } } if displayVersion { -- cgit v1.2.3 From 1eed2b211044415f5f3da0f1b154a8ac9f1967c0 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 22 Aug 2021 10:07:00 +0300 Subject: introduces the protocol package --- cmd/dserver/main.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 89f9dca..1fe77a7 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -73,6 +73,10 @@ func main() { } }() + if debugEnable { + config.Common.DebugEnable = true + } + logger.Start(ctx, logger.Modes{Server: true, Debug: debugEnable || config.Common.DebugEnable}) if config.ServerRelaxedAuthEnable { -- cgit v1.2.3 From 03df87ee9464f6d7a1ca50254dcc5b81d1cf2625 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 18 Sep 2021 14:41:25 +0300 Subject: add spartan mode --- cmd/dserver/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 1fe77a7..bc3cb91 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -43,8 +43,8 @@ func main() { flag.StringVar(&logDir, "logDir", "", "Log dir path") flag.Parse() - config.Read(cfgFile, sshPort) - config.Client.TermColorsEnable = color + config.Read(cfgFile, sshPort, !color) + if logDir != "" { config.Common.LogDir = logDir if config.Common.LogStrategy == "" { -- cgit v1.2.3 From 3223be4cf95d0b6828196ac7a84277c18f3f5655 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 19 Sep 2021 13:22:59 +0300 Subject: move args to config package logger package rewrite as dlog --- cmd/dserver/main.go | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index bc3cb91..5788a87 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -9,11 +9,12 @@ import ( _ "net/http/pprof" "os" "os/signal" + "sync" "syscall" "time" "github.com/mimecast/dtail/internal/config" - "github.com/mimecast/dtail/internal/io/logger" + "github.com/mimecast/dtail/internal/io/dlog" "github.com/mimecast/dtail/internal/server" "github.com/mimecast/dtail/internal/user" "github.com/mimecast/dtail/internal/version" @@ -21,31 +22,31 @@ import ( // The evil begins here. func main() { - var cfgFile string + var args config.Args var color bool - var debugEnable bool var displayVersion bool var logDir string var pprof int var shutdownAfter int - var sshPort int user.NoRootCheck() flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)") - flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages") flag.BoolVar(&displayVersion, "version", false, "Display version") + flag.IntVar(&args.SSHPort, "port", 2222, "SSH server port") flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port") - flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Automatically shutdown after so many seconds") - flag.IntVar(&sshPort, "port", 2222, "SSH server port") - flag.StringVar(&cfgFile, "cfg", "", "Config file path") + flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Shutdown after so many seconds") + flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") + flag.StringVar(&args.LogLevel, "logLevel", "", "Log level") flag.StringVar(&logDir, "logDir", "", "Log dir path") flag.Parse() - config.Read(cfgFile, sshPort, !color) + args.NoColor = !color + config.Setup(&args, flag.Args()) if logDir != "" { + // TODO: Re-Implement log strategy support. config.Common.LogDir = logDir if config.Common.LogStrategy == "" { config.Common.LogStrategy = "daily" @@ -73,25 +74,25 @@ func main() { } }() - if debugEnable { - config.Common.DebugEnable = true - } - - logger.Start(ctx, logger.Modes{Server: true, Debug: debugEnable || config.Common.DebugEnable}) + var wg sync.WaitGroup + wg.Add(1) + dlog.Start(ctx, &wg, dlog.SERVER, config.Common.LogLevel) if config.ServerRelaxedAuthEnable { - logger.Fatal("SSH relaxed-auth mode enabled") + dlog.Server.Fatal("SSH relaxed-auth mode enabled") } if pprof > -1 { - // For debugging purposes only + // Start of pprof server for development purposes only. pprofArgs := fmt.Sprintf("0.0.0.0:%d", pprof) - logger.Info("Starting PProf", pprofArgs) + dlog.Server.Info("Starting PProf", pprofArgs) go http.ListenAndServe(pprofArgs, nil) } serv := server.New() status := serv.Start(ctx) - logger.Flush() + cancel() + + wg.Wait() os.Exit(status) } -- cgit v1.2.3 From a4d25626414ee36f937badd13e164aaf271c65d5 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 26 Sep 2021 16:42:47 +0300 Subject: refactor config reader - also looks in additional search paths for config file unless NONE is specified --- cmd/dserver/main.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 5788a87..a3add5b 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -25,7 +25,6 @@ func main() { var args config.Args var color bool var displayVersion bool - var logDir string var pprof int var shutdownAfter int @@ -34,25 +33,18 @@ func main() { flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)") flag.BoolVar(&displayVersion, "version", false, "Display version") - flag.IntVar(&args.SSHPort, "port", 2222, "SSH server port") + flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port") flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port") flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Shutdown after so many seconds") flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") + flag.StringVar(&args.LogDir, "logDir", "", "Log dir") flag.StringVar(&args.LogLevel, "logLevel", "", "Log level") - flag.StringVar(&logDir, "logDir", "", "Log dir path") + flag.StringVar(&args.LogDir, "logDir", "", "Log dir path") flag.Parse() args.NoColor = !color config.Setup(&args, flag.Args()) - if logDir != "" { - // TODO: Re-Implement log strategy support. - config.Common.LogDir = logDir - if config.Common.LogStrategy == "" { - config.Common.LogStrategy = "daily" - } - } - if displayVersion { version.PrintAndExit() } -- cgit v1.2.3 From 81b829e4e9f5ca0ac1df71c17f709af213b837ed Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 28 Sep 2021 21:11:50 +0300 Subject: can have daily and normal file log rotation --- cmd/dserver/main.go | 1 - 1 file changed, 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index a3add5b..e77bc21 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -39,7 +39,6 @@ func main() { flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") flag.StringVar(&args.LogDir, "logDir", "", "Log dir") flag.StringVar(&args.LogLevel, "logLevel", "", "Log level") - flag.StringVar(&args.LogDir, "logDir", "", "Log dir path") flag.Parse() args.NoColor = !color -- cgit v1.2.3 From e922e0f7a955fd40753930b818f580f714578ca3 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 2 Oct 2021 11:23:08 +0300 Subject: Client default log dir is ~/log --- cmd/dserver/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index e77bc21..a44d577 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -16,6 +16,7 @@ import ( "github.com/mimecast/dtail/internal/config" "github.com/mimecast/dtail/internal/io/dlog" "github.com/mimecast/dtail/internal/server" + "github.com/mimecast/dtail/internal/source" "github.com/mimecast/dtail/internal/user" "github.com/mimecast/dtail/internal/version" ) @@ -67,7 +68,7 @@ func main() { var wg sync.WaitGroup wg.Add(1) - dlog.Start(ctx, &wg, dlog.SERVER, config.Common.LogLevel) + dlog.Start(ctx, &wg, source.Server, config.Common.LogLevel) if config.ServerRelaxedAuthEnable { dlog.Server.Fatal("SSH relaxed-auth mode enabled") -- cgit v1.2.3 From b0973dd7d17269ad9d4ebfd4842072e739c59eca Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 3 Oct 2021 13:09:32 +0300 Subject: add dmap tests --- cmd/dserver/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index a44d577..c1db2f2 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -43,7 +43,7 @@ func main() { flag.Parse() args.NoColor = !color - config.Setup(&args, flag.Args()) + config.Setup(source.Server, &args, flag.Args()) if displayVersion { version.PrintAndExit() -- cgit v1.2.3 From 148ce987cde531978b4d5cdd30df9a67cc384ec5 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 8 Oct 2021 11:43:43 +0300 Subject: refactor --- cmd/dserver/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index c1db2f2..780c6d5 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -39,6 +39,7 @@ func main() { flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Shutdown after so many seconds") flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") flag.StringVar(&args.LogDir, "logDir", "", "Log dir") + flag.StringVar(&args.Logger, "logger", config.DefaultServerLogger, "Logger name") flag.StringVar(&args.LogLevel, "logLevel", "", "Log level") flag.Parse() @@ -68,7 +69,7 @@ func main() { var wg sync.WaitGroup wg.Add(1) - dlog.Start(ctx, &wg, source.Server, config.Common.LogLevel) + dlog.Start(ctx, &wg, source.Server) if config.ServerRelaxedAuthEnable { dlog.Server.Fatal("SSH relaxed-auth mode enabled") -- cgit v1.2.3 From 7563abe9d5beaa18fa1eab0f65668f5dfcf79052 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 9 Oct 2021 16:44:28 +0300 Subject: add dtail health check unit test. --- cmd/dserver/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 780c6d5..b4fc873 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -40,7 +40,7 @@ func main() { flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") flag.StringVar(&args.LogDir, "logDir", "", "Log dir") flag.StringVar(&args.Logger, "logger", config.DefaultServerLogger, "Logger name") - flag.StringVar(&args.LogLevel, "logLevel", "", "Log level") + flag.StringVar(&args.LogLevel, "logLevel", config.DefaultLogLevel, "Log level") flag.Parse() args.NoColor = !color -- cgit v1.2.3 From ea1de3044e129d419f4e807f2624a009343a128f Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 9 Oct 2021 21:10:29 +0300 Subject: vetting and linting and some code restyling --- cmd/dserver/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index b4fc873..cf726cf 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -32,7 +32,8 @@ func main() { user.NoRootCheck() flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") - flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, "Enable relaxced SSH auth mode (don't use in production!)") + flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, + "Enable relaxced SSH auth mode (don't use in production!)") flag.BoolVar(&displayVersion, "version", false, "Display version") flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port") flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port") -- cgit v1.2.3 From 424609b4cdc598fcd21cc272b16e64e7e54422de Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 15 Oct 2021 13:06:18 +0300 Subject: Execute test directories individually --- cmd/dserver/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index cf726cf..81e04e9 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -40,8 +40,9 @@ func main() { flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Shutdown after so many seconds") flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") flag.StringVar(&args.LogDir, "logDir", "", "Log dir") - flag.StringVar(&args.Logger, "logger", config.DefaultServerLogger, "Logger name") flag.StringVar(&args.LogLevel, "logLevel", config.DefaultLogLevel, "Log level") + flag.StringVar(&args.Logger, "logger", config.DefaultServerLogger, "Logger name") + flag.StringVar(&args.SSHBindAddress, "bindAddress", "", "The SSH bind address") flag.Parse() args.NoColor = !color -- cgit v1.2.3 From 6ff466ddbac457ba469b65319622fac48cc46300 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 20 Oct 2021 06:41:08 +0300 Subject: make pprof bind address configurable --- cmd/dserver/main.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 81e04e9..24143eb 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -3,7 +3,6 @@ package main import ( "context" "flag" - "fmt" "net/http" _ "net/http" _ "net/http/pprof" @@ -26,7 +25,7 @@ func main() { var args config.Args var color bool var displayVersion bool - var pprof int + var pprof string var shutdownAfter int user.NoRootCheck() @@ -36,13 +35,13 @@ func main() { "Enable relaxced SSH auth mode (don't use in production!)") flag.BoolVar(&displayVersion, "version", false, "Display version") flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port") - flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port") flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Shutdown after so many seconds") flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") flag.StringVar(&args.LogDir, "logDir", "", "Log dir") flag.StringVar(&args.LogLevel, "logLevel", config.DefaultLogLevel, "Log level") flag.StringVar(&args.Logger, "logger", config.DefaultServerLogger, "Logger name") flag.StringVar(&args.SSHBindAddress, "bindAddress", "", "The SSH bind address") + flag.StringVar(&pprof, "pprof", "", "Start PProf server this address") flag.Parse() args.NoColor = !color @@ -77,11 +76,9 @@ func main() { dlog.Server.Fatal("SSH relaxed-auth mode enabled") } - if pprof > -1 { - // Start of pprof server for development purposes only. - pprofArgs := fmt.Sprintf("0.0.0.0:%d", pprof) - dlog.Server.Info("Starting PProf", pprofArgs) - go http.ListenAndServe(pprofArgs, nil) + if pprof != "" { + dlog.Server.Info("Starting PProf", pprof) + go http.ListenAndServe(pprof, nil) } serv := server.New() -- cgit v1.2.3 From 7fe0c079f79f4da468e6195ed9453bc2d1f1822d Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 29 Oct 2021 08:25:17 +0300 Subject: rename relaxed auth flag --- cmd/dserver/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 24143eb..1a4af75 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -31,7 +31,7 @@ func main() { user.NoRootCheck() flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") - flag.BoolVar(&config.ServerRelaxedAuthEnable, "relaxedAuth", false, + flag.BoolVar(&config.ServerRelaxedAuthEnable, "RELAXED_AUTH_I_AM_REALLY_SURE", false, "Enable relaxced SSH auth mode (don't use in production!)") flag.BoolVar(&displayVersion, "version", false, "Display version") flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port") -- cgit v1.2.3 From cc3db06c59b6c80d88e2db310b12d24e70e4c5c3 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Nov 2021 12:33:19 +0200 Subject: Remove insecure and dangerous relaxed auth mode --- cmd/dserver/main.go | 6 ------ 1 file changed, 6 deletions(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index 1a4af75..fff41f0 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -31,8 +31,6 @@ func main() { user.NoRootCheck() flag.BoolVar(&color, "color", false, "Enable ANSII terminal colors") - flag.BoolVar(&config.ServerRelaxedAuthEnable, "RELAXED_AUTH_I_AM_REALLY_SURE", false, - "Enable relaxced SSH auth mode (don't use in production!)") flag.BoolVar(&displayVersion, "version", false, "Display version") flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port") flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Shutdown after so many seconds") @@ -72,10 +70,6 @@ func main() { wg.Add(1) dlog.Start(ctx, &wg, source.Server) - if config.ServerRelaxedAuthEnable { - dlog.Server.Fatal("SSH relaxed-auth mode enabled") - } - if pprof != "" { dlog.Server.Info("Starting PProf", pprof) go http.ListenAndServe(pprof, nil) -- cgit v1.2.3 From 7240f83f9f17bf72fbc4d068143003eba000cc75 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 3 Dec 2021 12:29:39 +0000 Subject: fix misuse of unbuffered channel for OS signal handling --- cmd/dserver/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/dserver/main.go') diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go index fff41f0..14188e1 100644 --- a/cmd/dserver/main.go +++ b/cmd/dserver/main.go @@ -55,7 +55,7 @@ func main() { ctx, cancel = context.WithTimeout(ctx, time.Duration(shutdownAfter)*time.Second) } - sigCh := make(chan os.Signal) + sigCh := make(chan os.Signal, 10) signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM) go func() { -- cgit v1.2.3