Commit Graph

12932 Commits (c587e90ebccfe8883ea951e723be461dc58dcc06)

Author SHA1 Message Date
Victor Julien c587e90ebc time: thread time update after flow update
The flow worker needs to get the opportunity to run the flow update
before globally making it's current timestamp available. This is to
avoid another thread using the time to evict the flow that is about to
get a legitimate update.

Ticket: #7455.
7 months ago
Victor Julien 48301bf28c flow: exact flow timeout
Use a more precise calculation for timing out flows, using both the
seconds and the micro seconds.

Ticket: #7455.
7 months ago
Victor Julien 677c0fd41c time: getter for SCTime_t timestamp of a thread 7 months ago
Victor Julien dbebd89de2 stream: rename tcp reuse flag
Rename to be consistent with other naming:

STREAM_PKT_FLAG_TCP_PORT_REUSE -> STREAM_PKT_FLAG_TCP_SESSION_REUSE
7 months ago
Victor Julien deece44eaa eve/stream: add tcp-session-reuse trigger
Can be used to log when the tcp session reuse logic triggers.
7 months ago
Victor Julien 7b8214302c flow: improve thread safety during timeout checks
Timeout checks would access certain fields w/o locking, which could lead
to thread safety issues.
7 months ago
Victor Julien bc374b8e40 eve/flow: log tcp reuse as 'reason'
Ticket: #7482.
7 months ago
Victor Julien aab50e8ad0 unix/socket: cleanup start up logic
No longer init then deinit part of the engine at startup of the unix
socket mode.
7 months ago
Victor Julien b9423602b4 threads: include name in error message
When a thread fails to spawn, include the thread name in the error
message.
7 months ago
Philippe Antoine 3b76c78cb9 profiling: use dynamic number of app-layer protos
Ticket: 5053
7 months ago
Philippe Antoine 41dc90776a app-layer/parser: use dynamic number of app-layer protos
Ticket: 5053
7 months ago
Philippe Antoine f8136eff9a fuzz: use dynamic number of app-layer protos
Ticket: 5053

delay after initialization so that StringToAppProto works
7 months ago
Philippe Antoine def6e1c719 app-layer/stats: use dynamic number of app-layer protos
Ticket: 5053
7 months ago
Philippe Antoine 2bd73b2761 util: parenthesis for macro
so that we can use safely EXCEPTION_POLICY_MAX*sizeof(x)
7 months ago
Philippe Antoine 911cd628fc frames: use dynamic number of app-layer protos
Ticket: 5053
7 months ago
Philippe Antoine 9e9333b7d0 protodetect: use dynamic number of app-layer protos
for alproto_names

Ticket: 5053
7 months ago
Philippe Antoine 61657c8ec6 protodetect: use dynamic number of app-layer protos
for expectation_proto

Ticket: 5053
7 months ago
Philippe Antoine 6b7349dbc1 protodetect: make expectation_proto part of AppLayerProtoDetectCtx
instead of a global variable.

For easier initialization with dynamic number of protocols
7 months ago
Philippe Antoine 7750226e43 fuzz: use lower pcre limits
to avoid timeouts

instead of forbidding pcre signatures on stream

Ticket: 4858
7 months ago
Philippe Antoine 5cec270598 detect: move fields around to fill memory holes
to make scan-build happy avoiding its warning :

Excessive padding in 'struct DetectEngineThreadCtx_'
(33 padding bytes, where 1 is optimal)
7 months ago
Philippe Antoine b967fcaf8f stats: remove unused pseudo_failed stat 7 months ago
Philippe Antoine 954553f1ae src: remove unused struct fields
Even if they get defined
7 months ago
Philippe Antoine bdcb593738 detect: improve tx_id guessing for unidirectional protocols
So we get:
1. request arrives - buffered due to not ackd
2. response arrives, acks request - request is now parsed, response isn't
3. ack for response, response parsed. Then detect runs for request,
generates alert. We now have 2 txs. txid will be 0 from AppLayerParserGetTransactionInspectId

But txid 1 is unidirectional in the other way, so we can use txid 0
metadata for logging

Ticket: 7449
7 months ago
Jeff Lucovsky 2d9df5a1ae flow/var: Release key storage
Issue: 7466

This commit releases the memory for the flow variable "key" when
the flow variable is of type string. The key is allocated in the Lua
extension logic.
7 months ago
Jeff Lucovsky d853972c74 output/log: Remove extraneous error message
Issue: 7447

When the output file can't be opened, 2 error messages are displayed
for the same problem. The second message doesn't add value and lacks
context (error reason, e.g., "Permission denied").

Retaining the second message as a debug message.

Without this commit:

