Skip to content

fix(sources): cap compressed and decompressed payload size to prevent OOM - #134

Merged
harshvardhan-s1 merged 20 commits into
masterfrom
cap_decompression_bombs_across_sources
Aug 14, 2026
Merged

fix(sources): cap compressed and decompressed payload size to prevent OOM#134
harshvardhan-s1 merged 20 commits into
masterfrom
cap_decompression_bombs_across_sources

Conversation

@harshvardhan-s1

@harshvardhan-s1 harshvardhan-s1 commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Sources that decompress untrusted input fed client-controlled payloads into
unbounded read_to_end calls, letting a small upload drive an arbitrarily large
allocation and OOM-kill the daemon. Port upstream's CappedDecoder
(vectordotdev/vector#25819, commit 3162ed1a2e) into vector-common and apply it
at every affected call site.

The cap defaults to 100 MiB and is tunable with --max-decompressed-size-bytes /
VECTOR_MAX_DECOMPRESSED_SIZE_BYTES. Oversized payloads are rejected rather than
buffered. For zstd the decoder window is clamped as well, since a crafted frame
allocates its window before emitting any output and so escapes an output-size
cap entirely; under HTTP the clamp follows RFC 9659's 8 MB ceiling.

Tickets fixed:

  • OBE-11554

  • OBE-11237

  • OBE-11233

  • OBE-10708 — same call site as OBE-11233

  • OBE-10706

  • OBE-10711

  • OBE-10710

  • OBE-11557

  • OBE-11559 - 61b436a logstash malformed frames #25664, #25825

@janmejay-s1 janmejay-s1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we have used any global variables anywhere else, let us delete those too, haven't completed the first pass yet, but adding comments I have gathered so far to unblock.

Comment thread lib/vector-common/src/decompression.rs
Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-common/src/decompression.rs
Comment thread src/sources/util/http/encoding.rs Outdated
Comment thread src/sources/util/http/encoding.rs Outdated
Comment thread src/sources/util/http/encoding.rs Outdated
Comment thread src/sources/util/http/encoding.rs
Comment thread src/sources/util/http/encoding.rs

@janmejay-s1 janmejay-s1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inject &CompressionLimits here: lib/codecs/src/actions/decoding/config.rs:44

@janmejay-s1 janmejay-s1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

partial review, continuing

Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-common/src/decompression.rs
Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread lib/vector-core/src/sink/compressor.rs
Comment thread src/sources/fluent/mod.rs
Comment thread src/sources/fluent/mod.rs
Comment thread src/sources/fluent/mod.rs
Comment thread src/sources/fluent/mod.rs
Comment thread src/sources/fluent/mod.rs Outdated

@janmejay-s1 janmejay-s1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

partial, continuing to review

Comment thread src/sources/fluent/mod.rs Outdated
Comment thread src/sources/fluent/mod.rs Outdated
Comment thread src/sources/fluent/mod.rs
Comment thread src/sources/fluent/mod.rs Outdated
Comment thread src/sources/fluent/scan.rs Outdated
Comment thread src/sources/opentelemetry/mod.rs Outdated
Comment thread src/sources/splunk_hec/mod.rs Outdated
Comment thread src/sources/splunk_hec/mod.rs Outdated
Comment thread src/sources/splunk_hec/mod.rs Outdated
Comment thread src/sources/splunk_hec/mod.rs

@janmejay-s1 janmejay-s1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accepted with comments, please address before merge.

Comment thread lib/vector-common/src/decompression.rs Outdated
Comment thread src/sources/util/grpc/decompression.rs Outdated
Comment thread src/sources/vector/mod.rs Outdated
Comment thread src/sources/logstash.rs Outdated
Comment thread src/sources/logstash.rs Outdated
Comment thread src/sources/logstash.rs Outdated
Comment thread src/cli.rs Outdated
Comment thread src/cli.rs Outdated
Comment thread tests/e2e/datadog/metrics/mod.rs
Comment thread clippy.toml
harshvardhan-s1 and others added 14 commits August 13, 2026 18:51
Replaces the OnceLock globals with a CompressionLimits type carried in
GlobalOptions, per review on #134. Does NOT compile: 31 errors remain across 15
files where each source still needs to take limits from its own context.

Complete and compiling in isolation:
- vector-common: CompressionLimits + OperationalLimits as configurable
  components; statics, setter, getters and free functions deleted. Derived
  values (zlib expansion, zstd window) are methods that compute, not getters.
- vector-core: GlobalOptions.limits incl. merge precedence; Decompressor via
  From<(Compression, CompressionLimits)>; ZstdDecoder::new(reader, limits).
- codecs: chunked_gelf carries limits; FramingConfig::build(limits);
  DecodingConfig::with_compression_limits() avoids touching 31 new() callers.
- CappedDecoder::{gzip,zlib,zstd,zstd_http} take &CompressionLimits; the four
  *_with_limit variants deleted.
- src/cli.rs: --max-decompressed-size-bytes, its parser and its tests removed.
- http/encoding.rs: decode() and decode_with_limit() collapsed into one that
  takes limits; capped_body(limits). HttpSource prelude sources them from cx.
- opentelemetry fully wired.

Remaining: splunk_hec, datadog_agent (+metrics/logs/traces), otel http,
prometheus remote_write, logstash, fluent, aws_kinesis_firehose, sources/vector,
grpc decompression, sinks/util/rejection_report, components/validation.

Pattern to follow: let compression_limits = cx.globals.limits.compression; at
each source's build(), stored on the source struct where the decode happens,
passed as &CompressionLimits.

Note: CompressionLimits is a single usize and derives Copy, so the reviewer's
concern about From<(Compression, &'a CompressionLimits)> causing a lifetime
explosion does not arise - no lifetime parameter and no Arc needed.
@harshvardhan-s1
harshvardhan-s1 merged commit 46d9f7b into master Aug 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants