diff options
| author | Paul Bütow <pbuetow@mimecast.com> | 2020-02-16 13:10:47 +0000 |
|---|---|---|
| committer | Paul Bütow <pbuetow@mimecast.com> | 2020-02-16 13:10:47 +0000 |
| commit | 86ecab818a6089f6da7267463edbc5300ddc155c (patch) | |
| tree | e5168a98e446ba638b44b15e2b9a5e287b45c31f /internal | |
| parent | 1bdfd96a799726ff74b52955a25b216de62c14d2 (diff) | |
rename scheduled user to schedule user
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/config/config.go | 2 | ||||
| -rw-r--r-- | internal/server/handlers/readcommand.go | 4 | ||||
| -rw-r--r-- | internal/server/scheduler.go | 2 | ||||
| -rw-r--r-- | internal/server/server.go | 2 | ||||
| -rw-r--r-- | internal/user/server/user.go | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index d20a480..239bfd1 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -10,7 +10,7 @@ import ( const ControlUser string = "DTAIL-CONTROL-USER" // ScheduledUser is used for scheduled queries. -const ScheduledUser string = "DTAIL-SCHEDULED-USER" +const ScheduleUser string = "DTAIL-SCHEDULE-USER" // Client holds a DTail client configuration. var Client *ClientConfig diff --git a/internal/server/handlers/readcommand.go b/internal/server/handlers/readcommand.go index 6ab41cd..63158f6 100644 --- a/internal/server/handlers/readcommand.go +++ b/internal/server/handlers/readcommand.go @@ -27,8 +27,8 @@ func newReadCommand(server *ServerHandler, mode omode.Mode) *readCommand { func (r *readCommand) Start(ctx context.Context, argc int, args []string) { regex := "." if argc >= 4 { - regex = strings.Join(args[3:], " ") - logger.Debug("Joined regex", regex) + regex = strings.Join(args[3:], " ") + logger.Debug("Joined regex", regex) } if argc < 3 { r.server.sendServerMessage(logger.Warn(r.server.user, commandParseWarning, args, argc)) diff --git a/internal/server/scheduler.go b/internal/server/scheduler.go index e0cecfd..41b0f41 100644 --- a/internal/server/scheduler.go +++ b/internal/server/scheduler.go @@ -86,7 +86,7 @@ func (s *scheduler) runJobs(ctx context.Context) { ServersStr: servers, What: files, Mode: omode.MapClient, - UserName: config.ScheduledUser, + UserName: config.ScheduleUser, } args.SSHAuthMethods = append(args.SSHAuthMethods, gossh.Password(s.authPayload)) diff --git a/internal/server/server.go b/internal/server/server.go index 5c46147..9b9d8a0 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -204,7 +204,7 @@ func (s *Server) backgroundUserCallback(c gossh.ConnMetadata, authPayload []byte return nil, nil } - if user.Name == config.ScheduledUser && string(authPayload) == s.sched.authPayload { + if user.Name == config.ScheduleUser && string(authPayload) == s.sched.authPayload { logger.Debug(user, "Granting permissions to schedule user") return nil, nil } diff --git a/internal/user/server/user.go b/internal/user/server/user.go index 7389d74..2c1df64 100644 --- a/internal/user/server/user.go +++ b/internal/user/server/user.go @@ -41,7 +41,7 @@ func (u *User) String() string { func (u *User) HasFilePermission(filePath, permissionType string) (hasPermission bool) { logger.Debug(u, filePath, permissionType, "Checking config permissions") - if u.Name == config.ScheduledUser { + if u.Name == config.ScheduleUser { // Schedule user has same permissions as dtail process itself. return true } |