Error: logopenfile: Error opening file: "/home/jlucovsky/src/jal/suricata-verify/tests/bug-5198/output/noperms/eve.1.json": Permission denied [SCLogOpenFileFp:util-logopenfile.c:428]
Error: logopenfile: Unable to open slot 1 for file /home/jlucovsky/src/jal/suricata-verify/tests/bug-5198/output/noperms/eve.json [LogFileEnsureExists:util-logopenfile.c:737]
Error: runmodes: unable to initialize sub-module eve-log.stats [RunModeInitializeEveOutput:runmodes.c:692]

With commit:

Error: logopenfile: Error opening file: "/home/jlucovsky/src/jal/suricata-verify/tests/bug-5198/output/noperms/eve.1.json": Permission denied [SCLogOpenFileFp:util-logopenfile.c:428]
Error: runmodes: unable to initialize sub-module eve-log.stats [RunModeInitializeEveOutput:runmodes.c:692]
7 months ago
Jeff Lucovsky e72fc39f83 output/log: Improve error handling
This commit improves error handling for cases when file(s) cannot be
opened.
- Return NULL if file object can't be opened
- checks whether the file object has been opened before
  dereferencing the per-file context.

Issue: 7447
7 months ago
Jeff Lucovsky 89c9cec0bb general/typo: Fix typo in stacksize msg 7 months ago
Victor Julien 779f9d8ba3 eve/flow: add per flow TCP oob urg data counter
If TCP urgent handling is set to the OOB processing, the number of OOB
bytes is tracked for SEQ offset calculations. If this offset is
non-zero, add the field to the flow record.

Ticket: #7411.
8 months ago
Victor Julien 6882bcb3e5 stream: add TCP urgent handling options
TCP urgent handling is a complex topic due to conflicting RFCs and
implementations.

Until now the URG flag and urgent pointer values were simply ignored,
leading to an effective "inline" processing of urgent data. Many
implementations however, do not default to this behavior.

Many actual implementations use the urgent mechanism to send 1 byte of
data out of band to the application.

Complicating the matter is that the way the urgent logic is handled is
generally configurable both of the OS and the app level. So from the
network it is impossible to know with confidence what the settings are.

This patch adds the following policies:

`stream.reassembly.urgent.policy`:

- drop: drop URG packets before they affect the stream engine

- inline: ignore the urgent pointer and process all data inline

- oob (out of band): treat the last byte as out of band

- gap: skip the last byte, but do no adjust sequence offsets, leading to
       gaps in the data

For the `oob` option, tracking of a sequence number offset is required,
as the OOB data does "consume" sequence number space. This is limited to
64k. For this reason, there is a second policy:

`stream.reassembly.urgent.oob-limit-policy`:

- drop: drop URG packets before they affect the stream engine

- inline: ignore the urgent pointer and process all data inline

- gap: skip the last byte, but do no adjust sequence offsets, leading to
       gaps in the data

Bug: #7411.
8 months ago
Victor Julien 4c1554f4f6 stream: remove unused function argument
Sequence number is taken from seg, not the func arg.
8 months ago
Victor Julien ac02a71479 decode/tcp: count urg flag 8 months ago
Victor Julien d1b0d00478 flow/timeout: add frame awareness
If there are still frames in the flow, the detection and logging logic
needs to be able to evaluate them. To do this, make the flow timeout
logic aware of the frames. If frames still exist in a direction, trigger
a FFR packet to be created.

Ticket: #7440.
8 months ago
Victor Julien 0de9eee04d eve/frame: require frame length to be known
Or reach logging threshold.

Avoids logging too early.

Ticket: #7440.
8 months ago
Victor Julien 95ac92f9aa eve/frame: run logging for flow end packets
If there are frames in the flow the flow manager will create flow
timeout packets to log the remaining frames. This requires the logger to
run for those flow timeout packets.

Ticket: #7440.
8 months ago
Victor Julien db589765e4 eve/frame: remove unreachable if branch 8 months ago
Philippe Antoine 9a53ec43b1 util/streaming-buffer: add extra safety check
Ticket: 7393

Check if GrowRegionToSize is called with an argument
trying to shrink the region size, and if so do nothing,
ie do not try to shrink, and just return ok.

This way, we avoid a buffer overflow from memeset using an
unsigned having underflowed.
8 months ago
Philippe Antoine 8900041405 util/streaming-buffer: check need to grow region
Ticket: 7393

As it was possible before earlier patches to get here
with mem_size lesser than start->buf_size,
which caused then an unsigned underflow and a buffer overflow.
8 months ago
Philippe Antoine 282509f70c util/streaming-buffer: fix regions intersection
This was not a problem for current callers in Suricata,
as RegionsIntersect is only called through StreamingBufferInsertAt
which is only used by TCP...

And TCP uses default region gap = 256kb, and only calls
StreamingBufferInsertAt with a u16, so TCP never inserts a new
data that will strictly contain an existing region augmented
with region gap, which was the only case where RegionsIntersect
returned the wrong result, which could later lead to a
buffer overflow.

