Merge pull request #65 from hhftechnology/pangolin

Pangolin

Author: hhftechnology

internal/api/handlers/health_diagnostics.go

@@ -31,30 +31,43 @@ func parseBouncersJSON(bouncerOutput string, computeStatus bool) ([]models.Bounc
 		if ipAddr, err := jsonparser.GetString(value, "ip_address"); err == nil {
 			bouncer.IPAddress = ipAddr
 		}
-		if valid, err := jsonparser.GetBoolean(value, "valid"); err == nil {
-			bouncer.Valid = valid
-		}
-		if lastPull, err := jsonparser.GetString(value, "last_pull"); err == nil {
-			for _, layout := range []string{time.RFC3339Nano, time.RFC3339} {
-				if t, err := time.Parse(layout, lastPull); err == nil {
-					bouncer.LastPull = t
-					break
+		// Parse timestamps with multiple format support
+		parseTime := func(key string) time.Time {
+			if s, err := jsonparser.GetString(value, key); err == nil {
+				for _, layout := range []string{time.RFC3339Nano, time.RFC3339} {
+					if t, err := time.Parse(layout, s); err == nil {
+						return t
+					}
 				}
 			}
+			return time.Time{}
 		}
+
+		bouncer.LastPull = parseTime("last_pull")
+		bouncer.CreatedAt = parseTime("created_at")
+		bouncer.UpdatedAt = parseTime("updated_at")
+
 		if bouncerType, err := jsonparser.GetString(value, "type"); err == nil {
 			bouncer.Type = bouncerType
 		}
 		if version, err := jsonparser.GetString(value, "version"); err == nil {
 			bouncer.Version = version
 		}
 
+		// A bouncer that exists in the list is valid by definition.
+		// CrowdSec deletes revoked bouncers rather than marking them,
+		// so the "revoked" and legacy "valid" fields are not reliable
+		// indicators of actual connectivity (confirmed by CrowdSec team, see #47).
+		bouncer.Valid = true
+
 		if computeStatus {
-			if !bouncer.Valid {
-				bouncer.Status = "disconnected"
-			} else if bouncer.LastPull.IsZero() {
-				bouncer.Status = "pending" // valid key, never pulled yet
-			} else if time.Since(bouncer.LastPull) <= 60*time.Minute {
+			lastActivity := bouncer.LastActivity()
+
+			if !lastActivity.IsZero() && time.Since(lastActivity) <= 5*time.Minute {
+				bouncer.Status = "connected"
+			} else if lastActivity.IsZero() {
+				bouncer.Status = "registered" // enrolled but never pulled
+			} else if time.Since(lastActivity) <= 60*time.Minute {
 				bouncer.Status = "connected"
 			} else {
 				bouncer.Status = "stale"
@@ -99,7 +112,8 @@ func checkBouncersHealth(dockerClient *docker.Client, containerName string) mode
 
 	activeBouncers := 0
 	for _, b := range bouncers {
-		if b.Valid && time.Since(b.LastPull) <= 60*time.Minute {
+		lastActivity := b.LastActivity()
+		if !lastActivity.IsZero() && time.Since(lastActivity) <= 60*time.Minute {
 			activeBouncers++
 		}
 	}

internal/models/models.go

@@ -151,11 +151,27 @@ type Bouncer struct {
 	IPAddress string    `json:"ip_address"`
 	Valid     bool      `json:"valid"`
 	LastPull  time.Time `json:"last_pull"`
+	CreatedAt time.Time `json:"created_at"`
+	UpdatedAt time.Time `json:"updated_at"`
 	Type      string    `json:"type"`
 	Version   string    `json:"version"`
 	Status    string    `json:"status"`
 }
 
+// LastActivity returns the best-known last activity time for this bouncer.
+// It prefers LastPull; falls back to UpdatedAt only when LastPull is zero
+// and UpdatedAt meaningfully exceeds CreatedAt (both must be non-zero).
+func (b Bouncer) LastActivity() time.Time {
+	if !b.LastPull.IsZero() {
+		return b.LastPull
+	}
+	if !b.CreatedAt.IsZero() && !b.UpdatedAt.IsZero() &&
+		b.UpdatedAt.After(b.CreatedAt.Add(5*time.Second)) {
+		return b.UpdatedAt
+	}
+	return time.Time{}
+}
+
 // IPInfo represents IP address information
 type IPInfo struct {
 	IP            string `json:"ip"`

web/src/components/health/BouncerStatusMonitor.tsx

@@ -51,8 +51,14 @@ function BouncerStatusMonitor({ bouncers, className }: BouncerStatusMonitorProps
               <TableCell>{bouncer.type || '-'}</TableCell>
               <TableCell>{bouncer.version || '-'}</TableCell>
               <TableCell>
-                <Badge variant={bouncer.valid ? 'success' : 'destructive'}>
-                  {bouncer.valid ? 'Valid' : 'Invalid'}
+                <Badge variant={
+                  bouncer.status === 'connected' ? 'success' :
+                  bouncer.status === 'stale' ? 'warning' :
+                  bouncer.status === 'registered' ? 'outline' :
+                  bouncer.status === 'disconnected' ? 'destructive' :
+                  bouncer.valid ? 'success' : 'destructive'
+                }>
+                  {bouncer.status || (bouncer.valid ? 'Valid' : 'Invalid')}
                 </Badge>
               </TableCell>
               <TableCell className="text-sm text-muted-foreground">

web/src/pages/Bouncers.tsx

@@ -124,6 +124,8 @@ export default function Bouncers() {
         return <Badge variant="warning">Stale</Badge>
       case 'pending':
         return <Badge variant="warning">Pending</Badge>
+      case 'registered':
+        return <Badge variant="outline">Registered</Badge>
       default:
         return <Badge variant="secondary">{status || 'Unknown'}</Badge>
     }