From 5e5aa9ba9c9b7f7463a1a0c1af013c885df36134 Mon Sep 17 00:00:00 2001
From: dlorenc <lorenc.d@gmail.com>
Date: Tue, 8 Mar 2022 13:15:47 -0600
Subject: [PATCH] Make the loginfo command a bit more future/backwards proof.
(#718)
The logid field comes back as nil (which is expected), but we break trying
to dereference that for formatting.
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
---
cmd/rekor-cli/app/log_info.go | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/cmd/rekor-cli/app/log_info.go b/cmd/rekor-cli/app/log_info.go
index 53fcfac..f5c5372 100644
--- a/cmd/rekor-cli/app/log_info.go
+++ b/cmd/rekor-cli/app/log_info.go
@@ -49,6 +49,7 @@ type logInfoCmdOutput struct {
func (l *logInfoCmdOutput) String() string {
// Verification is always successful if we return an object.
ts := time.Unix(0, int64(l.TimestampNanos)).UTC().Format(time.RFC3339)
+
return fmt.Sprintf(`Verification Successful!
Tree Size: %v
Root Hash: %s
@@ -112,11 +113,18 @@ var logInfoCmd = &cobra.Command{
return nil, errors.New("signature on tree head did not verify")
}
+ pToInt := func(p *int64) int64 {
+ if p == nil {
+ return 0
+ }
+ return *p
+ }
+
cmdOutput := &logInfoCmdOutput{
- TreeSize: *logInfo.TreeSize,
+ TreeSize: pToInt(logInfo.TreeSize),
RootHash: *logInfo.RootHash,
TimestampNanos: sth.GetTimestamp(),
- TreeID: *logInfo.TreeID,
+ TreeID: pToInt(logInfo.TreeID),
}
oldState := state.Load(serverURL)
--
GitLab