2286 Commits

Author SHA1 Message Date
Ervin Hegedus
0c8cc6e2cf
Finish XMLArgs processing 2025-04-07 14:01:46 +02:00
Marc Stern
fa621f81e9
Merge pull request #3284 from marcstern/v2/pr/utf8toUnicodeVsMultibyte
Incorrect utf8toUnicode transformation for 00xx
2024-11-12 17:34:05 +01:00
Marc Stern
87dbae9bb2 assert(input != NULL); 2024-11-04 13:53:28 +01:00
Marc Stern
907d61ad6d Incorrect utf8toUnicode transformation for 00xx
Fix issue and restructure handling
2024-10-22 15:51:55 +02:00
Ervin Hegedus
dfcf31a41f
Merge pull request #3279 from marcstern/v2/PR/PCRE2_error_msg
Fixed PCRE2 error message
2024-10-19 10:47:39 +02:00
Marc Stern
ecab91a74e Add problematic pattern when DEBUG_CONF is defined 2024-10-17 14:43:03 +02:00
Marc Stern
89ff91dae3 Fixed PCRE2 error message 2024-10-17 14:10:56 +02:00
Tomas Korbar
bec33810e9 Move log opening to appropriate execution phase
When piped logs are opened during parsing of configuration
it results in unexpected situations in apache httpd
and can cause hang of process which is trying to log
into auditlog.

