remove the certs if the install process errors. The user is able to retry

umbynos · umbynos · commit 8707687f8b8c · 2023-04-21T13:14:49.000+02:00
diff --git a/certificates/certificates.go b/certificates/certificates.go
@@ -168,10 +168,6 @@ func MigrateCertificatesGeneratedWithOldAgentVersions(certsDir *paths.Path) {
 
 // GenerateCertificates will generate the required certificates useful for a HTTPS connection on localhost
 func GenerateCertificates(certsDir *paths.Path) {
-	certsDir.Join("ca.cert.pem").Remove()
-	certsDir.Join("ca.key.pem").Remove()
-	certsDir.Join("cert.pem").Remove()
-	certsDir.Join("key.pem").Remove()
 
 	// Create the key for the certification authority
 	caKey, err := generateKey("P256")
@@ -285,9 +281,12 @@ func DeleteCertHandler(c *gin.Context) {
 
 // DeleteCertificates will delete the certificates
 func DeleteCertificates(certDir *paths.Path) {
+	certDir.Join("ca.key.pem").Remove()
 	certDir.Join("ca.cert.pem").Remove()
 	certDir.Join("ca.cert.cer").Remove()
-	certDir.Join("ca.key.pem").Remove()
+	certDir.Join("key.pem").Remove()
+	certDir.Join("cert.pem").Remove()
+	certDir.Join("cert.cer").Remove()
 }
 
 const noFirefoxTemplateHTML = `<!DOCTYPE html>
diff --git a/certificates/install_darwin.go b/certificates/install_darwin.go
@@ -71,14 +71,16 @@ import (
 	"github.com/arduino/go-paths-helper"
 )
 
-// InstallCertificate will install the certificates in the system keychain on macos
-func InstallCertificate(cert *paths.Path) {
+// InstallCertificate will install the certificates in the system keychain on macos,
+// if something goes wrong will show a dialog with the error and return an error
+func InstallCertificate(cert *paths.Path) error {
 	log.Infof("Installing certificate: %s", cert)
 	p := C.installCert(C.CString(cert.String()))
 	s := C.GoString(p)
 	if len(s) != 0 {
 		oscmd := exec.Command("osascript", "-e", "display dialog \""+s+"\" buttons \"OK\" with title \"Error installing certificates\"")
 		_ = oscmd.Run()
-		log.Info(oscmd.String())
+		return errors.New(s)
 	}
+	return nil
 }
diff --git a/certificates/install_default.go b/certificates/install_default.go
@@ -18,12 +18,15 @@
 package certificates
 
 import (
+	"errors"
+
 	log "github.com/sirupsen/logrus"
 
 	"github.com/arduino/go-paths-helper"
 )
 
 // InstallCertificate won't do anything on unsupported Operative Systems
-func InstallCertificate(cert *paths.Path) {
+func InstallCertificate(cert *paths.Path) error {
 	log.Warn("platform not supported for the certificate install")
+	return errors.New("platform not supported for the certificate install")
 }
diff --git a/systray/systray_real.go b/systray/systray_real.go
@@ -96,8 +96,13 @@ func (s *Systray) start() {
 				RemoveCrashes()
 				s.updateMenuItem(mRmCrashes, config.LogsIsEmpty())
 			case <-mGenCerts.ClickedCh:
-				cert.GenerateCertificates(config.GetCertificatesDir())
-				cert.InstallCertificate(config.GetCertificatesDir().Join("ca.cert.cer"))
+				certDir := config.GetCertificatesDir()
+				cert.GenerateCertificates(certDir)
+				err := cert.InstallCertificate(certDir.Join("ca.cert.cer"))
+				// if something goes wrong during the cert install we remove them, so the user is able to retry
+				if err != nil {
+					cert.DeleteCertificates(certDir)
+				}
 				s.Restart()
 			case <-mPause.ClickedCh:
 				s.Pause()

Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,16 @@ import (`
`71`	`71`	`"github.com/arduino/go-paths-helper"`
`72`	`72`	`)`
`73`	`73`
`74`		`-// InstallCertificate will install the certificates in the system keychain on macos`
`75`		`-func InstallCertificate(cert *paths.Path) {`
	`74`	`+// InstallCertificate will install the certificates in the system keychain on macos,`
	`75`	`+// if something goes wrong will show a dialog with the error and return an error`
	`76`	`+func InstallCertificate(cert *paths.Path) error {`
`76`	`77`	`log.Infof("Installing certificate: %s", cert)`
`77`	`78`	`p := C.installCert(C.CString(cert.String()))`
`78`	`79`	`s := C.GoString(p)`
`79`	`80`	`if len(s) != 0 {`
`80`	`81`	`oscmd := exec.Command("osascript", "-e", "display dialog \""+s+"\" buttons \"OK\" with title \"Error installing certificates\"")`
`81`	`82`	`_ = oscmd.Run()`
`82`		`- log.Info(oscmd.String())`
	`83`	`+ return errors.New(s)`
`83`	`84`	`}`
	`85`	`+ return nil`
`84`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,15 @@`
`18`	`18`	`package certificates`
`19`	`19`
`20`	`20`	`import (`
	`21`	`+ "errors"`
	`22`	`+`
`21`	`23`	`log "github.com/sirupsen/logrus"`
`22`	`24`
`23`	`25`	`"github.com/arduino/go-paths-helper"`
`24`	`26`	`)`
`25`	`27`
`26`	`28`	`// InstallCertificate won't do anything on unsupported Operative Systems`
`27`		`-func InstallCertificate(cert *paths.Path) {`
	`29`	`+func InstallCertificate(cert *paths.Path) error {`
`28`	`30`	`log.Warn("platform not supported for the certificate install")`
	`31`	`+ return errors.New("platform not supported for the certificate install")`
`29`	`32`	`}`