fix

2manymws · Dec 20, 2023 · 4f7493a · 4f7493a
1 parent 7a960db
commit 4f7493a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 31 deletions.
diff --git a/country_limiter.go b/country_limiter.go
@@ -91,7 +91,7 @@ func (l *CountryLimiter) Rule(r *http.Request) (*rl.Rule, error) {
 		return noLimit, nil
 	}
 
-	if _, ok := l.countries["*"]; !ok {
+	if _, ok := l.countries["*"]; ok {
 		return limit, nil
 
 	}

diff --git a/country_limiter_test.go b/country_limiter_test.go
@@ -52,21 +52,12 @@ func TestCountryLimiter(t *testing.T) {
 			expectedError:   true,
 		},
 		{
-			name:            "Valid IP from United States With Port and limitRateForOtherCountries,empty country",
+			name:            "Valid IP from United States With Skip country",
 			request:         testHTTPRequest("1.1.1.1"),
 			expectedCountry: "",
-			countries:       []string{"US"},
-			allowed:         false,
-			expectedError:   false,
-		},
-
-		{
-			name:            "Valid IP from United States With Port and limitRateForOtherCountries,Franch",
-			request:         testHTTPRequest("67.43.156.0"),
-			expectedCountry: "BT",
 			countries:       []string{"*"},
 			skipCountries:   []string{"US"},
-			allowed:         true,
+			allowed:         false,
 			expectedError:   false,
 		},
 	}

diff --git a/coverage.out b/coverage.out
@@ -1,40 +1,40 @@
 mode: count
-github.com/2manymws/rlutils/base_limiter.go:26.15,35.2 2 19
+github.com/2manymws/rlutils/base_limiter.go:26.15,35.2 2 18
 github.com/2manymws/rlutils/base_limiter.go:37.70,39.2 1 0
 github.com/2manymws/rlutils/base_limiter.go:41.37,43.2 1 0
-github.com/2manymws/rlutils/base_limiter.go:45.61,47.2 1 20
-github.com/2manymws/rlutils/base_limiter.go:49.64,50.34 1 26
-github.com/2manymws/rlutils/base_limiter.go:50.34,52.3 1 21
+github.com/2manymws/rlutils/base_limiter.go:45.61,47.2 1 19
+github.com/2manymws/rlutils/base_limiter.go:49.64,50.34 1 25
+github.com/2manymws/rlutils/base_limiter.go:50.34,52.3 1 20
 github.com/2manymws/rlutils/base_limiter.go:53.2,54.41 2 5
 github.com/2manymws/rlutils/base_limiter.go:54.41,55.40 1 8
 github.com/2manymws/rlutils/base_limiter.go:55.40,57.4 1 3
 github.com/2manymws/rlutils/base_limiter.go:59.2,59.14 1 2
-github.com/2manymws/rlutils/country_limiter.go:33.28,35.16 2 5
+github.com/2manymws/rlutils/country_limiter.go:33.28,35.16 2 4
 github.com/2manymws/rlutils/country_limiter.go:35.16,37.3 1 0
-github.com/2manymws/rlutils/country_limiter.go:38.2,41.30 3 5
-github.com/2manymws/rlutils/country_limiter.go:41.30,43.3 1 5
-github.com/2manymws/rlutils/country_limiter.go:45.2,45.34 1 5
+github.com/2manymws/rlutils/country_limiter.go:38.2,41.30 3 4
+github.com/2manymws/rlutils/country_limiter.go:41.30,43.3 1 4
+github.com/2manymws/rlutils/country_limiter.go:45.2,45.34 1 4
 github.com/2manymws/rlutils/country_limiter.go:45.34,46.15 1 1
 github.com/2manymws/rlutils/country_limiter.go:46.15,48.4 1 0
 github.com/2manymws/rlutils/country_limiter.go:49.3,49.16 1 1
-github.com/2manymws/rlutils/country_limiter.go:51.2,61.8 1 5
+github.com/2manymws/rlutils/country_limiter.go:51.2,61.8 1 4
 github.com/2manymws/rlutils/country_limiter.go:64.40,66.2 1 0
-github.com/2manymws/rlutils/country_limiter.go:68.66,69.27 1 5
+github.com/2manymws/rlutils/country_limiter.go:68.66,69.27 1 4
 github.com/2manymws/rlutils/country_limiter.go:69.27,71.3 1 0
-github.com/2manymws/rlutils/country_limiter.go:73.2,75.16 3 5
+github.com/2manymws/rlutils/country_limiter.go:73.2,75.16 3 4
 github.com/2manymws/rlutils/country_limiter.go:75.16,77.3 1 1
-github.com/2manymws/rlutils/country_limiter.go:79.2,86.19 3 4
+github.com/2manymws/rlutils/country_limiter.go:79.2,86.19 3 3
 github.com/2manymws/rlutils/country_limiter.go:86.19,88.3 1 1
-github.com/2manymws/rlutils/country_limiter.go:90.2,90.43 1 3
+github.com/2manymws/rlutils/country_limiter.go:90.2,90.43 1 2
 github.com/2manymws/rlutils/country_limiter.go:90.43,92.3 1 0
-github.com/2manymws/rlutils/country_limiter.go:94.2,94.36 1 3
-github.com/2manymws/rlutils/country_limiter.go:94.36,97.3 1 3
-github.com/2manymws/rlutils/country_limiter.go:99.2,99.39 1 0
-github.com/2manymws/rlutils/country_limiter.go:99.39,105.3 1 0
+github.com/2manymws/rlutils/country_limiter.go:94.2,94.35 1 2
+github.com/2manymws/rlutils/country_limiter.go:94.35,97.3 1 0
+github.com/2manymws/rlutils/country_limiter.go:99.2,99.39 1 2
+github.com/2manymws/rlutils/country_limiter.go:99.39,105.3 1 2
 github.com/2manymws/rlutils/country_limiter.go:106.2,106.36 1 0
-github.com/2manymws/rlutils/country_limiter.go:109.69,117.16 3 10
+github.com/2manymws/rlutils/country_limiter.go:109.69,117.16 3 8
 github.com/2manymws/rlutils/country_limiter.go:117.16,119.3 1 2
-github.com/2manymws/rlutils/country_limiter.go:121.2,121.36 1 8
+github.com/2manymws/rlutils/country_limiter.go:121.2,121.36 1 6
 github.com/2manymws/rlutils/country_limiter.go:124.73,126.2 1 0
 github.com/2manymws/rlutils/get_parameter_limiter.go:23.24,33.2 1 3
 github.com/2manymws/rlutils/get_parameter_limiter.go:35.45,37.2 1 0