Allow FILE_EXT to be mixed with URL_X

wargio · Dec 20, 2024 · 2d6de6e · 2d6de6e
1 parent a0c7694
commit 2d6de6e
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 1 deletion.
diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c
@@ -516,6 +516,20 @@ ngx_http_naxsi_pcre_wrapper(ngx_regex_compile_t* rx, unsigned char* str, unsigne
   return (match);
 }
 
+static int
+ngx_http_rule_match_zone_rx(ngx_http_rule_t* p, naxsi_match_zone_t zone)
+{
+  if (p->br->zone != ANY) {
+    return (1);
+  } else if (zone == FILE_EXT && p->br->file_ext) {
+    // mz:$URL_X|FILE_EXT is defined as br->zone = BODY,
+    // to allow the correct match the zone must be matched
+    // against br->file_ext
+    return (1);
+  }
+  return zone == p->br->zone;
+}
+
 int
 ngx_http_naxsi_is_rule_whitelisted_rx(ngx_http_request_t*        req,
                                       ngx_http_naxsi_loc_conf_t* cf,
@@ -569,7 +583,7 @@ ngx_http_naxsi_is_rule_whitelisted_rx(ngx_http_request_t*        req,
              cf->rxmz_wlr->nelts,
              p->br->custom_locations->nelts);
 
-    if (p->br->zone != (ngx_int_t)zone && p->br->zone != ANY) {
+    if (!ngx_http_rule_match_zone_rx(p, zone)) {
       NX_DEBUG(_debug_wl_debug_rx,
                NGX_LOG_DEBUG_HTTP,
                req->connection->log,

diff --git a/unit-tests/tests/05naxsi_advanced_whitelists.t b/unit-tests/tests/05naxsi_advanced_whitelists.t
@@ -443,3 +443,58 @@ location /RequestDenied {
 --- request
 GET /child/robots.txt
 --- error_code: 200
+
+
+=== WL TEST 9: FILE_EXT can be mixed with URL_X
+--- main_config
+working_directory /tmp/;
+worker_rlimit_core 25M;
+--- main_config
+load_module $TEST_NGINX_NAXSI_MODULE_SO;
+--- http_config
+include $TEST_NGINX_NAXSI_RULES;
+--- config
+location / {
+    BasicRule wl:1500 "mz:$URL_X:^/submit/\d+/feedback$|FILE_EXT";
+
+    #LearningMode;
+    SecRulesEnabled;
+    DeniedUrl "/RequestDenied";
+    CheckRule "$SQL >= 8" BLOCK;
+    CheckRule "$RFI >= 8" BLOCK;
+    CheckRule "$TRAVERSAL >= 4" BLOCK;
+    CheckRule "$UPLOAD >= 8" BLOCK;
+    CheckRule "$XSS >= 8" BLOCK;
+    root $TEST_NGINX_SERVROOT/html/;
+    index index.html index.htm;
+
+}
+location /RequestDenied {
+    return 412;
+}
+--- raw_request eval
+"POST /submit/875411/feedback HTTP/1.1\r
+Host: 127.0.0.1\r
+Connection: Close\r
+User-Agent: Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10\r
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r
+Accept-Language: en-us,en;q=0.5\r
+Accept-Encoding: gzip, deflate\r
+Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r
+Referer: http://127.0.0.1/index.html\r
+Content-Type: multipart/form-data; boundary=---------------------------85477017311078916741744433009\r
+Content-Length: 3264\r
+\r
+-----------------------------85477017311078916741744433009\r
+Content-Disposition: form-data; name=\"textline\"\r
+\r
+valid text bad file\r
+-----------------------------85477017311078916741744433009\r
+Content-Disposition: form-data; name=\"datafile\"; filename=\"bla_med.phx\"\r
+Content-Type: application/octet-stream\r
+\r
+1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000\r
+-----------------------------85477017311078916741744433009--\r
+"
+--- error_code: 404
+