maemachinebroke/hakurei
1
0
Fork 0
forked from security/hakurei
Code Pull Requests Activity

internal/app/state: improve handles internals

Browse Source 
This replaces the Store interface with something better reflecting the underlying data format for #19. An implementation of Store is provided on top of the new code to ease transition.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-10-27 00:43:33 +09:00
parent 4a463b7f03
commit 5e5826459e
8 changed files with 652 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/app/state/data.go
View File

@@ -23,21 +23,30 @@ func entryEncode(w io.Writer, s *hst.State) error {
}
}
// entryDecodeHeader calls entryReadHeader, returning [hst.AppError] for a non-nil error.
func entryDecodeHeader(r io.Reader) (hst.Enablement, error) {
if et, err := entryReadHeader(r); err != nil {
return 0, &hst.AppError{Step: "decode state header", Err: err}
} else {
return et, nil
}
}
// entryDecode decodes [hst.State] from [io.Reader] and stores the result in the value pointed to by p.
// entryDecode validates the embedded [hst.Config] value.
//
// A non-nil error returned by entryDecode is of type [hst.AppError].
func entryDecode(r io.Reader, p *hst.State) error {
if et, err := entryReadHeader(r); err != nil {
return &hst.AppError{Step: "decode state header", Err: err}
func entryDecode(r io.Reader, p *hst.State) (hst.Enablement, error) {
if et, err := entryDecodeHeader(r); err != nil {
return et, err
} else if err = gob.NewDecoder(r).Decode(&p); err != nil {
return &hst.AppError{Step: "decode state body", Err: err}
return et, &hst.AppError{Step: "decode state body", Err: err}
} else if err = p.Config.Validate(); err != nil {
return err
return et, err
} else if p.Enablements.Unwrap() != et {
return &hst.AppError{Step: "validate state enablement", Err: os.ErrInvalid,
return et, &hst.AppError{Step: "validate state enablement", Err: os.ErrInvalid,
Msg: fmt.Sprintf("state entry %s has unexpected enablement byte %#x, %#x", p.ID.String(), byte(p.Enablements.Unwrap()), byte(et))}
} else {
return nil
return et, nil
}
}