Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-12-03 17:14:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

plugin/geoip - Support for ISO 3166-2 subdivisions. (#7728)

Browse Source 
Metadata `geoip/subdivisions/code` now available if geoip plugin is used.

Signed-off-by: Tomas Boros <tomas.boros92@gmail.com>
This commit is contained in:
Tomas Boros
2025-12-02 13:39:13 +01:00
committed by GitHub
parent c2894d47d6
commit b472d3dbdb
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/geoip/README.md
View File

@@ -141,6 +141,7 @@ A limited set of fields will be exported as labels, all values are stored using
| `geoip/longitude` | `float64` | `0.1315` | Base 10, max available precision. | `geoip/longitude` | `float64` | `0.1315` | Base 10, max available precision.
| `geoip/timezone` | `string` | `Europe/London` | The timezone. | `geoip/timezone` | `string` | `Europe/London` | The timezone.
| `geoip/postalcode` | `string` | `CB4` | The postal code. | `geoip/postalcode` | `string` | `CB4` | The postal code.
| `geoip/subdivisions/code` | `string` | `ENG,TWH` | Comma separated [ISO 3166-2](https://en.wikipedia.org/wiki/ISO_3166-2) subdivision(region) codes, e.g. first level (province), second level (state).
| `geoip/asn/number` | `uint` | `396982` | The autonomous system number. | `geoip/asn/number` | `uint` | `396982` | The autonomous system number.
| `geoip/asn/org` | `string` | `GOOGLE-CLOUD-PLATFORM` | The autonomous system organization. | `geoip/asn/org` | `string` | `GOOGLE-CLOUD-PLATFORM` | The autonomous system organization.

13
plugin/geoip/city.go
View File

@@ -3,6 +3,7 @@ package geoip
import ( import (
"context" "context"
"strconv" "strconv"
"strings"
"github.com/coredns/coredns/plugin/metadata" "github.com/coredns/coredns/plugin/metadata"
@@ -30,6 +31,18 @@ func (g GeoIP) setCityMetadata(ctx context.Context, data *geoip2.City) {
metadata.SetValueFunc(ctx, pluginName+"/country/code", func() string { metadata.SetValueFunc(ctx, pluginName+"/country/code", func() string {
return countryCode return countryCode
}) })
// Subdivisions represent administrative divisions (e.g., provinces, states) and are provided
// by the MaxMind database as a hierarchical list of up to 2 levels, ISO codes are set in metadata as
// a comma separated string, with the exact values provided by the database, even if those were empty strings.
subdivisionCodes := make([]string, 0, len(data.Subdivisions))
for _, sub := range data.Subdivisions {
subdivisionCodes = append(subdivisionCodes, sub.IsoCode)
}
metadata.SetValueFunc(ctx, pluginName+"/subdivisions/code", func() string {
return strings.Join(subdivisionCodes, ",")
})
isInEurope := strconv.FormatBool(data.Country.IsInEuropeanUnion) isInEurope := strconv.FormatBool(data.Country.IsInEuropeanUnion)
metadata.SetValueFunc(ctx, pluginName+"/country/is_in_european_union", func() string { metadata.SetValueFunc(ctx, pluginName+"/country/is_in_european_union", func() string {
return isInEurope return isInEurope

1
plugin/geoip/geoip_test.go
View File

@@ -32,6 +32,7 @@ func TestMetadata(t *testing.T) {
{"geoip/longitude", "0.1315", cityDBPath, "81.2.69.142"}, {"geoip/longitude", "0.1315", cityDBPath, "81.2.69.142"},
{"geoip/timezone", "Europe/London", cityDBPath, "81.2.69.142"}, {"geoip/timezone", "Europe/London", cityDBPath, "81.2.69.142"},
{"geoip/postalcode", "CB4", cityDBPath, "81.2.69.142"}, {"geoip/postalcode", "CB4", cityDBPath, "81.2.69.142"},
{"geoip/subdivisions/code", "ENG,CAM", cityDBPath, "81.2.69.142"},
// ASN database tests // ASN database tests
{"geoip/asn/number", "12345", asnDBPath, "81.2.69.142"}, {"geoip/asn/number", "12345", asnDBPath, "81.2.69.142"},