next/144/20231006/v1 #9575
Merged
next/144/20231006/v1 #9575
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This is indicated in the `Installation` section, but not in the quickstart, and it felt like a valid addition, here, too.
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
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.
victorjulien
requested review from
jasonish,
jufajardini and
a team
as code owners
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #9575 +/- ##
==========================================
+ Coverage 82.20% 82.22% +0.01%
==========================================
Files 968 968
Lines 274275 274275
==========================================
+ Hits 225461 225515 +54
+ Misses 48814 48760 -54
Flags with carried forward coverage won't be shown. Click here to find out more. |
jasonish
approved these changes
Oct 7, 2023
This was referenced Oct 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Staging: