From 4cf2b6fe0be11bf6f78e373921902a429544e1de Mon Sep 17 00:00:00 2001 From: MatteoPologruto Date: Tue, 14 May 2024 12:42:36 +0200 Subject: [PATCH 1/2] Show message to the user after a successful certificate installation --- certificates/certificates.go | 7 +++++++ systray/systray_real.go | 2 ++ 2 files changed, 9 insertions(+) diff --git a/certificates/certificates.go b/certificates/certificates.go index 8a8c50d8..c256210a 100644 --- a/certificates/certificates.go +++ b/certificates/certificates.go @@ -32,6 +32,7 @@ import ( "os" "time" + "github.com/arduino/arduino-create-agent/utilities" "github.com/arduino/go-paths-helper" log "github.com/sirupsen/logrus" ) @@ -286,4 +287,10 @@ func GenerateAndInstallCertificates(certDir *paths.Path) { log.Errorf("cannot install certificates something went wrong: %s", err) DeleteCertificates(certDir) } + expDate, err := GetExpirationDate() + if err != nil { + log.Errorf("cannot get certificates expiration date, something went wrong: %s", err) + } + infoMsg := "The Arduino Agent needs a local HTTPS certificate to work correctly with Safari.\n\nYour HTTPS certificate status:\n- Certificate installed:\t\tYes\n- Certificate trusted:\t\tYes\n- Certificate expiration:\t" + expDate.Format(time.DateTime) + utilities.UserPrompt(infoMsg, "{\"OK\"}", "OK", "OK", "Arduino Agent: Manage HTTPS certificate") } diff --git a/systray/systray_real.go b/systray/systray_real.go index 5ae79f08..c8273384 100644 --- a/systray/systray_real.go +++ b/systray/systray_real.go @@ -117,6 +117,8 @@ func (s *Systray) start() { if err != nil { log.Errorf("cannot set installCerts value in config.ini: %s", err) } + infoMsg = "The Arduino Agent needs a local HTTPS certificate to work correctly with Safari.\n\nYour HTTPS certificate status:\n- Certificate installed:\t\tNo\n- Certificate trusted:\t\tN/A\n- Certificate expiration:\tN/A" + utilities.UserPrompt(infoMsg, "{\"OK\"}", "OK", "OK", "Arduino Agent: Manage HTTPS certificate") } s.Restart() } From d451a930c27187186e8d927bd2331d3cbee99210 Mon Sep 17 00:00:00 2001 From: Xayton <30591904+Xayton@users.noreply.github.com> Date: Wed, 15 May 2024 09:42:19 +0200 Subject: [PATCH 2/2] Show a simplified message (different for install and uninstall cases) --- certificates/certificates.go | 7 +------ systray/systray_real.go | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/certificates/certificates.go b/certificates/certificates.go index c256210a..ae2843d2 100644 --- a/certificates/certificates.go +++ b/certificates/certificates.go @@ -287,10 +287,5 @@ func GenerateAndInstallCertificates(certDir *paths.Path) { log.Errorf("cannot install certificates something went wrong: %s", err) DeleteCertificates(certDir) } - expDate, err := GetExpirationDate() - if err != nil { - log.Errorf("cannot get certificates expiration date, something went wrong: %s", err) - } - infoMsg := "The Arduino Agent needs a local HTTPS certificate to work correctly with Safari.\n\nYour HTTPS certificate status:\n- Certificate installed:\t\tYes\n- Certificate trusted:\t\tYes\n- Certificate expiration:\t" + expDate.Format(time.DateTime) - utilities.UserPrompt(infoMsg, "{\"OK\"}", "OK", "OK", "Arduino Agent: Manage HTTPS certificate") + utilities.UserPrompt("The HTTPS certificate has been installed correctly.", "{\"OK\"}", "OK", "OK", "Arduino Agent: HTTPS certificate installation") } diff --git a/systray/systray_real.go b/systray/systray_real.go index c8273384..b070f22a 100644 --- a/systray/systray_real.go +++ b/systray/systray_real.go @@ -117,8 +117,7 @@ func (s *Systray) start() { if err != nil { log.Errorf("cannot set installCerts value in config.ini: %s", err) } - infoMsg = "The Arduino Agent needs a local HTTPS certificate to work correctly with Safari.\n\nYour HTTPS certificate status:\n- Certificate installed:\t\tNo\n- Certificate trusted:\t\tN/A\n- Certificate expiration:\tN/A" - utilities.UserPrompt(infoMsg, "{\"OK\"}", "OK", "OK", "Arduino Agent: Manage HTTPS certificate") + utilities.UserPrompt("The HTTPS certificate has been uninstalled.", "{\"OK\"}", "OK", "OK", "Arduino Agent: HTTPS certificate installation") } s.Restart() }