github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-13 13:26:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix maxmind test case

Browse Source
This commit is contained in:
Felipe Zimmerle 2018-03-29 17:02:19 -03:00
parent 0ca5994744
commit ff0d451a5c
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
5 changed files with 66 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -10,7 +10,7 @@ v3.0.x - YYYY-MMM-DD (To be released)
- Fix: Reverse logic of checking output in @inspectFile
[Issue #1715 - @defanator]
- Adds support to libMaxMind
[Issue #1307 - @zimmerle]
[Issue #1307 - @zimmerle, @defanator]
- Adds capture action to detectXSS
[Issue #1698 - @victorhora]
- Temporarily accept invalid MULTIPART_SEMICOLON_MISSING operator

44
test/test-cases/data/GeoIP2-City-Test-source.json Normal file
View File

@ -0,0 +1,44 @@
[
{
"::200.249.12.31/120" : {
"continent" : {
"code" : "SA",
"geoname_id" : 123,
"names" : {
"en" : "South America",
"pt-BR" : "America do Sul"
}
},
"country" : {
"geoname_id" : 123,
"iso_code" : "BR",
"names" : {
"en" : "Brazil",
"pt-BR" : "Brasil"
}
},
"location" : {
"accuracy_radius" : 100,
"latitude" : "-8.051502",
"longitude" : "-34.874919"
},
"registered_country" : {
"geoname_id" : 123,
"iso_code" : "BR",
"names" : {
"en" : "Brazil",
"pt-BR" : "Brasil"
}
},
"postal": {
"code": "50040090"
},
"city": {
"names": {
"en": "Recife"
}
}
}
}
]

BIN
test/test-cases/data/GeoIP2-City-Test.mmdb Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
test/test-cases/data/geo/GeoLite2-City.mmdb
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 60 MiB

42
test/test-cases/regression/variable-GEO.json
View File

@ -47,7 +47,7 @@
"resource":"maxmind",
"title":"Testing Variables :: GEO:COUNTRY_NAME [maxmind]",
"client":{
"ip":"64.17.254.216",
"ip":"200.249.12.31",
"port":123
},
"server":{
@ -74,11 +74,11 @@
]
},
"expected":{
"debug_log":"Target value: \"United States\" \\(Variable: GEO:COUNTRY_NAME\\)"
"debug_log":"Target value: \"Brazil\" \\(Variable: GEO:COUNTRY_NAME\\)"
},
"rules":[
"SecRuleEngine On",
"SecGeoLookupDb test-cases\/data\/geo\/GeoLite2-City.mmdb",
"SecGeoLookupDb test-cases\/data\/GeoIP2-City-Test.mmdb",
"SecRule REMOTE_ADDR \"@geoLookup\" \"id:1,pass,t:trim\"",
"SecRule GEO \"@contains test \" \"id:2,pass,t:trim\""
]
@ -509,7 +509,7 @@
"resource":"maxmind",
"title":"Testing Variables :: GEO:COUNTRY_NAME [maxmind]",
"client":{
"ip":"64.17.254.216",
"ip":"200.249.12.31",
"port":123
},
"server":{
@ -536,11 +536,11 @@
]
},
"expected":{
"debug_log":"Target value: \"United States\" \\(Variable: GEO:COUNTRY_NAME\\)"
"debug_log":"Target value: \"Brazil\" \\(Variable: GEO:COUNTRY_NAME\\)"
},
"rules":[
"SecRuleEngine On",
"SecGeoLookupDb test-cases\/data\/geo\/GeoLite2-City.mmdb",
"SecGeoLookupDb test-cases\/data\/GeoIP2-City-Test.mmdb",
"SecRule REMOTE_ADDR \"@geoLookup\" \"id:1,pass,t:trim\"",
"SecRule GEO \"@contains test \" \"id:2,pass,t:trim\""
]
@ -551,7 +551,7 @@
"resource":"maxmind",
"title":"Testing Variables :: GEO:LATITUDE [maxmind]",
"client":{
"ip":"64.17.254.216",
"ip":"200.249.12.31",
"port":123
},
"server":{
@ -578,11 +578,11 @@
]
},
"expected":{
"debug_log":"Target value: \"41.517100\" \\(Variable: GEO:LATITUDE\\)"
"debug_log":"Target value: \"-8.051502\" \\(Variable: GEO:LATITUDE\\)"
},
"rules":[
"SecRuleEngine On",
"SecGeoLookupDb test-cases\/data\/geo\/GeoLite2-City.mmdb",
"SecGeoLookupDb test-cases\/data\/GeoIP2-City-Test.mmdb",
"SecRule REMOTE_ADDR \"@geoLookup\" \"id:1,pass,t:trim\"",
"SecRule GEO \"@contains test \" \"id:2,pass,t:trim\""
]
@ -593,7 +593,7 @@
"resource":"maxmind",
"title":"Testing Variables :: GEO:COUNTRY_CODE [maxmind]",
"client":{
"ip":"64.17.254.216",
"ip":"200.249.12.31",
"port":123
},
"server":{
@ -620,11 +620,11 @@
]
},
"expected":{
"debug_log":"Target value: \"US\" \\(Variable: GEO:COUNTRY_CODE\\)"
"debug_log":"Target value: \"BR\" \\(Variable: GEO:COUNTRY_CODE\\)"
},
"rules":[
"SecRuleEngine On",
"SecGeoLookupDb test-cases\/data\/geo\/GeoLite2-City.mmdb",
"SecGeoLookupDb test-cases\/data\/GeoIP2-City-Test.mmdb",
"SecRule REMOTE_ADDR \"@geoLookup\" \"id:1,pass,t:trim\"",
"SecRule GEO \"@contains test \" \"id:2,pass,t:trim\""
]
@ -635,7 +635,7 @@
"resource":"maxmind",
"title":"Testing Variables :: GEO:COUNTRY_CONTINENT [maxmind]",
"client":{
"ip":"64.17.254.216",
"ip":"200.249.12.31",
"port":123
},
"server":{
@ -662,11 +662,11 @@
]
},
"expected":{
"debug_log":"Target value: \"North America\" \\(Variable: GEO:COUNTRY_CONTINENT\\)"
"debug_log":"Target value: \"South America\" \\(Variable: GEO:COUNTRY_CONTINENT\\)"
},
"rules":[
"SecRuleEngine On",
"SecGeoLookupDb test-cases\/data\/geo\/GeoLite2-City.mmdb",
"SecGeoLookupDb test-cases\/data\/GeoIP2-City-Test.mmdb",
"SecRule REMOTE_ADDR \"@geoLookup\" \"id:1,pass,t:trim\"",
"SecRule GEO \"@contains test \" \"id:2,pass,t:trim\""
]
@ -677,7 +677,7 @@
"resource":"maxmind",
"title":"Testing Variables :: GEO:POSTAL_CODE [maxmind]",
"client":{
"ip":"64.17.254.216",
"ip":"200.249.12.31",
"port":123
},
"server":{
@ -704,11 +704,11 @@
]
},
"expected":{
"debug_log":"Target value: \"02842\" \\(Variable: GEO:POSTAL_CODE\\)"
"debug_log":"Target value: \"50040090\" \\(Variable: GEO:POSTAL_CODE\\)"
},
"rules":[
"SecRuleEngine On",
"SecGeoLookupDb test-cases\/data\/geo\/GeoLite2-City.mmdb",
"SecGeoLookupDb test-cases\/data\/GeoIP2-City-Test.mmdb",
"SecRule REMOTE_ADDR \"@geoLookup\" \"id:1,pass,t:trim\"",
"SecRule GEO \"@contains test \" \"id:2,pass,t:trim\""
]
@ -719,7 +719,7 @@
"resource":"maxmind",
"title":"Testing Variables :: GEO:CITY [maxmind]",
"client":{
"ip":"64.17.254.216",
"ip":"200.249.12.31",
"port":123
},
"server":{
@ -746,11 +746,11 @@
]
},
"expected":{
"debug_log":"Target value: \"Middletown\" \\(Variable: GEO:CITY\\)"
"debug_log":"Target value: \"Recife\" \\(Variable: GEO:CITY\\)"
},
"rules":[
"SecRuleEngine On",
"SecGeoLookupDb test-cases\/data\/geo\/GeoLite2-City.mmdb",
"SecGeoLookupDb test-cases\/data\/GeoIP2-City-Test.mmdb",
"SecRule REMOTE_ADDR \"@geoLookup\" \"id:1,pass,t:trim\"",
"SecRule GEO \"@contains test \" \"id:2,pass,t:trim\""
]