Skip to content

Backport8 8464 8624 8662 8663 v1 - #15701

Closed
catenacyber wants to merge 4 commits into
OISF:main-8.0.xfrom
catenacyber:backport8-8464-8624-8662-8663-v1
Closed

Backport8 8464 8624 8662 8663 v1#15701
catenacyber wants to merge 4 commits into
OISF:main-8.0.xfrom
catenacyber:backport8-8464-8624-8662-8663-v1

Conversation

ssam18 and others added 4 commits June 22, 2026 21:27
DetectEngineThreadCtxInitKeywords returns TM_ECODE_FAILED when a per-thread keyword init fails (for example DetectFilemagicThreadInit), but ThreadCtxDoInit discarded that result and still returned OK. The detect thread then ran with a partially initialized keyword context array, producing indeterminate results. Propagate the failure so the callers abort thread init and clean up.

Add a unit test that registers a keyword whose thread init fails and verifies that DetectEngineThreadCtxInit reports the failure.

Ticket: OISF#8237
(cherry picked from commit df35324)
In FTP, the first transaction is a banner from the server. Skip TS
inspection on this transaction.

Allows firewall mode to get past this transaction and onto the next.

Ticket: OISF#8662
(cherry picked from commit d346e46)
The ftpdata_command would never match a RETR in the to_server direction,
or a STOR in the to_client direction, this effectively makes the
ftpdata_command applicable to passive mode only.

Instead, remove the directionality on the ftpdata_command. Its "meta"
information passed from the control channel and isn't really
directional. I think the idea was to abstract away active/passive from
the rule writer, but unfortunately doesn't allow the ftpdata_command
keyword to work in the more strict firewll mode.

Ticket: OISF#8663
(cherry picked from commit 2fe4bb2)
@catenacyber

Copy link
Copy Markdown
Contributor Author

Replaced by #15702

@codecov

codecov Bot commented Jun 22, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 83.33333% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.64%. Comparing base (2b924d4) to head (1e95982).

Additional details and impacted files
@@              Coverage Diff               @@
##           main-8.0.x   #15701      +/-   ##
==============================================
- Coverage       81.65%   81.64%   -0.01%     
==============================================
  Files            1016     1016              
  Lines          276653   276687      +34     
==============================================
+ Hits           225890   225905      +15     
- Misses          50763    50782      +19     
Flag Coverage Δ
fuzzcorpus 63.81% <15.00%> (+<0.01%) ⬆️
livemode 18.66% <5.00%> (-0.13%) ⬇️
netns 20.16% <5.00%> (-0.01%) ⬇️
pcap 44.37% <15.00%> (-0.03%) ⬇️
suricata-verify 65.08% <65.00%> (-0.02%) ⬇️
unittests 58.61% <54.76%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants