fix: harden deserialization of gw2eff api status

gw2auth · Jul 26, 2024 · 85a70bd · 85a70bd
1 parent 7436230
commit 85a70bd
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/web/notifications.go b/web/notifications.go
@@ -8,16 +8,29 @@ import (
 	"time"
 )
 
+type gw2EffApiStatusElement struct {
+	Name     string `json:"name"`
+	Status   int    `json:"status"`
+	Duration int    `json:"duration"`
+	Error    any    `json:"error"`
+}
+
+func (e gw2EffApiStatusElement) CheckError() bool {
+	switch v := e.Error.(type) {
+	case bool:
+		return v
+
+	case string:
+		return v != ""
+
+	default:
+		return false
+	}
+}
+
 type gw2EffApiStatusResponse struct {
-	Data []struct {
-		Name        string `json:"name"`
-		Url         string `json:"url"`
-		Status      int    `json:"status"`
-		Duration    int    `json:"duration"`
-		Error       bool   `json:"error"`
-		SchemaValid bool   `json:"schemaValid"`
-	} `json:"data"`
-	UpdatedAt time.Time `json:"updated_at"`
+	Data      []gw2EffApiStatusElement `json:"data"`
+	UpdatedAt time.Time                `json:"updated_at"`
 }
 
 type notificationType string
@@ -72,7 +85,7 @@ func NotificationsEndpoint(httpClient *http.Client) echo.HandlerFunc {
 
 		var endpointsWithIssues []string
 		for _, element := range gw2EffStatus.Data {
-			if slices.Contains(relevantEndpoints, element.Name) && (element.Status != http.StatusOK || element.Error || element.Duration >= 15_000) {
+			if slices.Contains(relevantEndpoints, element.Name) && (element.Status != http.StatusOK || element.CheckError() || element.Duration >= 15_000) {
 				endpointsWithIssues = append(endpointsWithIssues, element.Name)
 			}
 		}