bugfix: System users can now be used in ACLs (#396)

This commit is contained in:
James Read 2024-08-30 21:48:07 +01:00 committed by GitHub
parent 6413e51cf5
commit 3f1dbf1130
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 22 deletions

View File

@ -107,12 +107,10 @@ func exec(instant time.Time, action *config.Action, cfg *config.Config, ex *exec
}).Infof("Executing action from calendar")
req := &executor.ExecutionRequest{
Action: action,
Cfg: cfg,
Tags: []string{"calendar"},
AuthenticatedUser: &acl.AuthenticatedUser{
Username: "calendar",
},
Action: action,
Cfg: cfg,
Tags: []string{"calendar"},
AuthenticatedUser: acl.UserFromSystem(cfg, "calendar"),
}
ex.ExecRequest(req)

View File

@ -34,12 +34,10 @@ func scheduleAction(cfg *config.Config, scheduler *cron.Cron, cronline string, e
_, err := scheduler.AddFunc(cronline, func() {
req := &executor.ExecutionRequest{
ActionTitle: action.Title,
Cfg: cfg,
Tags: []string{"cron"},
AuthenticatedUser: &acl.AuthenticatedUser{
Username: "cron",
},
ActionTitle: action.Title,
Cfg: cfg,
Tags: []string{"cron"},
AuthenticatedUser: acl.UserFromSystem(cfg, "cron"),
}
ex.ExecRequest(req)

View File

@ -44,13 +44,11 @@ func scheduleExec(action *config.Action, cfg *config.Config, ex *executor.Execut
fmt.Printf("%+v", args)
req := &executor.ExecutionRequest{
ActionTitle: action.Title,
Cfg: cfg,
Tags: []string{"fileindir"},
Arguments: args,
AuthenticatedUser: &acl.AuthenticatedUser{
Username: "fileindir",
},
ActionTitle: action.Title,
Cfg: cfg,
Tags: []string{"fileindir"},
Arguments: args,
AuthenticatedUser: acl.UserFromSystem(cfg, "fileindir"),
}
ex.ExecRequest(req)

View File

@ -8,9 +8,7 @@ import (
)
func Execute(cfg *config.Config, ex *executor.Executor) {
user := &acl.AuthenticatedUser{
Username: "startup-user",
}
user := acl.UserFromSystem(cfg, "startup-user")
for _, action := range cfg.Actions {
if action.ExecOnStartup {