Fix: Correctly display "About" modal when update check fails (resolves …

…#199)
axllent · Oct 28, 2023 · 153eb3d · 153eb3d
1 parent f29016a
commit 153eb3d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/internal/updater/updater.go b/internal/updater/updater.go
@@ -1,3 +1,4 @@
+// package Updater checks and downloads new versions
 package updater
 
 import (
@@ -6,13 +7,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"time"
 
+	"github.com/axllent/mailpit/config"
 	"github.com/axllent/mailpit/internal/logger"
 	"github.com/axllent/semver"
 )
@@ -49,13 +51,27 @@ type Release struct {
 func GithubLatest(repo, name string) (string, string, string, error) {
 	releaseURL := fmt.Sprintf("https://api.github.com/repos/%s/releases", repo)
 
-	resp, err := http.Get(releaseURL) // #nosec
+	timeout := time.Duration(5 * time.Second)
+
+	client := http.Client{
+		Timeout: timeout,
+	}
+
+	req, err := http.NewRequest("GET", releaseURL, nil)
 	if err != nil {
 		return "", "", "", err
 	}
+
+	req.Header.Set("User-Agent", "Mailpit/"+config.Version)
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", "", "", err
+	}
+
 	defer resp.Body.Close()
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 
 	if err != nil {
 		return "", "", "", err

diff --git a/server/apiv1/info.go b/server/apiv1/info.go
@@ -30,7 +30,7 @@ type appInformation struct {
 }
 
 // AppInfo returns some basic details about the running app, and latest release.
-func AppInfo(w http.ResponseWriter, r *http.Request) {
+func AppInfo(w http.ResponseWriter, _ *http.Request) {
 	// swagger:route GET /api/v1/info application AppInformation
 	//
 	// # Get application information

diff --git a/server/ui-src/components/AboutMailpit.vue b/server/ui-src/components/AboutMailpit.vue
@@ -159,8 +159,12 @@ export default {
 						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 					</div>
 					<div class="modal-body">
+
+						<div class="alert alert-warning mb-3" v-if="mailbox.appInfo.LatestVersion == ''">
+							There might be a newer version available. The check failed.
+						</div>
 						<a class="btn btn-warning d-block mb-3"
-							v-if="mailbox.appInfo.Version != mailbox.appInfo.LatestVersion"
+							v-else-if="mailbox.appInfo.Version != mailbox.appInfo.LatestVersion"
 							:href="'https://github.com/axllent/mailpit/releases/tag/' + mailbox.appInfo.LatestVersion">
 							A new version of Mailpit ({{ mailbox.appInfo.LatestVersion }}) is available.
 						</a>