feat(waf): return ip in string literal

nezhahq · Jan 4, 2025 · d29fb79 · d29fb79
1 parent 3999d1f
commit d29fb79
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/cmd/dashboard/controller/waf.go b/cmd/dashboard/controller/waf.go
@@ -1,6 +1,8 @@
 package controller
 
 import (
+	"net"
+	"slices"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
@@ -21,7 +23,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 +44,16 @@ 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,
+			}
+		})),
 		Pagination: model.Pagination{
 			Offset: offset,
 			Limit:  limit,

diff --git a/pkg/geoip/geoip.db b/pkg/geoip/geoip.db
diff --git a/pkg/utils/utils.go b/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
+			}
+		}
+	}
+}