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/589/70x/20240925/v1 #11835

Merged
merged 2 commits into from
Sep 26, 2024

Commits on Sep 24, 2024

  1. ssl/ja3: better check for ja3 being enabled

    Ticket: 6634
    
    Completes commit 8473525
    
    Avoids error log in Ja3BufferAddValue about NULL buffer
    
    (cherry picked from commit 1d32f11)
    catenacyber authored and jufajardini committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    04ef7b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. stream: improve 3whs completed by ACK with data

    If the ACK packet completing the 3whs is received, the stream engine will
    transition to "established". However, the packet itself will not be tagged
    as "established". This will only happen for the next packet after the 3whs,
    so that `flow:established` only matches after the 3whs.
    
    It is possible that the ACK packet completing the 3whs was lost. Since the
    ACK packets themselves are not acknowledged, there will be no retransmission
    of them. Instead, the next packet can have the expected ACK flag as well as
    data.
    
    This case was mishandled in a subtle way. The stream engine state transition
    was done correctly, as well as the data handling and app-layer updates.
    However, the packet itself was not tagged as "established", which meant
    that `flow:established` would not yet match.
    
    This patch detects this case and tags the packet as established if ACK
    with data is received that completes the 3whs.
    
    Bug: OISF#7264.
    (cherry picked from commit 45eb7e4)
    victorjulien committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    4f59fd9 View commit details
    Browse the repository at this point in the history