Skip to content

Ensure graceful handling of serialization version mismatches on event trigger definitions #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
konradkonrad wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −0
Open

Ensure graceful handling of serialization version mismatches on event trigger definitions #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions rolling-shutter/keyperimpl/shutterservice/eventtriggerregisteredprocessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ func (p *EventTriggerRegisteredEventProcessor) ProcessEvents(ctx context.Context
}

triggerDefinition := EventTriggerDefinition{}
if len(registryEvent.TriggerDefinition) > 0 &&
registryEvent.TriggerDefinition[0] != Version {
evLog.Log().Int64("version", int64(
registryEvent.TriggerDefinition[0])).Msg(
"skipping trigger definition with outdated version")
continue
}
err := triggerDefinition.UnmarshalBytes(registryEvent.TriggerDefinition)
if err != nil {
evLog.Info().Err(err).Msg("skipping invalid trigger definition")
Expand Down
7 changes: 7 additions & 0 deletions rolling-shutter/keyperimpl/shutterservice/triggerprocessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ func (tp *TriggerProcessor) FetchEvents(ctx context.Context, start, end uint64)
Logger()

trigger := EventTriggerDefinition{}
if len(triggerRegisteredEvent.Definition) > 0 &&
Copy link
Copy Markdown
Contributor

@ylembachar ylembachar Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid unmarshaling a definition that will anyway be skipped, the version check should happen before UnmarshalBytes(), similarily to your previous update: https://github.com/shutter-network/rolling-shutter/pull/688/changes#diff-bf9d9e2e61cab2782870a4b2cf9bf3feae73dfe74d1265c1eec16652699a7d9dR95

triggerRegisteredEvent.Definition[0] != Version {
triggerLog.Log().Int64("version", int64(
triggerRegisteredEvent.Definition[0])).Msg(
"ignoring trigger definition with outdated version in database")
continue
}
err := trigger.UnmarshalBytes(triggerRegisteredEvent.Definition)
if err != nil {
// This is not supposed to happen as only valid triggers are inserted into the database.
Expand Down