medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: Exec permission denied now marks the action as "blocked" and adds a log message. Timeouts also add a documentation link to the command output. Tags always set. (#398)

This commit is contained in:
James Read 2024-08-30 21:36:13 +01:00 committed by GitHub
parent defcf6d26e
commit 6413e51cf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/executor/executor.go
View File

@ -315,7 +315,18 @@ func stepRateCheck(req *ExecutionRequest) bool {
} }
func stepACLCheck(req *ExecutionRequest) bool { func stepACLCheck(req *ExecutionRequest) bool {
return acl.IsAllowedExec(req.Cfg, req.AuthenticatedUser, req.Action) canExec := acl.IsAllowedExec(req.Cfg, req.AuthenticatedUser, req.Action)
if !canExec {
req.logEntry.Output = "ACL check failed. Blocked from executing."
req.logEntry.Blocked = true
log.WithFields(log.Fields{
"actionTitle": req.logEntry.ActionTitle,
}).Warnf("ACL check failed. Blocked from executing.")
}
return canExec
} }
func stepParseArgs(req *ExecutionRequest) bool { func stepParseArgs(req *ExecutionRequest) bool {
@ -359,6 +370,7 @@ func stepRequestAction(req *ExecutionRequest) bool {
req.logEntry.ActionTitle = sv.ReplaceEntityVars(req.EntityPrefix, req.Action.Title) req.logEntry.ActionTitle = sv.ReplaceEntityVars(req.EntityPrefix, req.Action.Title)
req.logEntry.ActionIcon = req.Action.Icon req.logEntry.ActionIcon = req.Action.Icon
req.logEntry.ActionId = req.Action.ID req.logEntry.ActionId = req.Action.ID
req.logEntry.Tags = req.Tags
req.executor.logmutex.Lock() req.executor.logmutex.Lock()
@ -479,9 +491,9 @@ func stepExec(req *ExecutionRequest) bool {
// The context timeout should kill the process, but let's make sure. // The context timeout should kill the process, but let's make sure.
req.executor.Kill(req.logEntry) req.executor.Kill(req.logEntry)
req.logEntry.TimedOut = true req.logEntry.TimedOut = true
req.logEntry.Output += "This OliveTin action timed out after " + fmt.Sprintf("%v", req.Action.Timeout) + " seconds. If you need more time for this action, set a longer timeout. See https://docs.olivetin.app/timeout.html for more help."
} }
req.logEntry.Tags = req.Tags
req.logEntry.DatetimeFinished = time.Now() req.logEntry.DatetimeFinished = time.Now()
return true return true