Updated Code from PR #2304#3371
Updated Code from PR #2304#3371akama-aka wants to merge 3 commits intoowasp-modsecurity:v3/masterfrom akama-aka:v3/master
Conversation
This code was written by: @brandonpayton Co-authored-by: @brandonpayton
Signed-off-by: Kasumi <kasumi@kitsune.exposed>
| } | ||
|
|
||
| bool AuditLog::reopen(std::string *error) { | ||
| if (m_writer != NULL) { |
There was a problem hiding this comment.
As Sonarcloud shows here you should use nullptr instead of NULL. I see there are many other NULL literals in this file - feel free to replace them.
| extern "C" int msc_rules_reopen_audit_log(RulesSet *rules, const char **error) { | ||
| bool succeeded = true; | ||
| std::string errorStr; | ||
|
|
||
| if (rules->m_auditLog != NULL) { | ||
| succeeded = rules->m_auditLog->reopen(&errorStr); | ||
| } | ||
|
|
||
| if (!succeeded) { | ||
| if (!errorStr.empty()) { | ||
| *error = strdup(errorStr.c_str()); | ||
| } else { | ||
| // Guarantee an error message is always assigned in the event of a failure | ||
| *error = strdup("Unknown error reopening audit log"); | ||
| } | ||
| } | ||
|
|
||
| return succeeded ? 0 : -1; | ||
| } | ||
|
|
There was a problem hiding this comment.
I know this is a completely valid solution, but as you can see in other "C" API functions, the authors tied to avoid all the logic and use C++ types (like here the bool and std::string).
My suggestion here: create a thin wrapper, an "extra" function.
You should add a new function to RulesSet class with name reopen(), move this body there, and in this "C" API you have to call only that function.
| // | ||
| // | ||
|
|
||
| functionConst:src/utils/shared_files.h:60 |
There was a problem hiding this comment.
Generally: please don't use this file to collect suppressions. If you need to add some suppression, please use an inline one.
But here: why it this necessary? It seems in that file in line 60 there is only a condition...
| // | ||
|
|
||
| functionConst:src/utils/shared_files.h:60 | ||
| useInitializationList:src/utils/shared_files.h:88 |
There was a problem hiding this comment.
Similar here, but it seems that file only has 77 lines, so adding line 88 makes no sense.
|
Hi @akama-aka, many thanks for this pull request, and special welcome to your first contribution! I added some questions above, please review them. And one more question - you wrote:
Could you try this patch on Windows? I think the result is almost the same, but I'm curios how Windows handles the Cc: @eduar-hte (regarding to Windows). And finally: I saw you added a "C" API function. I assume that will be used in Nginx to reopen audit.log files, right? Do you mind to add that feature to Nginx connector if we merge this? |
Thank you for your comment to this draft pr. I'll try to learn C/C++ more to understand more of it and try to fix those things up ^^ |
|
2 participants
I won't continue that because I don't have the time and motivation to do so. Even tho it's just vibe coded and thats not a way how to solve issues or missing features.