commit

api/router.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.com/security-rd/go-pkg/logging"
+	"github.com/rs/zerolog/log"
 	"gitlab.com/tensorsecurity-rd/waf-console/internal/config"
 	"gitlab.com/tensorsecurity-rd/waf-console/internal/utils"
 	"gorm.io/gorm"
@@ -16,7 +16,7 @@ func SetRouters(db *gorm.DB, clusterClientManager *utils.ClusterClientManager) *
 
 	if !config.Conf.Debug {
 		// 生产模式
-		logging.Get().Info().Msg("release mode")
+		log.Info().Msg("release mode")
 		engine = ReleaseRouter()
 		engine.Use(
 		// middleware.RequestCostHandler(),
@@ -26,7 +26,7 @@ func SetRouters(db *gorm.DB, clusterClientManager *utils.ClusterClientManager) *
 		)
 	} else {
 		// 开发调试模式
-		logging.Get().Info().Msg("debug mode")
+		log.Info().Msg("debug mode")
 		engine = gin.New()
 		engine.Use(
 			// middleware.RequestCostHandler(),

cmd/app/cmd.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
-	"gitlab.com/security-rd/go-pkg/logging"
 	"gitlab.com/tensorsecurity-rd/waf-console/api"
 	"gitlab.com/tensorsecurity-rd/waf-console/internal/utils"
 	"gitlab.com/tensorsecurity-rd/waf-console/pkg/generated/clientset/versioned"
@@ -23,7 +23,7 @@ func NewRootCommand() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			config := LoadConfig()
 			debugMode := os.Getenv("DEBUG_MODE")
-			logging.Get().Info().Msgf("DEBUG_MODE: %s", debugMode)
+			log.Info().Msgf("DEBUG_MODE: %s", debugMode)
 			if debugMode == "true" {
 				config.Debug = true
 				// config.Conf.Debug = true

cmd/app/config.go

@@ -3,7 +3,7 @@ package app
 import (
 	"os"
 
-	"gitlab.com/security-rd/go-pkg/logging"
+	"github.com/rs/zerolog/log"
 	"gopkg.in/yaml.v2"
 )
 
@@ -47,13 +47,13 @@ func LoadConfig() *Config {
 
 	data, err := os.ReadFile(configFile)
 	if err != nil {
-		logging.Get().Error().Err(err).Msgf("Failed to read config file: %s", configFile)
+		log.Err(err).Msgf("Failed to read config file: %s", configFile)
 		return nil
 	}
 
 	var config Config
 	if err := yaml.Unmarshal(data, &config); err != nil {
-		logging.Get().Error().Err(err).Msg("Failed to parse config file")
+		log.Err(err).Msg("Failed to parse config file")
 		return nil
 	}
 	// 如果config.DBConfig为nil，则使用默认值

cmd/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/rs/zerolog"
-	"gitlab.com/security-rd/go-pkg/logging"
+	"github.com/rs/zerolog/log"
 	"gitlab.com/tensorsecurity-rd/waf-console/cmd/app"
 )
 
@@ -14,14 +14,13 @@ const (
 )
 
 func main() {
-	logLevel := zerolog.InfoLevel
 
-	logging.Get().SetLevel(logLevel)
-	logging.Get().Info().Msg("starting gateway")
+	zerolog.SetGlobalLevel(zerolog.InfoLevel)
+	log.Info().Msg("starting gateway")
 
 	rootCmd := app.NewRootCommand()
 	if err := rootCmd.Execute(); err != nil {
-		logging.Get().Err(err)
+		log.Err(err)
 		os.Exit(-1)
 	}
 }

go.mod

@@ -4,7 +4,6 @@ go 1.20
 
 require (
 	github.com/gin-gonic/gin v1.10.0
-	gitlab.com/security-rd/go-pkg v0.2.5
 	gorm.io/driver/mysql v1.5.0
 	gorm.io/gorm v1.25.12
 	k8s.io/apimachinery v0.27.2
@@ -53,10 +52,7 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-require (
-	github.com/hashicorp/golang-lru/v2 v2.0.7
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-)
+require github.com/inconshreveable/mousetrap v1.1.0 // indirect
 
 require (
 	github.com/bytedance/sonic v1.12.1 // indirect
@@ -89,5 +85,3 @@ require (
 	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 )
-
-replace gitlab.com/security-rd/go-pkg => scm.tensorsecurity.cn/tensorsecurity-rd/go-pkg v0.2.101

go.sum

@@ -108,8 +108,6 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -354,8 +352,6 @@ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3
 k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
 k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-scm.tensorsecurity.cn/tensorsecurity-rd/go-pkg v0.2.101 h1:fmZdjUOeCwXnGRsq4cmaIbJCT+FIfjZkUJR6My2sJ3A=
-scm.tensorsecurity.cn/tensorsecurity-rd/go-pkg v0.2.101/go.mod h1:7iA3d/FiV1buGqWtcrcSH1/wlT7DNQpMmxzBtq3/zbY=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=

internal/service/ipinfo_private.go

-package service
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-
-	"gitlab.com/tensorsecurity-rd/waf-console/internal/model"
-)
-
-var fakePrivateData = `{
-    "data": [
-        {
-            "ioc": "159.203.93.255",
-            "host": "10.65.135.204",
-            "intelligence": [
-                {
-                    "judgments": [
-                        "Exploit"
-                    ],
-                    "severity": "low",
-                    "ban": {
-                        "banned": 1,
-                        "reason": "The IP address belongs to DigitalOcean, LLC, it is recommended to assess and handle it accordingly."
-                    },
-                    "basic": {
-                        "carrier": "DigitalOcean, LLC",
-                        "location": {
-                            "country": "美国",
-                            "country_code": "US",
-                            "province": "新泽西州",
-                            "city": "克利夫顿",
-                            "lng": -74.16366,
-                            "lat": 40.858402
-                        }
-                    },
-                    "asn": {
-                        "number": "14061",
-                        "info": "DIGITALOCEAN-ASN - DigitalOcean, LLC, US"
-                    },
-                    "ioc_type": "ipv4",
-                    "confidence_level": "low",
-                    "is_malicious": true,
-                    "source_name": "微步在线-IP信誉",
-                    "update_time": 1719268503000
-                }
-            ]
-        }
-    ],
-    "response_code": 0,
-    "verbose_msg": "success"
-}`
-
-type ipServicePrivate struct {
-	URL    string
-	ApiKey string
-	// ipQueryUrl      string
-	ipReputationUrl string
-	// ipInfoMap       map[string]IpInfo
-	// useCachedIPInfo bool
-	// ipInfoCache     *expirable.LRU[string, IPInfoPrivate]
-}
-
-// func NewIpServicePrivate(url, apiKey string, useCachedIPInfo bool) Service {
-// 	var ipReputationUrl string
-// 	reputationUrl := os.Getenv("IP_REPUTATION_URL")
-// 	logging.Get().Info().Msgf("reputationUrl: %s", reputationUrl)
-// 	if reputationUrl != "" {
-// 		ipReputationUrl = reputationUrl
-// 	} else {
-// 		ipReputationUrl = fmt.Sprintf("%s?apikey=%s&resource=", ipReputation, apiKey)
-// 	}
-// 	logging.Get().Info().Msgf("ipReputationUrl: %s", ipReputationUrl)
-// 	return &ipServicePrivate{
-// 		URL:             url,
-// 		ApiKey:          apiKey,
-// 		ipReputationUrl: ipReputationUrl,
-// 	}
-// }
-
-func (s *ipServicePrivate) QueryIP(ip string) (*model.IPInfo, error) {
-	url := s.ipReputationUrl + ip
-	respData, err := http.DefaultClient.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	defer respData.Body.Close()
-
-	body, err := io.ReadAll(respData.Body)
-	if err != nil {
-		return nil, fmt.Errorf("query ip info failed: %w", err)
-	}
-
-	var resp IPInfoPrivateResp
-	if err := json.Unmarshal(body, &resp); err != nil {
-		return nil, fmt.Errorf("unmarshal response failed: %w", err)
-	}
-
-	if len(resp.Data) == 0 || len(resp.Data[0].Intelligence) == 0 {
-		return nil, fmt.Errorf("no data found for ip %s", ip)
-	}
-
-	info := resp.Data[0].Intelligence[0]
-	tagsClasses := make([]model.TagsClass, 0, 5)
-	for k, v := range info.TagsClasses {
-		for _, tag := range v {
-			tagsClasses = append(tagsClasses, model.TagsClass{
-				TagsType: k,
-				Tags:     tag,
-			})
-		}
-	}
-	return &model.IPInfo{
-		Carrier: info.Basic.Carrier,
-		Location: model.Location{
-			Country:     info.Basic.Location.Country,
-			CountryCode: info.Basic.Location.CountryCode,
-			Province:    info.Basic.Location.Province,
-			City:        info.Basic.Location.City,
-			Longitude:   info.Basic.Location.Longitude,
-			Latitude:    info.Basic.Location.Latitude,
-		},
-		Asn: model.ASN{
-			Number: func() int { n, _ := strconv.Atoi(info.ASN.Number); return n }(),
-			Info:   info.ASN.Info,
-		},
-		Scene:       info.Scene,
-		IsMalicious: info.IsMalicious,
-		Judgments:   info.Judgments,
-		TagsClasses: tagsClasses,
-	}, nil
-}

internal/service/ipinfo_test.go

-package service
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"gitlab.com/tensorsecurity-rd/waf-console/internal/model"
-)
-
-func TestIPService_QueryIP(t *testing.T) {
-	type fields struct {
-		URL    string
-		ApiKey string
-	}
-	type args struct {
-		ip string
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		want    *model.IPInfo
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &ipService{
-				URL:    tt.fields.URL,
-				ApiKey: tt.fields.ApiKey,
-			}
-			got, err := s.QueryIP(tt.args.ip)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("IPService.QueryIP() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("IPService.QueryIP() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestParseIPInfo(t *testing.T) {
-	t.Run("test 1", func(t *testing.T) {
-		var respData RespData
-		err := json.Unmarshal([]byte(fakeData), &respData)
-		if err != nil {
-			t.Errorf("Unmarshal err %v", err)
-		}
-		if info, ok := respData.Data["87.236.176.199"]; ok {
-			var ipInfo IpInfo
-			d, err := info.MarshalJSON()
-			if err != nil {
-				t.Error(err)
-			}
-			err = json.Unmarshal(d, &ipInfo)
-			if err != nil {
-				t.Error(err)
-			}
-			fmt.Println(ipInfo.Judgments)
-		}
-		fmt.Println("ddddd")
-
-	})
-}
-
-func TestParseIPInfoPrivate(t *testing.T) {
-	t.Run("test 1", func(t *testing.T) {
-		var respData IPInfoPrivateResp
-		err := json.Unmarshal([]byte(fakePrivateData), &respData)
-		if err != nil {
-			t.Errorf("Unmarshal err %v", err)
-		}
-		if len(respData.Data) > 0 {
-			for _, v := range respData.Data {
-				fmt.Println(v)
-			}
-		}
-		fmt.Println("ddddd")
-	})
-}

internal/utils/util.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.com/security-rd/go-pkg/logging"
+	"github.com/rs/zerolog/log"
 )
 
 const APIVersion = "v1"
@@ -12,7 +12,7 @@ const APIVersion = "v1"
 func AssembleResponse(c *gin.Context, data interface{}, err error, opts ...ResponseDataOptionFunc) {
 	code := http.StatusOK
 	if err != nil {
-		logging.Get().Err(err)
+		log.Error().Err(err)
 		code = http.StatusInternalServerError
 		c.JSON(code, FailResponse{
 			APIVersion: APIVersion,