Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cortexproject/cortex
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.21.0
Choose a base ref
...
head repository: cortexproject/cortex
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.21.1-rc.0
Choose a head ref
  • 15 commits
  • 51 files changed
  • 4 contributors

Commits on May 29, 2026

  1. Mask Swift, etcd, Redis, and HTTP basic-auth credentials (#7473) 

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 29, 2026
    Configuration menu
    Copy the full SHA
    540b773 View commit details
    Browse the repository at this point in the history

  2. drop digest verification fail packets (#7474) 

    * drop digest verification fail packets

Signed-off-by: SungJin1212 <[email protected]>

* fix lint

Signed-off-by: SungJin1212 <[email protected]>

---------

Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
    @SungJin1212 @friedrichg
    SungJin1212 authored and friedrichg committed May 29, 2026
    Configuration menu
    Copy the full SHA
    8faeaa9 View commit details
    Browse the repository at this point in the history

  3. Tenant impersonation push stream (#7475) 

    * add checking logic if not distirbutor side request

Signed-off-by: SungJin1212 <[email protected]>

* Add SignWriteRequestsKeys

Signed-off-by: SungJin1212 <[email protected]>

* change addr

Signed-off-by: SungJin1212 <[email protected]>

* fix flakiness

Signed-off-by: SungJin1212 <[email protected]>

* fix test message

Signed-off-by: SungJin1212 <[email protected]>

* Add SecretStringSliceCSV type

Signed-off-by: SungJin1212 <[email protected]>

---------

Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
    @SungJin1212 @friedrichg
    SungJin1212 authored and friedrichg committed May 29, 2026
    Configuration menu
    Copy the full SHA
    426d7c3 View commit details
    Browse the repository at this point in the history

  4. security: fix stored XSS in alertmanager and storegateway status pages ( 

    #7512)

* security: fix stored XSS in alertmanager and storegateway status pages

Replace text/template with html/template in alertmanager_http.go and
gateway_http.go to auto-escape HTML special characters. This prevents
stored XSS via crafted gossip member names rendered on status pages.

The html/template package has an identical API to text/template but
automatically escapes HTML, JS, and URI contexts.

Add TestStatusHandler_HTMLEscaping to verify XSS payloads are escaped.

Fixes #22

Signed-off-by: Daniel Blando <[email protected]>

* Fix lint

Signed-off-by: Friedrich Gonzalez <[email protected]>

* changelog

Signed-off-by: Daniel Blando <[email protected]>

---------

Signed-off-by: Daniel Blando <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
    @danielblando @friedrichg
    danielblando and friedrichg committed May 29, 2026
    Configuration menu
    Copy the full SHA
    e271370 View commit details
    Browse the repository at this point in the history

  5. security: limit decompressed gzip output in ParseProtoReader and OTLP… 

    … ingestion path (#7515)

Wrap gzip.Reader with io.LimitReader(maxSize+1) before reading
decompressed bytes in both pkg/util/http.go and pkg/util/push/otlp.go.

Signed-off-by: Daniel Blando <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
    @danielblando @friedrichg
    danielblando authored and friedrichg committed May 29, 2026
    Configuration menu
    Copy the full SHA
    66d885d View commit details
    Browse the repository at this point in the history

  6. Security: add flags for TCP connection limits and timeouts (#7518) 

    * add flags for TCP connection limits and timeouts

Signed-off-by: SungJin1212 <[email protected]>

* ensure semaphore slot is held for the lifetime of stream connections

Signed-off-by: SungJin1212 <[email protected]>

* modernize

Signed-off-by: SungJin1212 <[email protected]>

* change oversize packet log level to debug

Signed-off-by: SungJin1212 <[email protected]>

* add metrics

Signed-off-by: SungJin1212 <[email protected]>

* add stream to activeConnections to make accurate tracking

Signed-off-by: SungJin1212 <[email protected]>

* add histogram for tracking inbound packet sizes in bytes

Signed-off-by: SungJin1212 <[email protected]>

---------

Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
    @SungJin1212 @friedrichg
    SungJin1212 authored and friedrichg committed May 29, 2026
    Configuration menu
    Copy the full SHA
    9179e25 View commit details
    Browse the repository at this point in the history

  7. add WrappedHistogram with size limit before unmarshal (#7570) 

    Signed-off-by: Paurush Garg <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
    @PaurushGarg @friedrichg
    PaurushGarg authored and friedrichg committed May 29, 2026
    Configuration menu
    Copy the full SHA
    0aa625b View commit details
    Browse the repository at this point in the history

Commits on May 30, 2026

  1. Regenerate cortex.pb.go 

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 30, 2026
    Configuration menu
    Copy the full SHA
    6c8ec08 View commit details
    Browse the repository at this point in the history

  2. fixes panic when using snappy with ingester client (#7459) 

    * Triggers issue in #7456

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Including integration tests

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Fix snappy register in grpcclient.go

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Improve integration test

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Update changelog and spawn grpc integration test for this

Signed-off-by: Friedrich Gonzalez <[email protected]>

---------

Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 30, 2026
    Configuration menu
    Copy the full SHA
    ca00039 View commit details
    Browse the repository at this point in the history

  3. Prepare release candidate 0 for v1.21.1 

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 30, 2026
    Configuration menu
    Copy the full SHA
    15288b4 View commit details
    Browse the repository at this point in the history

  4. Adapt tests for go 1.25 

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 30, 2026
    Configuration menu
    Copy the full SHA
    22b8052 View commit details
    Browse the repository at this point in the history

  5. Set up target date for release 

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 30, 2026
    Configuration menu
    Copy the full SHA
    f70e08f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2026

  1. Set release in progress 

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 31, 2026
    Configuration menu
    Copy the full SHA
    6ce3ad7 View commit details
    Browse the repository at this point in the history

  2. Re add Metadatav2 to test 

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    @friedrichg
    friedrichg committed May 31, 2026
    Configuration menu
    Copy the full SHA
    2866b21 View commit details
    Browse the repository at this point in the history

  3. fix panic in stream push when context deadline expires during request… 

    … marshalling (#7541)

* fix panic in stream push when context deadline expires during request marshalling

Signed-off-by: SungJin1212 <[email protected]>

* fix error handling

Signed-off-by: SungJin1212 <[email protected]>

* extract job processing

Signed-off-by: SungJin1212 <[email protected]>

---------

Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
    @SungJin1212 @friedrichg
    SungJin1212 authored and friedrichg committed May 31, 2026
    Configuration menu
    Copy the full SHA
    5f5273f View commit details
    Browse the repository at this point in the history
Loading