feat: scheduler (#1108)

This commit is contained in:
Jonas Plum
2024-11-04 22:30:20 +01:00
committed by GitHub
parent 42797509f7
commit a2bdeecb0d
8 changed files with 208 additions and 16 deletions

View File

@@ -0,0 +1,28 @@
package migrations
import (
"fmt"
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/daos"
"github.com/pocketbase/pocketbase/models/schema"
)
func reactionsUpdateUp(db dbx.Builder) error {
dao := daos.New(db)
triggers := []string{"webhook", "hook", "schedule"}
col, err := dao.FindCollectionByNameOrId(ReactionCollectionName)
if err != nil {
return fmt.Errorf("failed to find collection %s: %w", ReactionCollectionName, err)
}
field := col.Schema.GetFieldByName("trigger")
field.Options = &schema.SelectOptions{MaxSelect: 1, Values: triggers}
col.Schema.AddField(field)
return dao.SaveCollection(col)
}

View File

@@ -13,4 +13,5 @@ func Register() {
migrations.Register(systemuserUp, systemuserDown, "1700000006_systemuser.go") migrations.Register(systemuserUp, systemuserDown, "1700000006_systemuser.go")
migrations.Register(searchViewUp, searchViewDown, "1700000007_search_view.go") migrations.Register(searchViewUp, searchViewDown, "1700000007_search_view.go")
migrations.Register(dashboardCountsViewUpdateUp, dashboardCountsViewUpdateDown, "1700000008_dashboardview.go") migrations.Register(dashboardCountsViewUpdateUp, dashboardCountsViewUpdateDown, "1700000008_dashboardview.go")
migrations.Register(reactionsUpdateUp, nil, "1700000009_reactions_update.go")
} }

View File

@@ -0,0 +1,101 @@
package schedule
import (
"context"
"encoding/json"
"fmt"
"log/slog"
"time"
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase"
"github.com/pocketbase/pocketbase/core"
"github.com/pocketbase/pocketbase/daos"
"github.com/pocketbase/pocketbase/models"
"github.com/pocketbase/pocketbase/tools/cron"
"go.uber.org/multierr"
"github.com/SecurityBrewery/catalyst/migrations"
"github.com/SecurityBrewery/catalyst/reaction/action"
)
type Schedule struct {
Expression string `json:"expression"`
}
func Start(pb *pocketbase.PocketBase) {
scheduler := cron.New()
if err := scheduler.Add("reactions", "* * * * *", func() {
ctx := context.Background()
moment := cron.NewMoment(time.Now())
if err := runSchedule(ctx, pb.App, moment); err != nil {
slog.ErrorContext(ctx, fmt.Sprintf("failed to run hook reaction: %v", err))
}
}); err != nil {
slog.Error(fmt.Sprintf("failed to add cron job: %v", err))
}
scheduler.Start()
}
func runSchedule(ctx context.Context, app core.App, moment *cron.Moment) error {
var errs error
records, err := findByScheduleTrigger(app.Dao(), moment)
if err != nil {
errs = multierr.Append(errs, fmt.Errorf("failed to find schedule reaction: %w", err))
}
if len(records) == 0 {
return nil
}
for _, hook := range records {
_, err = action.Run(ctx, app, hook.GetString("action"), hook.GetString("actiondata"), "{}")
if err != nil {
errs = multierr.Append(errs, fmt.Errorf("failed to run hook reaction: %w", err))
}
}
return errs
}
func findByScheduleTrigger(dao *daos.Dao, moment *cron.Moment) ([]*models.Record, error) {
records, err := dao.FindRecordsByExpr(migrations.ReactionCollectionName, dbx.HashExp{"trigger": "schedule"})
if err != nil {
return nil, fmt.Errorf("failed to find schedule reaction: %w", err)
}
if len(records) == 0 {
return nil, nil
}
var errs error
var matchedRecords []*models.Record
for _, record := range records {
var schedule Schedule
if err := json.Unmarshal([]byte(record.GetString("triggerdata")), &schedule); err != nil {
errs = multierr.Append(errs, err)
continue
}
s, err := cron.NewSchedule(schedule.Expression)
if err != nil {
errs = multierr.Append(errs, err)
continue
}
if s.IsDue(moment) {
matchedRecords = append(matchedRecords, record)
}
}
return matchedRecords, errs
}

