Added certificate flash support for plugins

Author: cmaglie

cli/certificates/flash.go

@@ -20,12 +20,14 @@ package certificates
 
 import (
 	"bytes"
+	"crypto/x509"
 	"fmt"
 	"io"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/arduino/arduino-fwuploader/certificates"
 	"github.com/arduino/arduino-fwuploader/cli/arguments"
 	"github.com/arduino/arduino-fwuploader/cli/common"
 	"github.com/arduino/arduino-fwuploader/cli/feedback"
@@ -80,19 +82,86 @@ func runFlash(certificateURLs, certificatePaths []string) {
 	uploadToolDir := common.DownloadRequiredToolsForBoard(packageIndex, board)
 
 	var res *flasher.FlashResult
-	var err error
+	var flashErr error
 	if !board.IsPlugin() {
-		res, err = flashCertificates(board, uploadToolDir, certificateURLs, certificatePaths)
+		res, flashErr = flashCertificates(board, uploadToolDir, certificateURLs, certificatePaths)
 	} else {
-		// TODO
+		uploader, err := plugin.NewFWUploaderPlugin(uploadToolDir)
+		if err != nil {
+			feedback.Fatal(fmt.Sprintf("Could not open uploader plugin: %s", err), feedback.ErrGeneric)
+		}
+		res, flashErr = flashCertificatesWithPlugin(uploader, certificateURLs, certificatePaths)
 	}
 
 	feedback.PrintResult(res)
-	if err != nil {
+	if flashErr != nil {
 		os.Exit(int(feedback.ErrGeneric))
 	}
 }
 
+func flashCertificatesWithPlugin(uploader *plugin.FwUploader, certificateURLs, certificatePaths []string) (*flasher.FlashResult, error) {
+	tmp, err := paths.MkTempDir("", "")
+	if err != nil {
+		return nil, err
+	}
+	defer tmp.RemoveAll()
+	certsBundle := tmp.Join("certs.pem")
+
+	stdoutBuffer := &bytes.Buffer{}
+	stderrBuffer := &bytes.Buffer{}
+	var stdout io.Writer = stdoutBuffer
+	var stderr io.Writer = stdoutBuffer
+	if feedback.GetFormat() == feedback.Text {
+		stdout = io.MultiWriter(os.Stdout, stdoutBuffer)
+		stderr = io.MultiWriter(os.Stderr, stderrBuffer)
+	}
+
+	var allCerts []*x509.Certificate
+	for _, certPath := range certificatePaths {
+		logrus.Infof("Converting and flashing certificate %s", certPath)
+		stdout.Write([]byte(fmt.Sprintf("Converting and flashing certificate %s\n", certPath)))
+
+		certs, err := certificates.LoadCertificatesFromFile(paths.New(certPath))
+		if err != nil {
+			return nil, err
+		}
+		allCerts = append(allCerts, certs...)
+	}
+
+	for _, URL := range certificateURLs {
+		logrus.Infof("Converting and flashing certificate from %s", URL)
+		stdout.Write([]byte(fmt.Sprintf("Converting and flashing certificate from %s\n", URL)))
+		rootCert, err := certificates.ScrapeRootCertificatesFromURL(URL)
+		if err != nil {
+			return nil, err
+		}
+		allCerts = append(allCerts, rootCert)
+	}
+
+	f, err := certsBundle.Create()
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close() // Defer close if an error occurs while writing file
+	for _, cert := range allCerts {
+		_, err := f.Write(certificates.EncodeCertificateAsPEM(cert))
+		if err != nil {
+			return nil, err
+		}
+	}
+	if err := f.Close(); err != nil {
+		return nil, err
+	}
+
+	_, err = uploader.FlashCertificates(commonFlags.Address, commonFlags.Fqbn, certsBundle, stdout, stderr)
+	return &flasher.FlashResult{
+		Flasher: &flasher.ExecOutput{
+			Stdout: stdoutBuffer.String(),
+			Stderr: stderrBuffer.String(),
+		},
+	}, err
+}
+
 func flashCertificates(board *firmwareindex.IndexBoard, uploadToolDir *paths.Path, certificateURLs, certificatePaths []string) (*flasher.FlashResult, error) {
 	loaderSketchPath, err := download.DownloadSketch(board.LoaderSketch)
 	if err != nil {

plugin/plugin.go

@@ -190,3 +190,41 @@ func (uploader *FwUploader) exec(stdout, stderr io.Writer, args ...string) (*byt
 	execErr := proc.RunWithinContext(context.Background())
 	return stdoutBuffer, stderrBuffer, execErr
 }
+
+// FlashCertificates writes the given certificates bundle in PEM format.
+func (uploader *FwUploader) FlashCertificates(portAddress, fqbn string, certsPath *paths.Path, stdout, stderr io.Writer) (*FlashCertificatesResult, error) {
+	args := []string{"cert", "flash", certsPath.String()}
+	if portAddress != "" {
+		args = append(args, "-p", portAddress)
+	}
+	if fqbn != "" {
+		args = append(args, "-b", fqbn)
+	}
+	execStdout, execStderr, execErr := uploader.exec(stdout, stderr, args...)
+
+	res := &FlashCertificatesResult{
+		Stdout: execStdout.Bytes(),
+		Stderr: execStderr.Bytes(),
+	}
+	fwErrorPrefix := "FLASH-CERTIFICATES-ERROR: "
+	for _, line := range strings.Split(execStdout.String(), "\n") {
+		if strings.HasPrefix(line, fwErrorPrefix) {
+			res.Error = strings.TrimPrefix(line, fwErrorPrefix)
+		}
+	}
+	if res.Error != "" {
+		if execErr != nil {
+			execErr = fmt.Errorf("%s: %w", res.Error, execErr)
+		} else {
+			execErr = errors.New(res.Error)
+		}
+	}
+	return res, execErr
+}
+
+// FlashCertificatesResult contains the result of GetFirmwareVersion command
+type FlashCertificatesResult struct {
+	Error  string
+	Stdout []byte
+	Stderr []byte
+}