Merge pull request #3 from tkhq/sean/allow-unknown-country-processing

allow unknown country IPs to continue being processed
tkhq · Nov 1, 2023 · 8b8a24c · 8b8a24c
2 parents a9129b9 + ce7b0b5
commit 8b8a24c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/plugin.go b/plugin.go
@@ -170,10 +170,6 @@ func (p Plugin) CheckAllowed(ip string) (allow bool, country string, err error)
 		return false, ip, fmt.Errorf("lookup of %s failed: %w", ip, err)
 	}
 
-	if country == "-" {
-		return p.allowPrivate, country, nil
-	}
-
 	if country != "-" {
 		for _, item := range p.blockedCountries {
 			if item == country {

diff --git a/plugin_test.go b/plugin_test.go
@@ -106,8 +106,8 @@ func TestPlugin_ServeHTTP(t *testing.T) {
 			Enabled:              true,
 			DatabaseFilePath:     dbFilePath,
 			AllowedCountries:     []string{},
-			AllowPrivate:         true,
 			DisallowedStatusCode: http.StatusOK,
+			DefaultAllow:         true,
 		}
 
 		plugin, err := New(context.TODO(), &noopHandler{}, cfg, pluginName)
@@ -157,6 +157,7 @@ func TestPlugin_ServeHTTP(t *testing.T) {
 			AllowedCountries:     []string{},
 			AllowPrivate:         false,
 			DisallowedStatusCode: http.StatusForbidden,
+			DefaultAllow:         false,
 		}
 
 		plugin, err := New(context.TODO(), &noopHandler{}, cfg, pluginName)