feat(waf): show country code

cmd/dashboard/controller/waf.go

@@ -1,11 +1,14 @@
 package controller
 
 import (
+	"net"
+	"slices"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
 
 	"github.com/nezhahq/nezha/model"
+	"github.com/nezhahq/nezha/pkg/geoip"
 	"github.com/nezhahq/nezha/pkg/utils"
 	"github.com/nezhahq/nezha/service/singleton"
 )
@@ -21,7 +24,7 @@ import (
 // @Produce json
 // @Success 200 {object} model.PaginatedResponse[[]model.WAFApiMock, model.WAFApiMock]
 // @Router /waf [get]
-func listBlockedAddress(c *gin.Context) (*model.Value[[]*model.WAF], error) {
+func listBlockedAddress(c *gin.Context) (*model.Value[[]*model.WAFApiMock], error) {
 	limit, err := strconv.Atoi(c.Query("limit"))
 	if err != nil || limit < 1 {
 		limit = 25
@@ -42,8 +45,17 @@ func listBlockedAddress(c *gin.Context) (*model.Value[[]*model.WAF], error) {
 		return nil, err
 	}
 
-	return &model.Value[[]*model.WAF]{
-		Value: waf,
+	return &model.Value[[]*model.WAFApiMock]{
+		Value: slices.Collect(utils.Map(slices.Values(waf), func(e *model.WAF) *model.WAFApiMock {
+			return &model.WAFApiMock{
+				IP:              net.IP(e.IP).String(),
+				BlockIdentifier: e.BlockIdentifier,
+				BlockReason:     e.BlockReason,
+				BlockTimestamp:  e.BlockTimestamp,
+				Count:           e.Count,
+				Country:         geoip.Lookup1(e.IP),
+			}
+		})),
 		Pagination: model.Pagination{
 			Offset: offset,
 			Limit:  limit,

model/waf.go

@@ -31,6 +31,7 @@ type WAFApiMock struct {
 	BlockReason     uint8  `json:"block_reason,omitempty"`
 	BlockTimestamp  uint64 `json:"block_timestamp,omitempty"`
 	Count           uint64 `json:"count,omitempty"`
+	Country         string `json:"country,omitempty"`
 }
 
 type WAF struct {

pkg/geoip/geoip.go

@@ -50,3 +50,11 @@ func Lookup(ip net.IP) (string, error) {
 
 	return "", fmt.Errorf("IP not found")
 }
+
+func Lookup1(ip net.IP) string {
+	c, err := Lookup(ip)
+	if err != nil {
+		return ""
+	}
+	return c
+}

pkg/utils/utils.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"crypto/rand"
 	"errors"
+	"iter"
 	"maps"
 	"math/big"
 	"net/netip"
@@ -164,3 +165,13 @@ func Unique[T comparable](s []T) []T {
 	}
 	return ret
 }
+
+func Map[T, U any](seq iter.Seq[T], f func(e T) U) iter.Seq[U] {
+	return func(yield func(U) bool) {
+		for e := range seq {
+			if !yield(f(e)) {
+				return
+			}
+		}
+	}
+}