-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
transform: luaxform transform script #12141
Conversation
This commit makes the detection engine thread context available for transforms to use. The Lua transform requires this value. Issue: 2290
Issue: 2290 This commit extends the hash table logic with an alternate free function that provides the detection engine context. Users that wish to use the next functionality must use the HashListTableInitWithCtx function when initializing the hash table. Using this interface will result in the hash table "free with context" function (new) being used instead.
Issue: 2290 Defer freeing the keyword hash table until the engine context has been freed. This eliminates a double-free from occurring. For the unittests ONLY, clear the keyword_hash to prevent a double free attempt.
Issue: 2290 This commit adds the source files for the new transform -- luaxform.
Issue: 2290
git grep -A 1 -w InspectionBufferSetup shows numbers cases of the pattern: - InspectionBufferSetup - InspectionBufferApplyTransforms Refactor the implementations of those functions into InspectionBufferSetupAndApplyTransforms to reduce function call count. Issuer: 2290
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12141 +/- ##
==========================================
+ Coverage 49.77% 49.81% +0.03%
==========================================
Files 909 912 +3
Lines 257884 258098 +214
==========================================
+ Hits 128367 128574 +207
- Misses 129517 129524 +7
Flags with carried forward coverage won't be shown. Click here to find out more. |
ERROR: ERROR: QA failed on SURI_TLPR1_alerts_cmp. Pipeline 23484 |
src/detect-engine-helper.c
Outdated
@@ -57,7 +57,7 @@ InspectionBuffer *DetectHelperGetData(struct DetectEngineThreadCtx_ *det_ctx, | |||
return NULL; | |||
|
|||
InspectionBufferSetup(det_ctx, list_id, buffer, b, b_len); | |||
InspectionBufferApplyTransforms(buffer, transforms); | |||
InspectionBufferApplyTransforms(det_ctx, buffer, transforms); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would you not want to generalize usage of DetectHelperGetData
so that changing the prototype of InspectionBufferApplyTransforms
affects less files ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good suggestion, but it will affect many source modules.
Can we consider that an optimization to follow this PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR affects many source modules :-p
It would affect less and be more focused if this code factorization happened first ;-)
|
||
void DetectTransformLuaxformRegister(void) | ||
{ | ||
sigmatch_table[DETECT_TRANSFORM_LUAXFORM].name = "luaxform"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could it be rust ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but I would like to move forward with this PR and then have a "rust conversion" issue (optimization?) to make those changes.
@@ -79,8 +79,8 @@ static InspectionBuffer *GetSMBData(DetectEngineThreadCtx *det_ctx, | |||
return NULL; | |||
SCLogDebug("have data!"); | |||
|
|||
InspectionBufferSetup(det_ctx, list_id, buffer, data, data_len); | |||
InspectionBufferApplyTransforms(det_ctx, buffer, transforms); | |||
InspectionBufferSetupAndApplyTransforms( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even better to use DetectHelperGetData ;-)
Continued in #12187 |
Continuation of #12136
Add the
luaxform
transform that uses a Lua script to receive and transform a sticky buffer.Lua transforms receive arguments
Arguments are passed to the Lua script as they appear in the rule:
When the transform is invoked, 3 additional arguments are passed (arg count will be 3)
bytes 4
offset 13
hash sha256
The Lua script is responsible for parsing and using the arguments and returning a tuple:
output-buffer, output-buffer-byte-count
I used this Lua script:
Example rule using the Lua script:
Link to ticket: https://redmine.openinfosecfoundation.org/issues/2290
Describe changes:
Updates
Provide values to any of the below to override the defaults.
link to the pull request in the respective
_BRANCH
variable.SV_REPO=
SV_BRANCH=OISF/suricata-verify#2090
SU_REPO=
SU_BRANCH=
LIBHTP_REPO=
LIBHTP_BRANCH=