Merge remote-tracking branch 'origin/pull/402'

* origin/pull/402:
  Per feedback, and enhancements
  Verified JSON support

cmd/sbctl/verify.go

@@ -16,19 +16,32 @@ import (
 	"github.com/spf13/cobra"
 )
 
+type VerifiedFile struct {
+	FileName       string         `json:"file_name"`
+	// IsSigned should be set to one of these values:
+	//   -  0: "unsigned"
+	//   -  1: "signed"
+	//   - -1: "file does not exist"
+	IsSigned       int8           `json:"is_signed"`
+}
+
 var (
 	ErrInvalidHeader = errors.New("invalid pe header")
 	verifyCmd        = &cobra.Command{
 		Use:   "verify",
 		Short: "Find and check if files in the ESP are signed or not",
 		RunE:  RunVerify,
 	}
+	verifiedFiles      []VerifiedFile
 )
 
 func VerifyOneFile(state *config.State, f string) error {
 	o, err := state.Fs.Open(f)
+	fileentry := VerifiedFile{FileName: f, IsSigned: 0}
 	if errors.Is(err, os.ErrNotExist) {
 		logging.Warn("%s does not exist", f)
+		fileentry.IsSigned = -1
+		verifiedFiles = append(verifiedFiles, fileentry)
 		return nil
 	} else if errors.Is(err, os.ErrPermission) {
 		logging.Warn("%s permission denied. Can't read file\n", f)
@@ -52,11 +65,15 @@ func VerifyOneFile(state *config.State, f string) error {
 	if err != nil {
 		return err
 	}
+
 	if ok {
 		logging.Ok("%s is signed", f)
+		fileentry.IsSigned = 1
 	} else {
 		logging.NotOk("%s is not signed", f)
 	}
+	verifiedFiles = append(verifiedFiles, fileentry)
+
 	return nil
 }
 
@@ -91,6 +108,9 @@ func RunVerify(cmd *cobra.Command, args []string) error {
 				return err
 			}
 		}
+		if cmdOptions.JsonOutput {
+			return JsonOut(verifiedFiles)
+		}
 		return nil
 	}
 	logging.Print("Verifying file database and EFI images in %s...\n", espPath)
@@ -125,6 +145,9 @@ func RunVerify(cmd *cobra.Command, args []string) error {
 	}); err != nil {
 		return err
 	}
+	if cmdOptions.JsonOutput {
+		return JsonOut(verifiedFiles)
+	}
 	return nil
 }