Fix style and add unit tests

setup.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/mholt/caddy"
 	"github.com/mholt/caddy/caddyhttp/httpserver"
-	"github.com/oschwald/maxminddb-golang"
 	"github.com/mmcloughlin/geohash"
-	)
+	"github.com/oschwald/maxminddb-golang"
+)
 
 // GeoIP represents a middleware instance
 type GeoIP struct {
@@ -80,7 +80,7 @@ func (gip GeoIP) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error)
 }
 
 func (gip GeoIP) lookupLocation(w http.ResponseWriter, r *http.Request) {
-	record := gip.fetch_geoip_data(r)
+	record := gip.fetchGeoipData(r)
 
 	replacer := newReplacer(r)
 	replacer.Set("geoip_country_code", record.Country.ISOCode)
@@ -99,7 +99,7 @@ func (gip GeoIP) lookupLocation(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (gip GeoIP) fetch_geoip_data(r *http.Request) GeoIPRecord {
+func (gip GeoIP) fetchGeoipData(r *http.Request) GeoIPRecord {
 	clientIP, _ := getClientIP(r, true)
 
 	var record = GeoIPRecord{}

setup_test.go

@@ -81,4 +81,73 @@ func TestReplacers(t *testing.T) {
 	if got, want := rr.Replacer.Replace("{geoip_country_geoname_id}"), "146669"; got != want {
 		t.Errorf("Expected custom placeholder {geoip_country_geoname_id} to be set (%s), but it wasn't; got: %s", want, got)
 	}
+
+	//
+	// Verify that a request via the loopback interface address results in
+	// the expected placeholder values.
+	//
+	var loopback_placeholders = [][2]string{
+		{"{geoip_country_code}", "**"},
+		{"{geoip_country_name}", "Loopback"},
+		{"{geoip_city_name}", "Loopback"},
+		{"{geoip_country_geoname_id}", "0"},
+		{"{geoip_city_geoname_id}", "0"},
+		{"{geoip_latitude}", "0.000000"},
+		{"{geoip_longitude}", "0.000000"},
+		{"{geoip_geohash}", "s00000000000"},
+		{"{geoip_time_zone}", ""},
+	}
+
+	r = httptest.NewRequest("GET", "/", strings.NewReader(""))
+	r.RemoteAddr = "127.0.0.1"
+	rr = httpserver.NewResponseRecorder(testResponseRecorder{
+		ResponseWriterWrapper: &httpserver.ResponseWriterWrapper{ResponseWriter: httptest.NewRecorder()},
+	})
+
+	rr.Replacer = httpserver.NewReplacer(r, rr, "-")
+
+	l.ServeHTTP(rr, r)
+
+	for _, v := range loopback_placeholders {
+		if got, want := rr.Replacer.Replace(v[0]), v[1]; got != want {
+			t.Errorf("Expected custom placeholder %s to be set (%s), but it wasn't; got: %s", v[0], want, got)
+		}
+	}
+
+	//
+	// Verify that a request via a private address results in the expected
+	// placeholder values. Note that the MaxMind DB doesn't include
+	// location data for private addresses.
+	//
+	var private_addr_placeholders = [][2]string{
+		{"{geoip_country_code}", "!!"},
+		{"{geoip_country_name}", "No Country"},
+		{"{geoip_city_name}", "No City"},
+		{"{geoip_country_geoname_id}", "0"},
+		{"{geoip_city_geoname_id}", "0"},
+		{"{geoip_latitude}", "0.000000"},
+		{"{geoip_longitude}", "0.000000"},
+		{"{geoip_geohash}", "s00000000000"},
+		{"{geoip_time_zone}", ""},
+	}
+
+	r = httptest.NewRequest("GET", "/", strings.NewReader(""))
+	r.RemoteAddr = "192.168.0.1"
+	rr = httpserver.NewResponseRecorder(testResponseRecorder{
+		ResponseWriterWrapper: &httpserver.ResponseWriterWrapper{ResponseWriter: httptest.NewRecorder()},
+	})
+
+	rr.Replacer = httpserver.NewReplacer(r, rr, "-")
+
+	l.ServeHTTP(rr, r)
+
+	if got, want := rr.Replacer.Replace("{geoip_country_code}"), "!!"; got != want {
+		t.Errorf("Expected custom placeholder {geoip_country_code} to be set (%s), but it wasn't; got: %s", want, got)
+	}
+
+	for _, v := range private_addr_placeholders {
+		if got, want := rr.Replacer.Replace(v[0]), v[1]; got != want {
+			t.Errorf("Expected custom placeholder %s to be set (%s), but it wasn't; got: %s", v[0], want, got)
+		}
+	}
 }