View File

@@ -3,11 +3,13 @@ package reaction
import ( import (
"github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase"
"github.com/SecurityBrewery/catalyst/reaction/schedule"
"github.com/SecurityBrewery/catalyst/reaction/trigger/hook" "github.com/SecurityBrewery/catalyst/reaction/trigger/hook"
"github.com/SecurityBrewery/catalyst/reaction/trigger/webhook" "github.com/SecurityBrewery/catalyst/reaction/trigger/webhook"
) )
func BindHooks(pb *pocketbase.PocketBase, test bool) { func BindHooks(pb *pocketbase.PocketBase, test bool) {
schedule.Start(pb)
hook.BindHooks(pb, test) hook.BindHooks(pb, test)
webhook.BindHooks(pb) webhook.BindHooks(pb)
} }

View File

@@ -2,6 +2,7 @@
import ActionPythonFormFields from '@/components/reaction/ActionPythonFormFields.vue' import ActionPythonFormFields from '@/components/reaction/ActionPythonFormFields.vue'
import ActionWebhookFormFields from '@/components/reaction/ActionWebhookFormFields.vue' import ActionWebhookFormFields from '@/components/reaction/ActionWebhookFormFields.vue'
import TriggerHookFormFields from '@/components/reaction/TriggerHookFormFields.vue' import TriggerHookFormFields from '@/components/reaction/TriggerHookFormFields.vue'
import TriggerScheduleFormFields from '@/components/reaction/TriggerScheduleFormFields.vue'
import TriggerWebhookFormFields from '@/components/reaction/TriggerWebhookFormFields.vue' import TriggerWebhookFormFields from '@/components/reaction/TriggerWebhookFormFields.vue'
import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert' import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
@@ -67,6 +68,25 @@ defineRule('required', (value: string) => {
return true return true
}) })
defineRule('triggerdata.expression', (value: string) => {
if (values.trigger !== 'schedule') {
return true
}
if (!value) {
return 'This field is required'
}
const macros = ['@yearly', '@annually', '@monthly', '@weekly', '@daily', '@midnight', '@hourly']
if (macros.includes(value)) {
return true
}
const expression =
/^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$/
if (value.match(expression)) {
return true
}
return 'Invalid cron expression'
})
defineRule('triggerdata.token', (value: string) => { defineRule('triggerdata.token', (value: string) => {
return true return true
}) })
@@ -160,6 +180,7 @@ const { handleSubmit, validate, values } = useForm({
validationSchema: { validationSchema: {
name: 'required', name: 'required',
trigger: 'required', trigger: 'required',
'triggerdata.expression': 'triggerdata.expression',
'triggerdata.token': 'triggerdata.token', 'triggerdata.token': 'triggerdata.token',
'triggerdata.path': 'triggerdata.path', 'triggerdata.path': 'triggerdata.path',
'triggerdata.collections': 'triggerdata.collections', 'triggerdata.collections': 'triggerdata.collections',
@@ -263,6 +284,7 @@ const curlExample = computed(() => {
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectGroup> <SelectGroup>
<SelectItem value="schedule">Schedule</SelectItem>
<SelectItem value="webhook">HTTP / Webhook</SelectItem> <SelectItem value="webhook">HTTP / Webhook</SelectItem>
<SelectItem value="hook">Collection Hook</SelectItem> <SelectItem value="hook">Collection Hook</SelectItem>
</SelectGroup> </SelectGroup>
@@ -277,7 +299,8 @@ const curlExample = computed(() => {
</FormItem> </FormItem>
</FormField> </FormField>
<TriggerWebhookFormFields v-if="values.trigger === 'webhook'" /> <TriggerScheduleFormFields v-if="values.trigger === 'schedule'" />
<TriggerWebhookFormFields v-else-if="values.trigger === 'webhook'" />
<TriggerHookFormFields v-else-if="values.trigger === 'hook'" /> <TriggerHookFormFields v-else-if="values.trigger === 'hook'" />
<div v-if="values.trigger === 'webhook'"> <div v-if="values.trigger === 'webhook'">

View File

@@ -32,7 +32,9 @@ const subtitle = (reaction: Reaction) =>
triggerNiceName(reaction) + ' to ' + reactionNiceName(reaction) triggerNiceName(reaction) + ' to ' + reactionNiceName(reaction)
const triggerNiceName = (reaction: Reaction) => { const triggerNiceName = (reaction: Reaction) => {
if (reaction.trigger === 'hook') { if (reaction.trigger === 'schedule') {
return 'Schedule'
} else if (reaction.trigger === 'hook') {
return 'Collection Hook' return 'Collection Hook'
} else if (reaction.trigger === 'webhook') { } else if (reaction.trigger === 'webhook') {
return 'HTTP / Webhook' return 'HTTP / Webhook'

View File

@@ -0,0 +1,42 @@
<script setup lang="ts">
import {
FormControl,
FormDescription,
FormField,
FormItem,
FormLabel,
FormMessage
} from '@/components/ui/form'
import { Input } from '@/components/ui/input'
</script>
<template>
<FormField name="triggerdata.expression" v-slot="{ componentField }" validate-on-input>
<FormItem>
<FormLabel for="expression" class="text-right"> Cron Expression </FormLabel>
<FormControl>
<Input
id="expression"
class="col-span-3"
v-bind="componentField"
placeholder="Enter a cron expression"
/>
</FormControl>
<FormDescription>
<p class="text-sm text-gray-500">
A cron expression or macro to schedule the trigger. Example: <code>0 * * * *</code> (every
hour) or <code>@daily</code> (every day).
<a
href="https://en.wikipedia.org/wiki/Cron#CRON_expression"
target="_blank"
rel="noopener noreferrer"
class="text-blue-600 underline"
>
Learn more
</a>
</p>
</FormDescription>
<FormMessage />
</FormItem>
</FormField>
</template>

View File

@@ -15,15 +15,11 @@ import { Input } from '@/components/ui/input'
<FormItem> <FormItem>
<FormLabel for="token" class="text-right">Token</FormLabel> <FormLabel for="token" class="text-right">Token</FormLabel>
<FormControl> <FormControl>
<Input <Input id="token" class="col-span-3" v-bind="componentField" placeholder="Enter a token" />
id="token"
class="col-span-3"
v-bind="componentField"
placeholder="Enter a token (e.g. 'xyz...')"
/>
</FormControl> </FormControl>
<FormDescription> <FormDescription>
Optional. Include an authorization token in the request headers. Optional. Include an authorization token in the request headers. Example:
<code>Bearer YOUR_TOKEN</code>
</FormDescription> </FormDescription>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -33,14 +29,11 @@ import { Input } from '@/components/ui/input'
<FormItem> <FormItem>
<FormLabel for="path" class="text-right">Path</FormLabel> <FormLabel for="path" class="text-right">Path</FormLabel>
<FormControl> <FormControl>
<Input <Input id="path" class="col-span-3" v-bind="componentField" placeholder="Enter a path" />
id="path"
class="col-span-3"
v-bind="componentField"
placeholder="Enter a path (e.g. 'action1')"
/>
</FormControl> </FormControl>
<FormDescription> Specify the path to trigger the reaction. </FormDescription> <FormDescription>
Specify the path to trigger the reaction. Example: <code>action1</code>
</FormDescription>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
</FormField> </FormField>