add dbip databases support (#4)

Author: IncSW

.gitignore

@@ -1,16 +1 @@
-testdata/GeoIP2-City.mmdb
-testdata/GeoIP2-Connection-Type.mmdb
-testdata/GeoIP2-Country.mmdb
-testdata/GeoIP2-ISP.mmdb
-testdata/GeoLite2-ASN.mmdb
-testdata/GeoLite2-City.mmdb
-testdata/GeoLite2-Country.mmdb
-
-testdata/GeoIP2-Anonymous-IP-Test.mmdb
-testdata/GeoIP2-City-Test.mmdb
-testdata/GeoIP2-Connection-Type-Test.mmdb
-testdata/GeoIP2-Country-Test.mmdb
-testdata/GeoIP2-Domain-Test.mmdb
-testdata/GeoIP2-Enterprise-Test.mmdb
-testdata/GeoIP2-ISP-Test.mmdb
-testdata/GeoLite2-ASN-Test.mmdb
+testdata

README.md

@@ -58,6 +58,37 @@ connection_type-24              3883234     305 ns/op     32 B/op     2 allocs/o
 connection_type_parallel-24    34284831    32.1 ns/op     32 B/op     2 allocs/op
 ```
 
+## Supported databases types
+
+### Country
+- GeoIP2-Country
+- GeoLite2-Country
+- DBIP-Country
+- DBIP-Country-Lite
+
+### City
+- GeoIP2-City
+- GeoLite2-City
+- GeoIP2-Enterprise
+- DBIP-City-Lite
+
+### ISP
+- GeoIP2-ISP
+
+### ASN
+- GeoLite2-ASN
+- DBIP-ASN-Lite
+- DBIP-ASN-Lite (compat=GeoLite2-ASN)
+
+### Connection Type
+- GeoIP2-Connection-Type
+
+### Anonymous IP
+- GeoIP2-Anonymous-IP
+
+### Domain
+- GeoIP2-Domain
+
 ## License
 
 [MIT License](LICENSE).

reader_asn.go

@@ -54,7 +54,9 @@ func NewASNReader(buffer []byte) (*ASNReader, error) {
 	if err != nil {
 		return nil, err
 	}
-	if reader.metadata.DatabaseType != "GeoLite2-ASN" {
+	if reader.metadata.DatabaseType != "GeoLite2-ASN" &&
+		reader.metadata.DatabaseType != "DBIP-ASN-Lite" &&
+		reader.metadata.DatabaseType != "DBIP-ASN-Lite (compat=GeoLite2-ASN)" {
 		return nil, errors.New("wrong MaxMind DB ASN type: " + reader.metadata.DatabaseType)
 	}
 	return &ASNReader{

reader_city.go

@@ -90,7 +90,8 @@ func NewCityReader(buffer []byte) (*CityReader, error) {
 	}
 	if reader.metadata.DatabaseType != "GeoIP2-City" &&
 		reader.metadata.DatabaseType != "GeoLite2-City" &&
-		reader.metadata.DatabaseType != "GeoIP2-Enterprise" {
+		reader.metadata.DatabaseType != "GeoIP2-Enterprise" &&
+		reader.metadata.DatabaseType != "DBIP-City-Lite" {
 		return nil, errors.New("wrong MaxMind DB City type: " + reader.metadata.DatabaseType)
 	}
 	return &CityReader{

reader_country.go

@@ -69,7 +69,9 @@ func NewCountryReader(buffer []byte) (*CountryReader, error) {
 		return nil, err
 	}
 	if reader.metadata.DatabaseType != "GeoIP2-Country" &&
-		reader.metadata.DatabaseType != "GeoLite2-Country" {
+		reader.metadata.DatabaseType != "GeoLite2-Country" &&
+		reader.metadata.DatabaseType != "DBIP-Country" &&
+		reader.metadata.DatabaseType != "DBIP-Country-Lite" {
 		return nil, errors.New("wrong MaxMind DB Country type: " + reader.metadata.DatabaseType)
 	}
 	return &CountryReader{

reader_test.go

@@ -1,4 +1,6 @@
-// Test DB https://github.com/maxmind/MaxMind-DB
+// Test DB
+// https://github.com/maxmind/MaxMind-DB
+// https://db-ip.com/db/lite.php
 package geoip2
 
 import (
@@ -406,3 +408,83 @@ func TestASN(t *testing.T) {
 		t.Fatal()
 	}
 }
+
+func TestDBIPCity(t *testing.T) {
+	reader, err := NewCityReaderFromFile("testdata/dbip-city-lite.mmdb")
+	if err != nil {
+		t.Fatal(err)
+	}
+	record, err := reader.Lookup(net.ParseIP("66.30.184.198"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if record.City.GeoNameID != 0 {
+		t.Fatal()
+	}
+	if record.City.Names["en"] != "Boston" {
+		t.Fatal()
+	}
+	if record.Location.Latitude != 42.3601 {
+		t.Fatal()
+	}
+	if record.Location.Longitude != -71.0589 {
+		t.Fatal()
+	}
+	if len(record.Subdivisions) != 1 {
+		t.Fatal()
+	}
+	if record.Subdivisions[0].Names["en"] != "Massachusetts" {
+		t.Fatal()
+	}
+}
+
+func TestDBIPCountry(t *testing.T) {
+	reader, err := NewCountryReaderFromFile("testdata/dbip-country-lite.mmdb")
+	if err != nil {
+		t.Fatal(err)
+	}
+	record, err := reader.Lookup(net.ParseIP("66.30.184.198"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if record.Continent.GeoNameID != 6255149 {
+		t.Fatal()
+	}
+	if record.Continent.Code != "NA" {
+		t.Fatal()
+	}
+	if record.Continent.Names["en"] != "North America" ||
+		record.Continent.Names["ru"] != "Северная Америка" {
+		t.Fatal()
+	}
+	if record.Country.GeoNameID != 6252001 {
+		t.Fatal()
+	}
+	if record.Country.ISOCode != "US" {
+		t.Fatal()
+	}
+	if record.Country.Names["fr"] != "États-Unis" ||
+		record.Country.Names["pt-BR"] != "Estados Unidos" {
+		t.Fatal()
+	}
+	if record.Country.IsInEuropeanUnion {
+		t.Fatal()
+	}
+}
+
+func TestDBIPASN(t *testing.T) {
+	reader, err := NewASNReaderFromFile("testdata/dbip-asn-lite.mmdb")
+	if err != nil {
+		t.Fatal(err)
+	}
+	record, err := reader.Lookup(net.ParseIP("66.30.184.198"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if record.AutonomousSystemNumber != 7922 {
+		t.Fatal()
+	}
+	if record.AutonomousSystemOrganization != "Comcast Cable Communications, LLC" {
+		t.Fatal()
+	}
+}