Merge branch 'develop' into 'master'v4.2.0

DTail: Restrict SSH MAC algorithms allowed - Update of few dependencies

See merge request Storage/dtail!7

4 files changed, 19 insertions, 7 deletions

diff --git a/internal/clients/stats.go b/internal/clients/stats.go
index 1315aea..2da3cf7 100644
--- a/internal/clients/stats.go
+++ b/internal/clients/stats.go
@@ -34,7 +34,7 @@ func newTailStats(servers int) *stats {
 	}
 }
 
-// Start starts printing client connection stats every time a signal is recieved or
+// Start starts printing client connection stats every time a signal is received or
 // connection count has changed.
 func (s *stats) Start(ctx context.Context, throttleCh <-chan struct{},
 	statsCh <-chan string, quiet bool) {
diff --git a/internal/config/server.go b/internal/config/server.go
index 4c96567..cb9ca2b 100644
--- a/internal/config/server.go
+++ b/internal/config/server.go
@@ -61,6 +61,12 @@ type ServerConfig struct {
 	Schedule []Scheduled `json:",omitempty"`
 	// Continuous mapreduce jobs
 	Continuous []Continuous `json:",omitempty"`
+	// The allowed key exchanges algorithms.
+	KeyExchanges []string `json:",omitempty"`
+	// The allowed cipher algorithms.
+	Ciphers []string `json:",omitempty"`
+	// The allowed MAC algorithms.
+	MACs []string `json:",omitempty"`
 }
 
 // Create a new default server configuration.
diff --git a/internal/server/server.go b/internal/server/server.go
index 30602ff..761880d 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -39,11 +39,17 @@ func New() *Server {
 	dlog.Server.Info("Starting server", version.String())
 
 	s := Server{
-		sshServerConfig: &gossh.ServerConfig{},
-		catLimiter:      make(chan struct{}, config.Server.MaxConcurrentCats),
-		tailLimiter:     make(chan struct{}, config.Server.MaxConcurrentTails),
-		sched:           newScheduler(),
-		cont:            newContinuous(),
+		sshServerConfig: &gossh.ServerConfig{
+			Config: gossh.Config{
+				KeyExchanges: config.Server.KeyExchanges,
+				Ciphers:      config.Server.Ciphers,
+				MACs:         config.Server.MACs,
+			},
+		},
+		catLimiter:  make(chan struct{}, config.Server.MaxConcurrentCats),
+		tailLimiter: make(chan struct{}, config.Server.MaxConcurrentTails),
+		sched:       newScheduler(),
+		cont:        newContinuous(),
 	}
 
 	s.sshServerConfig.PasswordCallback = s.Callback
diff --git a/internal/version/version.go b/internal/version/version.go
index f381be6..90073b5 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -13,7 +13,7 @@ const (
 	// Name of DTail.
 	Name string = "DTail"
 	// Version of DTail.
-	Version string = "4.1.1"
+	Version string = "4.2.0"
 	// Additional information for DTail
 	Additional string = "Have a lot of fun!"
 )