Ticket: 7393
8 months ago
Victor Julien 0e4faba79a detect: don't run pkt sigs on ffr pkts
Last packet from the TLS TCP session moves TCP state to CLOSED.

This flags the app-layer with APP_LAYER_PARSER_EOF_TS or
APP_LAYER_PARSER_EOF_TC depending on the direction of the final packet.
This flag will just have been set in a single direction.

This leads to the last packet updating the inspect id in that packets
direction.

At the end of the TLS session a pseudo packet is created, because:
 - flow has ended
 - inspected tx id == 0, for at least one direction
 - total txs is 1

Then a packet rule matches:

```
alert tcp any any -> any 443 (flow: to_server;                  \
        flowbits:isset,tls_error;                               \
        sid:09901033; rev:1;                                    \
        msg:"Allow TLS error handling (outgoing packet)"; )
```

The `SIG_MASK_REQUIRE_REAL_PKT` is not preventing the match, as the
`flowbits` keyword doesn't set it.

To avoid this match. This patch skips signatures of the `SIG_TYPE_PKT`
for flow end packets.

Ticket: #7318.
8 months ago
Philippe Antoine f426ee3ee2 detect: rename stream_log variables
to better reflect their true meaning
8 months ago
Philippe Antoine f2c3776314 detect: log app-layer metadata in alert with single tx
Ticket: 7199

Uses a config parameter detect.guess-applayer-tx to enable
this behavior (off by default)

This feature is requested for use cases with signatures not
using app-layer keywords but still targetting application
layer transactions, such as pass/drop rule combination,
or lua usage.

This overrides the previous behavior of checking if the signature
has a content match, by checking if there is only one live
transaction, in addition to the config parameter being set.
8 months ago
Lukas Sismis 18ab9a6ccd dpdk: set ice PMD RSS key length to 52 bytes for all DPDK versions
ICE driver (Intel E810 NIC) requires/supports 52-byte long RSS key.
The 52 byte key length was mandatory from DPDK 23.11 when Suricata
was starting with independently configured ice PMD.

However, Suricata failed to start when ice PMD was part of
net_bonding PMD, requiring 52 byte RSS key even in DPDK versions
lower than 23.11. Since the support for the longer key is present
since DPDK 19.11 the key is set to 52 bytes for all versions.

Ticket: 7444
8 months ago
Philippe Antoine b02557ac7d app-layer: track modified/processed txs
To optimize detection, and logging, to avoid going through
all the live transactions when only a few were modified.

Two boolean fields are added to the tx data: updated_tc and ts
The app-layer parsers are now responsible to set these when
needed, and the logging and detection uses them to skip
transactions that were not updated.

There may some more optimization remaining by when we set
both updated_tc and updated_ts in functions returning
a mutable transaction, by checking if all the callers
are called in one direction only (request or response)

Ticket: 7087
8 months ago
Philippe Antoine e5b98be41f fuzz: simplify target for protocol detection
As too many cases are found when splitting tcp payload
8 months ago
Philippe Antoine 261c15d0e1 fuzz: better init for protocol detection
Ticket: 7435
8 months ago
Victor Julien 7fd707a876 flow/manager: add chunk debug output 8 months ago
Victor Julien ae072d5c07 flow/manager: fix multi instance row tracking
In multi instance flow manager setups, each flow manager gets a slice
of the hash table to manage. Due to a logic error in the chunked
scanning of the hash slice, instances beyond the first would always
rescan the same (first) subslice of their slice.

The `pos` variable that is used to keep the state of what the starting
position for the next scan was supposed to be, was treated as if it held
a relative value. Relative to the bounds of the slice. It was however,
holding an absolute position. This meant that when doing it's bounds
check it was always considered out of bounds. This would reset the sub-
slice to be scanned to the first part of the instances slice.

This patch addresses the issue by correctly handling the fact that the
value is absolute.

Bug: #7365.

Fixes: e9d2417e0f ("flow/manager: adaptive hash eviction timing")
8 months ago
Juliana Fajardini a9b36d88b8 detect/engine/flowint: apply clang format changes
Related to
Task #7426
8 months ago
Juliana Fajardini 6e4a501e7c flowint: add isnotset support
Similar keywords use `isnotset`, while `flowint` only accepted `notset`
Opted to change the code, not only the regex, to keep the underlying
code also following the same patterns.

Task #7426
8 months ago
Victor Julien 2fe2cf8553 eve/alert: enrich decoder event
Default decoder event alert was very sparse, not even logging packet
type and pcap_cnt. Expand support for this record type. It will be more
useful with the ethernet headers and packet field, but these are still
disabled by default.

Ticket: #7433.
8 months ago