-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
31ee322
commit 3ff20db
Showing
14 changed files
with
475 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // Copyright 2021 Contributors to the Veraison project. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package cmd | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| var corimCmd = &cobra.Command{ | ||
| Use: "corim", | ||
| Short: "CoRIM manipulation", | ||
|
|
||
| Run: func(cmd *cobra.Command, args []string) { | ||
| if len(args) == 0 { | ||
| cmd.Help() // nolint: errcheck | ||
| os.Exit(0) | ||
| } | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(corimCmd) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| // Copyright 2021 Contributors to the Veraison project. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package cmd | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
|
|
||
| "github.com/spf13/afero" | ||
| "github.com/spf13/cobra" | ||
| "github.com/veraison/corim/comid" | ||
| "github.com/veraison/corim/corim" | ||
| "github.com/veraison/swid" | ||
| ) | ||
|
|
||
| var ( | ||
| corimCreateCorimFile *string | ||
| corimCreateCoswidFiles []string | ||
| corimCreateCoswidDirs []string | ||
| corimCreateComidFiles []string | ||
| corimCreateComidDirs []string | ||
| corimCreateOutputFile *string | ||
| ) | ||
|
|
||
| var corimCreateCmd = NewCorimCreateCmd() | ||
|
|
||
| func NewCorimCreateCmd() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "create", | ||
| Short: "create a CBOR-encoded CoRIM from the supplied JSON template, CoMID(s) and/or CoSWID(s)", | ||
| Long: `create a CBOR-encoded CoRIM from the supplied JSON template, CoMID(s) and/or CoSWID(s)", | ||
| Create a CoRIM from template t1.json, adding CoMIDs found in the comid/ | ||
| directory and CoSWIDs found in the coswid/ directory. Since no explicit | ||
| output file is set, the (unsigned) CoRIM is saved to the current directory | ||
| with tag-id as basename and a .cbor extension. | ||
| cli corim create --tmpl-file=t1.json --comid-dir=comid --coswid-dir=coswid | ||
| Create a CoRIM from template corim-template.json, adding CoMID stored in | ||
| comid1.cbor and the two CoSWIDs stored in coswid1.cbor and dir/coswid2.cbor. | ||
| The (unsigned) CoRIM is saved to corim.cbor. | ||
| cli corim create --tmpl-file=corim-template.json \ | ||
| --comid-file=comid1.cbor \ | ||
| --coswid-file=coswid1.cbor \ | ||
| --coswid-file=dir/coswid2.cbor \ | ||
| --ouptut-file=corim.cbor | ||
| `, | ||
|
|
||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| if err := checkCorimCreateArgs(); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| comidFilesList := filesList(corimCreateComidFiles, corimCreateComidDirs, ".cbor") | ||
| coswidFilesList := filesList(corimCreateCoswidFiles, corimCreateCoswidDirs, ".cbor") | ||
|
|
||
| if len(comidFilesList)+len(coswidFilesList) == 0 { | ||
| return errors.New("no CoMID or CoSWID files found") | ||
| } | ||
|
|
||
| // checkCorimCreateArgs makes sure corimCreateCorimFile is not nil | ||
| cborFile, err := corimTemplateToCBOR(*corimCreateCorimFile, | ||
| comidFilesList, coswidFilesList, corimCreateOutputFile) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| fmt.Printf("created %q from %q\n", cborFile, *corimCreateCorimFile) | ||
|
|
||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| corimCreateCorimFile = cmd.Flags().StringP("tmpl-file", "f", "", "a CoMID template file (in JSON format)") | ||
|
|
||
| cmd.Flags().StringArrayVarP( | ||
| &corimCreateComidDirs, "comid-dir", "M", []string{}, "a directory containing CBOR-encoded CoMID files", | ||
| ) | ||
|
|
||
| cmd.Flags().StringArrayVarP( | ||
| &corimCreateComidFiles, "comid-file", "m", []string{}, "a CBOR-encoded CoMID file", | ||
| ) | ||
|
|
||
| cmd.Flags().StringArrayVarP( | ||
| &corimCreateCoswidDirs, "coswid-dir", "S", []string{}, "a directory containing CBOR-encoded CoSWID files", | ||
| ) | ||
|
|
||
| cmd.Flags().StringArrayVarP( | ||
| &corimCreateCoswidFiles, "coswid-file", "s", []string{}, "a CBOR-encoded CoSWID file", | ||
| ) | ||
|
|
||
| corimCreateOutputFile = cmd.Flags().StringP("output-file", "o", "", "name of the generated (unsigned) CoRIM file") | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| func checkCorimCreateArgs() error { | ||
| if corimCreateCorimFile == nil || *corimCreateCorimFile == "" { | ||
| return errors.New("no CoRIM template supplied") | ||
| } | ||
|
|
||
| if len(corimCreateComidDirs)+len(corimCreateComidFiles)+ | ||
| len(corimCreateCoswidDirs)+len(corimCreateCoswidFiles) == 0 { | ||
| return errors.New("no CoMID or CoSWID files or folders supplied") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func corimTemplateToCBOR(tmplFile string, comidFiles, coswidFiles []string, outputFile *string) (string, error) { | ||
| var ( | ||
| tmplData, corimCBOR []byte | ||
| c corim.UnsignedCorim | ||
| corimFile string | ||
| err error | ||
| ) | ||
|
|
||
| if tmplData, err = afero.ReadFile(fs, tmplFile); err != nil { | ||
| return "", fmt.Errorf("error loading template from %s: %w", tmplFile, err) | ||
| } | ||
|
|
||
| if err = c.FromJSON(tmplData); err != nil { | ||
| return "", fmt.Errorf("error decoding template from %s: %w", tmplFile, err) | ||
| } | ||
|
|
||
| // append CoMID(s) | ||
| for _, comidFile := range comidFiles { | ||
| var ( | ||
| comidCBOR []byte | ||
| m comid.Comid | ||
| ) | ||
|
|
||
| comidCBOR, err = afero.ReadFile(fs, comidFile) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error loading CoMID from %s: %w", comidFile, err) | ||
| } | ||
|
|
||
| err = m.FromCBOR(comidCBOR) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error loading CoMID from %s: %w", comidFile, err) | ||
| } | ||
|
|
||
| if c.AddComid(m) == nil { | ||
| return "", fmt.Errorf( | ||
| "error adding CoMID from %s (check its validity using the %q sub-command)", | ||
| comidFile, "comid validate", | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| // append CoSWID(s) | ||
| for _, coswidFile := range coswidFiles { | ||
| var ( | ||
| coswidCBOR []byte | ||
| s swid.SoftwareIdentity | ||
| ) | ||
|
|
||
| coswidCBOR, err = afero.ReadFile(fs, coswidFile) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error loading CoSWID from %s: %w", coswidFile, err) | ||
| } | ||
|
|
||
| err = s.FromCBOR(coswidCBOR) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error loading CoSWID from %s: %w", coswidFile, err) | ||
| } | ||
|
|
||
| if c.AddCoswid(s) == nil { | ||
| return "", fmt.Errorf("error adding CoSWID from %s", coswidFile) | ||
| } | ||
| } | ||
|
|
||
| // check the result | ||
| if err = c.Valid(); err != nil { | ||
| return "", fmt.Errorf("error validating CoRIM: %w", err) | ||
| } | ||
|
|
||
| corimCBOR, err = c.ToCBOR() | ||
| if err != nil { | ||
| return "", fmt.Errorf("error encoding CoRIM to CBOR: %w", err) | ||
| } | ||
|
|
||
| if outputFile == nil || *outputFile == "" { | ||
| // we can use tag-id as the basename, since it is supposedly unique | ||
| corimFile = c.ID.String() + ".cbor" | ||
| } else { | ||
| corimFile = *outputFile | ||
| } | ||
|
|
||
| err = afero.WriteFile(fs, corimFile, corimCBOR, 0644) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error saving CoRIM to file %s: %w", corimFile, err) | ||
| } | ||
|
|
||
| return corimFile, nil | ||
| } | ||
|
|
||
| func init() { | ||
| corimCmd.AddCommand(corimCreateCmd) | ||
| } |
Oops, something went wrong.