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 --- internal/config/server.go | 1 + 1 file changed, 1 insertion(+) (limited to 'internal/config/server.go') diff --git a/internal/config/server.go b/internal/config/server.go index dc0d587..8bbb394 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -76,6 +76,7 @@ func newDefaultServerConfig() *ServerConfig { MaxConcurrentTails: 50, HostKeyFile: "./cache/ssh_host_key", HostKeyBits: 4096, + MapreduceLogFormat: "default", Permissions: Permissions{ Default: defaultPermissions, }, -- 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 --- internal/config/server.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'internal/config/server.go') diff --git a/internal/config/server.go b/internal/config/server.go index 8bbb394..677f5ac 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -4,8 +4,8 @@ import ( "errors" ) -// Permissions map. Each SSH user has a list of permissions which -// log files it is allowed to follow and which ones not. +// Permissions map. Each SSH user has a list of permissions which log files it +// is allowed to follow and which ones not. type Permissions struct { // The default user permissions. Default []string @@ -68,7 +68,6 @@ var ServerRelaxedAuthEnable bool func newDefaultServerConfig() *ServerConfig { defaultPermissions := []string{"^/.*"} defaultBindAddress := "0.0.0.0" - return &ServerConfig{ SSHBindAddress: defaultBindAddress, MaxConnections: 10, @@ -89,10 +88,8 @@ func ServerUserPermissions(userName string) (permissions []string, err error) { if p, ok := Server.Permissions.Users[userName]; ok { permissions = p } - if len(permissions) == 0 { err = errors.New("Empty set of permission, user won't be able to open any files") } - return } -- cgit v1.2.3 From f654855286d81afdd56372b4548ba11d596da78d Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 11 Oct 2021 17:42:37 +0300 Subject: Update JSON-schema to reflect all recent config file changes. --- internal/config/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal/config/server.go') diff --git a/internal/config/server.go b/internal/config/server.go index 677f5ac..254ea0c 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -47,7 +47,7 @@ type ServerConfig struct { MaxConcurrentCats int // The max amount of concurrent tails per server. MaxConcurrentTails int - // The user permissions. + // The user permissions. TODO: Add to JSON schema Permissions Permissions `json:",omitempty"` // The mapr log format MapreduceLogFormat string `json:",omitempty"` -- cgit v1.2.3 From d7fb2723543d0c8a4f0ce3549e6b70a8d2d0b18a Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 3 Nov 2021 09:22:49 +0200 Subject: Add integration test for long line splitting - Also fixed a bug regarding this along the way --- internal/config/server.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'internal/config/server.go') diff --git a/internal/config/server.go b/internal/config/server.go index 254ea0c..8285bdf 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -47,6 +47,8 @@ type ServerConfig struct { MaxConcurrentCats int // The max amount of concurrent tails per server. MaxConcurrentTails int + // The max line length until it's split up into multiple smaller lines. + MaxLineLength int // The user permissions. TODO: Add to JSON schema Permissions Permissions `json:",omitempty"` // The mapr log format @@ -69,13 +71,14 @@ func newDefaultServerConfig() *ServerConfig { defaultPermissions := []string{"^/.*"} defaultBindAddress := "0.0.0.0" return &ServerConfig{ - SSHBindAddress: defaultBindAddress, - MaxConnections: 10, - MaxConcurrentCats: 2, - MaxConcurrentTails: 50, - HostKeyFile: "./cache/ssh_host_key", HostKeyBits: 4096, + HostKeyFile: "./cache/ssh_host_key", MapreduceLogFormat: "default", + MaxConcurrentCats: 2, + MaxConcurrentTails: 50, + MaxConnections: 10, + MaxLineLength: 1024 * 1024, + SSHBindAddress: defaultBindAddress, Permissions: Permissions{ Default: defaultPermissions, }, -- 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 --- internal/config/server.go | 3 --- 1 file changed, 3 deletions(-) (limited to 'internal/config/server.go') diff --git a/internal/config/server.go b/internal/config/server.go index 8285bdf..e901a7a 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -63,9 +63,6 @@ type ServerConfig struct { Continuous []Continuous `json:",omitempty"` } -// ServerRelaxedAuthEnable should be used for development and testing purposes only. -var ServerRelaxedAuthEnable bool - // Create a new default server configuration. func newDefaultServerConfig() *ServerConfig { defaultPermissions := []string{"^/.*"} -- cgit v1.2.3 From 166bdc31703b2b496e6b45431787ed66f0e94a13 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 3 Dec 2021 10:16:47 +0000 Subject: add user permissions to JSON schema --- internal/config/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal/config/server.go') diff --git a/internal/config/server.go b/internal/config/server.go index e901a7a..4c96567 100644 --- a/internal/config/server.go +++ b/internal/config/server.go @@ -49,7 +49,7 @@ type ServerConfig struct { MaxConcurrentTails int // The max line length until it's split up into multiple smaller lines. MaxLineLength int - // The user permissions. TODO: Add to JSON schema + // The user permissions. Permissions Permissions `json:",omitempty"` // The mapr log format MapreduceLogFormat string `json:",omitempty"` -- cgit v1.2.3