shuguang/nezha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

💩 优化 CountryCode 获取

Browse Source
This commit is contained in:
naiba 2022-03-31 22:59:07 +08:00
parent 1f051459bb
commit 888f2efa60
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -30,4 +30,4 @@ jobs:
- name: Run Gosec Security Scanner - name: Run Gosec Security Scanner
run: | run: |
go install github.com/securego/gosec/v2/cmd/gosec@latest go install github.com/securego/gosec/v2/cmd/gosec@latest
gosec -exclude=G104 ./... gosec -exclude=G104,G404 ./...

28
cmd/agent/monitor/myip.go
View File

@ -12,9 +12,23 @@ import (
) )
type geoIP struct { type geoIP struct {
CountryCode string `json:"country_code,omitempty"` CountryCode string `json:"country_code,omitempty"`
IP string `json:"ip,omitempty"` CountryCode2 string `json:"countryCode,omitempty"`
Query string `json:"query,omitempty"` IP string `json:"ip,omitempty"`
Query string `json:"query,omitempty"`
}
func (ip *geoIP) Unmarshal(body []byte) error {
if err := utils.Json.Unmarshal(body, ip); err != nil {
return err
}
if ip.IP == "" && ip.Query != "" {
ip.IP = ip.Query
}
if ip.CountryCode == "" && ip.CountryCode2 != "" {
ip.CountryCode = ip.CountryCode2
}
return nil
} }
var ( var (
@ -23,7 +37,7 @@ var (
"https://ipapi.co/json", "https://ipapi.co/json",
"https://freegeoip.app/json/", "https://freegeoip.app/json/",
"http://ip-api.com/json/", "http://ip-api.com/json/",
"https://extreme-ip-lookup.com/json/", // "https://extreme-ip-lookup.com/json/",
// "https://ip.seeip.org/geoip", // "https://ip.seeip.org/geoip",
} }
cachedIP, cachedCountry string cachedIP, cachedCountry string
@ -70,13 +84,9 @@ func fetchGeoIP(servers []string, isV6 bool) geoIP {
return ip return ip
} }
resp.Body.Close() resp.Body.Close()
err = utils.Json.Unmarshal(body, &ip) if err := ip.Unmarshal(body); err != nil {
if err != nil {
return ip return ip
} }
if ip.IP == "" && ip.Query != "" {
ip.IP = ip.Query
}
// 没取到 v6 IP // 没取到 v6 IP
if isV6 && !strings.Contains(ip.IP, ":") { if isV6 && !strings.Contains(ip.IP, ":") {
return ip return ip

8
cmd/agent/monitor/myip_test.go
View File

@ -17,14 +17,16 @@ func TestGeoIPApi(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
resp.Body.Close() resp.Body.Close()
var ip geoIP var ip geoIP
err = utils.Json.Unmarshal(body, &ip) err = ip.Unmarshal(body)
assert.Nil(t, err) assert.Nil(t, err)
t.Logf("%s %s %s %s", geoIPApiList[i], ip.CountryCode, utils.IPDesensitize(ip.IP), utils.IPDesensitize(ip.Query)) t.Logf("%s %s %s", geoIPApiList[i], ip.CountryCode, utils.IPDesensitize(ip.IP))
assert.True(t, ip.IP != "" || ip.Query != "") assert.True(t, ip.IP != "")
assert.True(t, ip.CountryCode != "")
} }
} }
func TestFetchGeoIP(t *testing.T) { func TestFetchGeoIP(t *testing.T) {
ip := fetchGeoIP(geoIPApiList, false) ip := fetchGeoIP(geoIPApiList, false)
assert.NotEmpty(t, ip.IP) assert.NotEmpty(t, ip.IP)
assert.NotEmpty(t, ip.CountryCode)
} }