Skip to content

Ftp issues/v2#8963

Closed
inashivb wants to merge 3 commits intoOISF:masterfrom
inashivb:ftp-issues/v2
Closed

Ftp issues/v2#8963
inashivb wants to merge 3 commits intoOISF:masterfrom
inashivb:ftp-issues/v2

Conversation

@inashivb
Copy link
Member

@inashivb inashivb commented Jun 5, 2023

Link to redmine ticket: https://redmine.openinfosecfoundation.org/issues/6054

+ fixes and code cleanup

Note: this makes an s-v test for FTP fail. I believe the test needs fixing, which has been done in OISF/suricata-verify#1222.

SV_BRANCH=pr/1222

inashivb added 3 commits June 5, 2023 17:04
So far, we store one variable in state to hold whether we want to
discard a long line till LF irrespective of direction. This means that a
long command to the client followed by a regular command w LF can be
considered as one long line which is incorrect.

Bug 6054
Currently, there is no way to mark if LF was found and then the line was
truncated. It becomes difficult to spot in the callers whether the line
was truncated despite LF being found or not. So, label it clearly with a
variable.
@codecov
Copy link

codecov bot commented Jun 5, 2023

Codecov Report

Merging #8963 (5d6942d) into master (6154bab) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8963      +/-   ##
==========================================
- Coverage   82.42%   82.41%   -0.01%     
==========================================
  Files         969      969              
  Lines      273476   273473       -3     
==========================================
- Hits       225410   225384      -26     
- Misses      48066    48089      +23     
Flag Coverage Δ
fuzzcorpus 64.93% <100.00%> (-0.01%) ⬇️
suricata-verify 60.49% <100.00%> (-0.02%) ⬇️
unittests 62.92% <68.42%> (+0.01%) ⬆️

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

@inashivb inashivb marked this pull request as ready for review June 6, 2023 02:38
@inashivb inashivb requested a review from victorjulien as a code owner June 6, 2023 02:38
@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 14256

@victorjulien victorjulien mentioned this pull request Jun 8, 2023
@victorjulien
Copy link
Member

Merged in #8994, thanks!

@inashivb inashivb deleted the ftp-issues/v2 branch June 9, 2023 05:37
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

Comments