Code should work as before, with the exception of
one additional condition evaluation when primary
audit log is not set and secondary audit log
path to piped executable is now not relative
to server root.
2024-10-11 14:50:20 +02:00
Marc Stern
d7f2be60ce
Merge pull request #3270 from Marcool04/v2/master
make rootpath and incpath consts for apr_filepath_root
2024-10-04 16:30:29 +02:00
Mark t480
4919814a5c make rootpath and incpath consts so apr_filepath_root doesn't cause incompatible pointer type 2024-10-04 15:48:12 +02:00
Ervin Hegedus
1121ef0bed
Merge pull request #3269 from marcstern/v2/pr/apr_mutex_create
Fix apr_global_mutex_create() usage
2024-10-03 13:44:34 +02:00
Marc Stern
36a4194f46 CHANGES 2024-10-03 12:59:48 +02:00
Marc Stern
23e3cb491a Fix for #3255
We don't have to generate a temp name ourselves, it'll be done in apr_global_mutex_create().
We don't have to provide a filename, apr_global_mutex_create() generates one automatically.
Moreover, under Unix & Windows, the preferred mechanism won't use a file at all.
apr_file_mktemp() cannot be used as it creates the file (at least on FreeBSD).
Discussion in Apache mailing list: https://lists.apache.org/thread/ykb26kg4lgcqnldvxwd9p6hv16fy4z9l
2024-10-03 12:42:23 +02:00
Ervin Hegedus
9666663867
Merge pull request #3267 from airween/v2/modsecdefconf
chore: add 'log' action to rule 200005 (v2/master)
2024-10-03 09:59:55 +02:00
Ervin Hegedus
63d5d92565
chore: add 'log' action to rule 200005 2024-10-02 17:11:01 +02:00
Marc Stern
090e4d3baa
Merge pull request #3257 from marcstern/v2/pr/msr_global_mutex_lock
msr_global_mutex_lock: handle errors from apr_global_mutex_lock
2024-10-02 17:09:51 +02:00
Marc Stern
d6f1ebb4a3
Merge pull request #3265 from rainerjung/v2/move-id_log-to-msc_util
Move id_log() to msc_util to fix unit tests; it is declared on msc_ut…
2024-10-02 13:00:00 +02:00
Rainer Jung
149376377e Move id_log() to msc_util to fix unit tests; it is declared on msc_util.h already 2024-10-01 13:58:22 +02:00
Marc Stern
c99d931f3c Initialize filename to NULL 2024-09-30 13:53:31 +02:00
Marc Stern
7a1480a506 Merge branch 'v2/pr/msr_global_mutex_lock' of https://github.com/marcstern/ModSecurity into v2/pr/msr_global_mutex_lock 2024-09-30 13:17:04 +02:00
Marc Stern
b8e8e30730 Fixed parameters/functions names 2024-09-30 13:12:38 +02:00
Marc Stern
95dc5944d4
Updated log message
Co-authored-by: Max Leske <250711+theseion@users.noreply.github.com>
2024-09-27 09:27:29 +02:00
Marc Stern
339d6df2a5
Updated comment
Co-authored-by: Max Leske <250711+theseion@users.noreply.github.com>
2024-09-27 09:26:58 +02:00
Ervin Hegedus
02ca247283
Merge pull request #3262 from marcstern/v2/pr/time.h
Missing #include <time.h>
2024-09-25 20:50:30 +02:00
Marc Stern
9ba1caa2fa Missing #include <time.h> 2024-09-25 13:57:05 +02:00
Marc Stern
bd54f01cd3 Added CHANGES 2024-09-20 12:51:03 +02:00
Marc Stern
b850c74b12 We should have get the warning at lock time, so ignore it at unlock time 2024-09-12 14:07:55 +02:00
Marc Stern
449c080e63 Same for global_mutex_unlock 2024-09-12 13:01:44 +02:00
Marc Stern
b52201010d msr_global_mutex_lock: Handle errors from apr_global_mutex_lock 2024-09-12 12:18:25 +02:00
Ervin Hegedus
0e6fc62548
Merge pull request #3250 from airween/v2/literalbuildfix
fix: compilation error
2024-09-04 10:55:02 +02:00
Ervin Hegedus
38e812d197
Add -Werror=format-security CFLAG for all build case 2024-09-03 21:50:22 +02:00
Ervin Hegedus
cddd9a7eb5
Fix build error if -Werror=format-security is presented 2024-09-03 21:49:43 +02:00
Ervin Hegedus
b5179a110a
Merge pull request #3245 from airween/v2/release2409
Release v2 version 2.9.8
2024-09-03 14:49:58 +02:00
Ervin Hegedus
ad0161118d
Change release version to v2.9.8 v2.9.8 2024-09-03 14:40:55 +02:00
Ervin Hegedus
bf1a3be793
Merge pull request #3205 from airween/v2/release2408
Add PR's to CHANGES
2024-09-03 14:37:48 +02:00
Ervin Hegedus
c9fe84ea2c
Typo fixes 2024-09-03 07:42:20 +02:00
Ervin Hegedus
25d73b71c8
Finalize CHANGES 2024-09-02 22:21:08 +02:00
Ervin Hegedus
d55495e1dc
Added PR #3241 2024-08-26 17:59:11 +02:00
Ervin Hegedus
7cc689032f
Merge pull request #3241 from marcstern/v2/pr/ap_log_perror
Fixed ap_log_perror() usage
2024-08-26 17:58:25 +02:00
Marc Stern
6be2ee534a Fixed ap_log_perror() usage
Replaces  #3236
2024-08-26 17:17:36 +02:00
Ervin Hegedus
207525e194
Added PR #3191 2024-08-26 16:38:30 +02:00
Ervin Hegedus
f65415ae8a
Merge pull request #3191 from marcstern/v2/pr/mem_leak_re
Memory leaks + enhanced logging
2024-08-26 16:37:01 +02:00
Ervin Hegedus
6e384d13ab
Added PR #3190 2024-08-20 15:27:44 +02:00
Ervin Hegedus
fd0e042abc
Merge pull request #3190 from marcstern/v2/pr/ci_log
CI improvement: First check syntax & always display error/audit logs
2024-08-20 15:25:13 +02:00
Ervin Hegedus
110b61f6d7
Merge branch 'v2/master' into v2/pr/ci_log 2024-08-19 16:57:10 +02:00
Ervin Hegedus
d996f04e3a
Add trailing :: sequence
Co-authored-by: Max Leske <250711+theseion@users.noreply.github.com>
2024-08-19 16:47:09 +02:00
Marc Stern
046d3eb3ec Fixed two error messages 2024-08-19 14:19:05 +02:00
Ervin Hegedus
7f4e416fc4
Added PR #3202 2024-08-18 22:59:22 +02:00
Ervin Hegedus
e7e11d972f
Merge pull request #3202 from marcstern/v2/pr/assert
Fixed assert() usage
2024-08-18 22:58:06 +02:00
Marc Stern
60d07a5547 added one more NULL check at run-time 2024-08-16 09:23:11 +02:00