mirror of
https://github.com/hanzoai/telemetry.git
synced 2026-10-30 20:01:49 +00:00
249717e66f
Wrap the decompressed request body reader with panicRecoverReadCloser, which recovers from panics in Read() and Close() and converts them to normal errors. This prevents decompression library panics (e.g., from malformed zstd input) from panicking the HTTP handler. See https://github.com/open-telemetry/opentelemetry-collector/issues/13228#issuecomment-3495221849 Part of https://github.com/open-telemetry/opentelemetry-collector/issues/15122 --------- Co-authored-by: Hanzo Dev <[email protected]> Co-authored-by: Alex Boten <[email protected]>
54 lines
1.3 KiB
Go
54 lines
1.3 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package confighttp // import "go.opentelemetry.io/collector/config/confighttp"
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
)
|
|
|
|
// compressReadCloser couples the original compressed reader
|
|
// and the compression reader to ensure that the original body
|
|
// is correctly closed to ensure resources are freed.
|
|
type compressReadCloser struct {
|
|
io.Reader
|
|
orig io.ReadCloser
|
|
}
|
|
|
|
var (
|
|
_ io.Reader = (*compressReadCloser)(nil)
|
|
_ io.Closer = (*compressReadCloser)(nil)
|
|
)
|
|
|
|
func (crc *compressReadCloser) Close() error {
|
|
return crc.orig.Close()
|
|
}
|
|
|
|
// panicRecoverReadCloser wraps an io.ReadCloser and recovers from
|
|
// panics during Read, converting them to errors. Some decompression
|
|
// libraries (e.g., zstd) may panic on malformed input instead of
|
|
// returning an error.
|
|
type panicRecoverReadCloser struct {
|
|
inner io.ReadCloser
|
|
}
|
|
|
|
func (pr *panicRecoverReadCloser) Read(p []byte) (n int, err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
n = 0
|
|
err = fmt.Errorf("decompression panic: %v", r)
|
|
}
|
|
}()
|
|
return pr.inner.Read(p)
|
|
}
|
|
|
|
func (pr *panicRecoverReadCloser) Close() (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("decompression close panic: %v", r)
|
|
}
|
|
}()
|
|
return pr.inner.Close()
|
|
}
|