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/60x/20220901/v4 #7806

Merged
merged 13 commits into from
Sep 1, 2022
Merged

Commits on Aug 31, 2022

  1. decode: make PacketDrop use action as parameter

    A Packet may be dropped due to several different reasons. This change
    adds action as a parameter, so we can update the packet action when we
    drop it, instead of setting it to drop.
    
    Related to
    Bug OISF#5458
    
    (cherry picked from commit 1774ff1)
    jufajardini committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    6742ecb View commit details
    Browse the repository at this point in the history
  2. detect/alert: ensure reject action is applied

    Bug 5458 states that the reject action is no longer working. While SV
    tests that use the reject action still pass, it indeed seems that a
    regression has happened with commit aa93984, because while the
    function that applies rule actions to the flow (RuleActionToFlow) does
    check for the reject action, the newly added function PacketApply
    SignatureActions only checks for ACTION_DROP or ACTION_PASS when
    deciding to call RuleActionToFlow.
    
    Bug OISF#5458
    
    (cherry picked from commit 1f54e86)
    jufajardini committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    32f9037 View commit details
    Browse the repository at this point in the history
  3. decode: validate if dropped packet has drop reason

    Related to
    Bug OISF#5458
    
    (cherry picked from commit abd595d)
    jufajardini committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    b3ae9f8 View commit details
    Browse the repository at this point in the history
  4. detect/alert: add unittests to check packet action

    Add unittests to check that packet flags are correctly updated after
    detection finds drop or reject rules that match.
    
    Related to
    Bug OISF#5458
    
    (cherry picked from commit f897761)
    jufajardini committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    2b59f65 View commit details
    Browse the repository at this point in the history
  5. stream/tcp: remove repeated header declaration

    StreamTcpRegisterTests was being declared twice.
    
    (cherry picked from commit d07a6c6)
    jufajardini committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    dcf990c View commit details
    Browse the repository at this point in the history
  6. decode: remove unused macros

    With the recent changes, these macros weren't being used anymore.
    
    Related to
    Bug OISF#5458
    
    (cherry picked from commit e7727c3)
    jufajardini committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    1710c5f View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. fuzz: disable enip detection based on source port

    So as to avoid fuzzing detecting protocol polyglots with enip
    
    (cherry picked from commit d1ebf32)
    catenacyber authored and victorjulien committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    7dc493c View commit details
    Browse the repository at this point in the history
  2. commandline: add alert-queue expand failure option

    For testing purposes. Meant to simulate a reallocation failure when
    dynamically growing the alert queue in DetectEngineThreadCtx, so we can
    check that Suri's behavior doesn't break under such circumstances.
    
    Task OISF#5319
    
    (cherry picked from commit 58928b2)
    jufajardini authored and victorjulien committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    8f3ec86 View commit details
    Browse the repository at this point in the history
  3. detect/engine: fix typos in assorted files

    (cherry picked from commit 5f4bcfe)
    jufajardini authored and victorjulien committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    15ec088 View commit details
    Browse the repository at this point in the history
  4. detect/parse: test sig parsing for more actions

    Our unittests were only covering sig parsing for alert actions. As in
    environments without LibNet the reject action will not work, we must
    ensure that our parser properly fails in such cases, instead of silently
    accepting an unsupported action.
    
    Added tests for the reject and drop action.
    
    Task OISF#5496
    
    (cherry picked from commit c81b78f)
    jufajardini authored and victorjulien committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    d21d4c7 View commit details
    Browse the repository at this point in the history
  5. github: bump ubuntu-18.04 runners to 22.04

    (cherry picked from commit 3dea69e)
    victorjulien committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    449944e View commit details
    Browse the repository at this point in the history
  6. exceptions: error out when invalid policy is used

    Before, if an invalid value was passed as exception policy, Suricata
    would log a warning and set the exception policy to "ignore". This is a
    very different result, than, say, dropping or bypassing a midstream flow.
    
    Task OISF#5504
    
    (cherry picked from commit 58ef3cd)
    jufajardini authored and victorjulien committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    0a124f2 View commit details
    Browse the repository at this point in the history
  7. doc/conf: fix sphinx language setting

    sphinx-build 5.1.1 and above throws a warning which is treated as an
    error while building.
    
    Invalid configuration value found: 'language = None'. Update your configuration to a valid language code. Falling back to 'en' (English).
    
    (cherry picked from commit 2c4d6b3)
    inashivb authored and victorjulien committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    8762699 View commit details
    Browse the repository at this point in the history