Skip to content

fix(geoblock): match country codes case-insensitively #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SashaMIT wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(geoblock): match country codes case-insensitively #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/geoip/src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ impl ZoneFilter {
let country = geo_data.country.iso_code.ok_or(Error::CountryNotFound)?;

let zone_blocked = self.blocked_zones.iter().any(|blocked_zone| {
if blocked_zone.country == country {
if blocked_zone.country.eq_ignore_ascii_case(country) {
if blocked_zone.subdivisions.is_empty() {
true
} else {
Expand Down
21 changes: 21 additions & 0 deletions crates/geoip/src/block/middleware/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,27 @@ async fn test_country_blocked() {
assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
}

/// A lowercase country code is the same block as the uppercase code MaxMind
/// returns.
#[tokio::test]
async fn test_country_blocked_ignores_ascii_case() {
let resolver = LocalResolver::new(Some(resolve_ip), None);
let blocked_countries = vec!["cu".into()];

let geoblock = GeoBlockLayer::new(resolver, blocked_countries, BlockingPolicy::Block);

let mut service = ServiceBuilder::new().layer(geoblock).service_fn(handle);

let request = Request::builder()
.header("X-Forwarded-For", "127.0.0.1")
.body(Body::empty())
.unwrap();

let response = service.ready().await.unwrap().call(request).await.unwrap();

assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
}

/// Test that a blocking list with no subdivisions doesn't block if the
/// country doesn't match.
#[tokio::test]
Expand Down