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

fix: add msc_fullinfo() to check JIT compilation

Browse Source
This commit is contained in:
Ervin Hegedus
2025-05-10 10:13:29 +02:00
parent 1a2de10b34
commit bc500582a2
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apache2/re_operators.c
View File

@@ -725,6 +725,10 @@ static int msre_op_validateHash_param_init(msre_rule *rule, char **error_msg) {
#ifdef WITH_PCRE_JIT #ifdef WITH_PCRE_JIT
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
rc = regex->jit_compile_rc; rc = regex->jit_compile_rc;
if (rc == 0) {
msc_fullinfo(regex, PCRE2_INFO_JITSIZE, &jit);
jit = (jit > 0) ? 1 : 0;
}
#else #else
rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit); rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit);
#endif #endif
@@ -831,6 +835,10 @@ static int msre_op_validateHash_execute(modsec_rec *msr, msre_rule *rule, msre_v
if (msr->txcfg->debuglog_level >= 4) { if (msr->txcfg->debuglog_level >= 4) {
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
rc = regex->jit_compile_rc; rc = regex->jit_compile_rc;
if (rc == 0) {
msc_fullinfo(regex, PCRE2_INFO_JITSIZE, &jit);
jit = (jit > 0) ? 1 : 0;
}
#else #else
rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit); rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit);
#endif #endif
@@ -1002,6 +1010,10 @@ static int msre_op_rx_param_init(msre_rule *rule, char **error_msg) {
#ifdef WITH_PCRE_JIT #ifdef WITH_PCRE_JIT
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
rc = regex->jit_compile_rc; rc = regex->jit_compile_rc;
if (rc == 0) {
msc_fullinfo(regex, PCRE2_INFO_JITSIZE, &jit);
jit = (jit > 0) ? 1 : 0;
}
#else #else
rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit); rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit);
#endif #endif
@@ -1100,6 +1112,10 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c
if (msr->txcfg->debuglog_level >= 4) { if (msr->txcfg->debuglog_level >= 4) {
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
rc = regex->jit_compile_rc; rc = regex->jit_compile_rc;
if (rc == 0) {
msc_fullinfo(regex, PCRE2_INFO_JITSIZE, &jit);
jit = (jit > 0) ? 1 : 0;
}
#else #else
rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit); rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit);
#endif #endif
@@ -2991,6 +3007,10 @@ static int msre_op_verifyCC_execute(modsec_rec *msr, msre_rule *rule, msre_var *
if (msr->txcfg->debuglog_level >= 4) { if (msr->txcfg->debuglog_level >= 4) {
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
rc = regex->jit_compile_rc; rc = regex->jit_compile_rc;
if (rc == 0) {
msc_fullinfo(regex, PCRE2_INFO_JITSIZE, &jit);
jit = (jit > 0) ? 1 : 0;
}
#else #else
rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit); rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit);
#endif #endif
@@ -3330,6 +3350,10 @@ static int msre_op_verifyCPF_execute(modsec_rec *msr, msre_rule *rule, msre_var
if (msr->txcfg->debuglog_level >= 4) { if (msr->txcfg->debuglog_level >= 4) {
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
rc = regex->jit_compile_rc; rc = regex->jit_compile_rc;
if (rc == 0) {
msc_fullinfo(regex, PCRE2_INFO_JITSIZE, &jit);
jit = (jit > 0) ? 1 : 0;
}
#else #else
rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit); rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit);
#endif #endif
@@ -3655,6 +3679,10 @@ static int msre_op_verifySSN_execute(modsec_rec *msr, msre_rule *rule, msre_var
if (msr->txcfg->debuglog_level >= 4) { if (msr->txcfg->debuglog_level >= 4) {
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
rc = regex->jit_compile_rc; rc = regex->jit_compile_rc;
if (rc == 0) {
msc_fullinfo(regex, PCRE2_INFO_JITSIZE, &jit);
jit = (jit > 0) ? 1 : 0;
}
#else #else
rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit); rc = msc_fullinfo(regex, PCRE_INFO_JIT, &jit);
#endif #endif