Skip to content

Draft: Ish/Staging/v1#9421

Closed
jasonish wants to merge 6 commits into
OISF:masterfrom
jasonish:Ish/Staging/v1
Closed

Draft: Ish/Staging/v1#9421
jasonish wants to merge 6 commits into
OISF:masterfrom
jasonish:Ish/Staging/v1

Conversation

@jasonish
Copy link
Copy Markdown
Member

@jasonish jasonish commented Aug 30, 2023

@jasonish jasonish changed the title Ish/Staging/v1 Draft: Ish/Staging/v1 Aug 30, 2023
@catenacyber
Copy link
Copy Markdown
Contributor

What do you think about 45036b0 ?

bit flags latest doc mentions to avoid zero bit flags cf https://docs.rs/bitflags/latest/bitflags/#zero-bit-flags

@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 30, 2023

Codecov Report

Merging #9421 (ccefbd8) into master (becb8ce) will decrease coverage by 0.05%.
The diff coverage is 70.58%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9421      +/-   ##
==========================================
- Coverage   82.17%   82.13%   -0.05%     
==========================================
  Files         968      968              
  Lines      274198   274228      +30     
==========================================
- Hits       225331   225230     -101     
- Misses      48867    48998     +131     
Flag Coverage Δ
fuzzcorpus 64.02% <28.57%> (-0.02%) ⬇️
suricata-verify 60.85% <35.71%> (-0.04%) ⬇️
unittests 62.88% <64.70%> (-0.01%) ⬇️

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

@jasonish
Copy link
Copy Markdown
Member Author

What do you think about 45036b0 ?

bit flags latest doc mentions to avoid zero bit flags cf https://docs.rs/bitflags/latest/bitflags/#zero-bit-flags

We should update and bring that fix in. Sorry, that commit arrived after plucking the clippy fixes from the PR.

@suricata-qa
Copy link
Copy Markdown

Information: QA ran without warnings.

Pipeline 15781

jasonish and others added 2 commits August 30, 2023 15:45
Update the Bitflags crate to the latest supported version. This fixes
up a new clippy warning:

error: &-masking with zero
   --> src/rdp/parser.rs:161:1
    |
161 | / bitflags! {
162 | |     pub struct ProtocolFlags: u32 {
163 | |         const PROTOCOL_RDP = Protocol::ProtocolRdp as u32;
164 | |         const PROTOCOL_SSL = Protocol::ProtocolSsl as u32;
...   |
168 | |     }
169 | | }
    | |_^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#bad_bit_mask
    = note: `#[deny(clippy::bad_bit_mask)]` on by default
    = note: this error originates in the macro `__impl_bitflags` which comes from the expansion of the macro `bitflags` (in Nightly builds, run with -Z macro-backtrace for more info)
When comparing IPv6 addresses based on uint32_t chunks, one needs to
apply ntohl() conversion to the individual parts, otherwise on little
endian systems individual bytes are compared in the wrong order.
Avoid this all and leverage memcmp(), it'll short circuit on the first
differing byte and its return values tells us which address sorts lower.

Bug: OISF#6276
@suricata-qa
Copy link
Copy Markdown

Information: QA ran without warnings.

Pipeline 15784

Commit e7c0f0a removed uses of atoi with a new number parsing
functions. This broke parsing ip-reputation data files that contained
trailing carriage returns as it was being included in the number
string to convert.

Bug: OISF#6243.
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Sep 1, 2023

NOTE: This PR may contain new authors:

Thomas Winter <Thomas.Winter@alliedtelesis.co.nz>

@suricata-qa
Copy link
Copy Markdown

Information: QA ran without warnings.

Pipeline 15802

@victorjulien
Copy link
Copy Markdown
Member

Obsolete (and very messy), so closing.

@jasonish jasonish deleted the Ish/Staging/v1 branch August 7, 2024 15:21
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.

6 participants