update tests & fix bool reader

Author: IncSW

.gitignore

@@ -5,3 +5,7 @@ testdata/GeoIP2-ISP.mmdb
 testdata/GeoLite2-ASN.mmdb
 testdata/GeoLite2-City.mmdb
 testdata/GeoLite2-Country.mmdb
+
+testdata/GeoIP2-Anonymous-IP-Test.mmdb
+testdata/GeoIP2-Domain-Test.mmdb
+testdata/GeoIP2-Enterprise-Test.mmdb

common.go

@@ -173,10 +173,25 @@ func readBool(buffer []byte, offset uint) (bool, uint, error) {
 	if err != nil {
 		return false, 0, err
 	}
-	if dataType != dataTypeBool {
+	switch dataType {
+	case dataTypeBool:
+		return size != 0, offset, nil
+	case dataTypePointer:
+		pointer, newOffset, err := readPointer(buffer, size, offset)
+		if err != nil {
+			return false, 0, err
+		}
+		dataType, size, _, err := readControl(buffer, pointer)
+		if err != nil {
+			return false, 0, err
+		}
+		if dataType != dataTypeBool {
+			return false, 0, errors.New("invalid bool pointer type: " + strconv.Itoa(int(dataType)))
+		}
+		return size != 0, newOffset, nil
+	default:
 		return false, 0, errors.New("invalid bool type: " + strconv.Itoa(int(dataType)))
 	}
-	return size != 0, offset, nil
 }
 
 func readString(buffer []byte, offset uint) (string, uint, error) {

geoip2_test.go

@@ -69,9 +69,75 @@ func TestReader(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+}
+
+func TestDomain(t *testing.T) {
+	reader, err := NewDomainReaderFromFile("testdata/GeoIP2-Domain-Test.mmdb")
+	if err != nil {
+		t.Fatal(err)
+	}
+	record, err := reader.Lookup(net.ParseIP("1.2.0.0"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if record != "maxmind.com" {
+		t.Fatal()
+	}
+}
 
-	// TODO: GeoIP2-Anonymous-IP
-	// TODO: GeoIP2-Domain
+func TestAnonymousIP(t *testing.T) {
+	reader, err := NewAnonymousIPReaderFromFile("testdata/GeoIP2-Anonymous-IP-Test.mmdb")
+	if err != nil {
+		t.Fatal(err)
+	}
+	record, err := reader.Lookup(net.ParseIP("1.2.0.0"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if record.IsAnonymous != true {
+		t.Fatal()
+	}
+	if record.IsAnonymousVPN != true {
+		t.Fatal()
+	}
+	if record.IsHostingProvider != false {
+		t.Fatal()
+	}
+	if record.IsPublicProxy != false {
+		t.Fatal()
+	}
+	if record.IsTorExitNode != false {
+		t.Fatal()
+	}
+}
+
+func TestEnterprise(t *testing.T) {
+	reader, err := NewEnterpriseReaderFromFile("testdata/GeoIP2-Enterprise-Test.mmdb")
+	if err != nil {
+		t.Fatal(err)
+	}
+	record, err := reader.Lookup(net.ParseIP("74.209.24.0"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if record.City.Confidence != 11 {
+		t.Fatal()
+	}
+	if record.Traits.AutonomousSystemNumber != 14671 {
+		t.Fatal()
+	}
+	if record.Traits.AutonomousSystemOrganization != "FairPoint Communications" {
+		t.Fatal()
+	}
+	if record.Traits.ConnectionType != "Cable/DSL" {
+		t.Fatal()
+	}
+	if record.Traits.Domain != "frpt.net" {
+		t.Fatal()
+	}
+	if record.Traits.StaticIPScore != 0.34 {
+		t.Fatal()
+	}
 }
 
 func TestBench(t *testing.T) {

reader_city.go

@@ -105,3 +105,11 @@ func NewCityReaderFromFile(filename string) (*CityReader, error) {
 	}
 	return NewCityReader(buffer)
 }
+
+func NewEnterpriseReader(buffer []byte) (*CityReader, error) {
+	return NewCityReader(buffer)
+}
+
+func NewEnterpriseReaderFromFile(filename string) (*CityReader, error) {
+	return NewCityReaderFromFile(filename)
+}