From aa4861f9cd35bcff40390c1ec67b13eec7673c2a Mon Sep 17 00:00:00 2001 From: Aryan Bhosale <36108149+aryanbhosale@users.noreply.github.com> Date: Sat, 24 Aug 2024 18:14:23 +0530 Subject: [PATCH 1/2] "offline" verification using the bundle of attestations without any additional handling of the file --- pkg/cmd/attestation/verification/attestation.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cmd/attestation/verification/attestation.go b/pkg/cmd/attestation/verification/attestation.go index 5feca47eac7..e861f8194b1 100644 --- a/pkg/cmd/attestation/verification/attestation.go +++ b/pkg/cmd/attestation/verification/attestation.go @@ -3,6 +3,7 @@ package verification import ( "bufio" "encoding/json" + "bytes" "errors" "fmt" "os" @@ -88,6 +89,10 @@ func loadBundlesFromJSONLinesFile(path string) ([]*api.Attestation, error) { var line []byte line, err = reader.ReadBytes('\n') for err == nil { + if len(bytes.TrimSpace(line)) == 0 { + line, err = reader.ReadBytes('\n') + continue + } var bundle bundle.ProtobufBundle bundle.Bundle = new(protobundle.Bundle) err = bundle.UnmarshalJSON(line) From c1444feaf11ccc8e7196704277533210548fa965 Mon Sep 17 00:00:00 2001 From: Zach Steindler Date: Mon, 26 Aug 2024 11:12:38 -0400 Subject: [PATCH 2/2] Run Signed-off-by: Zach Steindler --- pkg/cmd/attestation/verification/attestation.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/attestation/verification/attestation.go b/pkg/cmd/attestation/verification/attestation.go index e861f8194b1..c780e247c2b 100644 --- a/pkg/cmd/attestation/verification/attestation.go +++ b/pkg/cmd/attestation/verification/attestation.go @@ -2,8 +2,8 @@ package verification import ( "bufio" - "encoding/json" "bytes" + "encoding/json" "errors" "fmt" "os" @@ -90,9 +90,9 @@ func loadBundlesFromJSONLinesFile(path string) ([]*api.Attestation, error) { line, err = reader.ReadBytes('\n') for err == nil { if len(bytes.TrimSpace(line)) == 0 { - line, err = reader.ReadBytes('\n') - continue - } + line, err = reader.ReadBytes('\n') + continue + } var bundle bundle.ProtobufBundle bundle.Bundle = new(protobundle.Bundle) err = bundle.UnmarshalJSON(line)