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/144/20231006/v1 #9575

Merged
merged 6 commits into from
Oct 8, 2023
Merged

Commits on Oct 6, 2023

  1. Configuration menu
    Copy the full SHA
    0a40116 View commit details
    Browse the repository at this point in the history
  2. doc/install: link to devguide's install from git

    Although we have an updated version of instructions for installation
    from git, our install guide was only referring to RedMine, which is less
    up-to-date.
    
    Kept that reference, since it might still be useful for non-Ubuntu
    cases.
    jufajardini authored and victorjulien committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    4ab4f71 View commit details
    Browse the repository at this point in the history
  3. doc/quickstart: add software-properties instruction

    This is indicated in the `Installation` section, but not in the
    quickstart, and it felt like a valid addition, here, too.
    jufajardini authored and victorjulien committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    ffed5eb View commit details
    Browse the repository at this point in the history
  4. output/email: use SCCalloc for OutputJsonEmailCtx

    email_ctx->fields only gets populated when smtp.custom setting is on.
    The fn EveEmailLogJSONCustom is called when either
    1. smtp.extended setting is on or,
    2. email_ctx->fields is populated which means smtp.custom setting is on
    
    In case neither of these are set in suricata.yaml, no call should
    ideally be made to the fn EveEmailLogJSONCustom.
    However, it turns out that email_ctx->fields is unset and then set only
    after the smtp config was found. This leads to email_ctx->fields
    sometimes contain value even when no config was given to the smtp
    section and can lead to unexpected output.
    
    Fix this by using SCCalloc while initializing OutputJsonEmailCtx struct
    instead of SCMalloc.
    
    Bug 6380
    inashivb authored and victorjulien committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    7406ac0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    14a4c6c View commit details
    Browse the repository at this point in the history
  6. docs: adjust readthedocs config to new options

    Our documentation was failing to build, seems connected to the new way
    of indicating build options (cf
    https://readthedocs.org/projects/suricata/builds/22112658/,
    https://docs.readthedocs.io/en/stable/config-file/v2.html#build,
    and https://docs.readthedocs.io/en/stable/config-file/v2.html#build-os).
    
    Added the build.os required new field, and adjusted the way python
    version is passed.
    
    For the new configuration style for read the docs, one of the ways to
    pass extra configuration for python is having a requirements file.
    jufajardini authored and victorjulien committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    1a132f4 View commit details
    Browse the repository at this point in the history