Skip to content
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

Next/20211213/v3 #6705

Merged
merged 13 commits into from
Dec 14, 2021
Merged

Next/20211213/v3 #6705

merged 13 commits into from
Dec 14, 2021

Conversation

victorjulien
Copy link
Member

#6699 #6667 #6651

plus some misc commits

victorjulien and others added 13 commits December 7, 2021 17:30
Instead of storing a name and description as a pointer in DetectBufferType
store them in fixed size arrays. This is in preparation of runtime registration
of buffer types, where a constant name/desc is not available.
Use util function in all code needing the ack'd data.
Ticket: 4857

If a pattern such as GET is seen ine the beginning of the
file transferred over ftp-data, this flow will get recognized
as HTTP, and a HTTP state will be created during parsing.

Thus, we cannot override directly alproto's values

This solves the segfault, but not the logical bug that the flow
should be classified as FTP-DATA instead of HTTP
@victorjulien victorjulien requested review from jasonish, norg and a team as code owners December 13, 2021 16:14
@codecov
Copy link

codecov bot commented Dec 13, 2021

Codecov Report

Merging #6705 (d67f8f9) into master (e93dc24) will increase coverage by 0.04%.
The diff coverage is 87.50%.

@@            Coverage Diff             @@
##           master    #6705      +/-   ##
==========================================
+ Coverage   77.12%   77.17%   +0.04%     
==========================================
  Files         613      613              
  Lines      185666   185593      -73     
==========================================
+ Hits       143194   143223      +29     
+ Misses      42472    42370     -102     
Flag Coverage Δ
fuzzcorpus 53.05% <83.07%> (+0.04%) ⬆️
suricata-verify 52.63% <87.75%> (+0.49%) ⬆️
unittests 63.06% <69.64%> (-0.03%) ⬇️

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

@victorjulien victorjulien mentioned this pull request Dec 14, 2021
@victorjulien victorjulien merged commit d67f8f9 into OISF:master Dec 14, 2021
@victorjulien victorjulien deleted the next/20211213/v3 branch January 28, 2022 16:34
Nancyenos added a commit to Nancyenos/suricata that referenced this pull request Oct 25, 2024
Nancyenos added a commit to Nancyenos/suricata that referenced this pull request Oct 26, 2024
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.

4 participants