Skip to content

IBX-11181: Merged branch '5.0' into 6.0 - #24

Merged
alongosz merged 2 commits into
6.0from
merge/5.0-to-6.0
Nov 3, 2026
Merged

alongosz merged 2 commits into
6.0from
merge/5.0-to-6.0

Conversation

@alongosz

@alongosz alongosz commented Nov 3, 2026

Copy link
Copy Markdown
Member

Caution

This is a merge pull request

🎫 Issue IBX-11181

Related PRs:

🤖 Generated with Claude Code

vidarl and others added 2 commits November 3, 2026 11:14
…VCL (#13)

For more details see https://ibexa.atlassian.net/browse/IBX-11181 and #13

Key changes:

* Stripped client-supplied `Forwarded`, `X-Forwarded-Host` and `X-Forwarded-Prefix` headers in `varnish.vcl` and `varnish9.vcl`, as the Upsun router does not filter them.

* Rebuilt `X-Forwarded-For` in both VCLs from the router-supplied `X-Client-IP`, and dropped it when `X-Client-IP` is absent.

* Changed `TrustedHeaderClientIpEventSubscriber` to trust the peer as a proxy only for Upsun requests with `Client-Cdn: fastly`, and to do nothing when `framework.trusted_proxies` is not configured.

* Registered `TrustedHeaderClientIpEventSubscriber` as a service in `event_subscribers.yaml` and added unit tests for it.

* Added `varnishtest` cases (`no-cdn`, `via-cdn`, `no-client-ip`) with a `run.sh` runner and Docker images for Varnish 6.0 LTS and 9, and a `varnish-vcl-tests` CI job to run them.

---------

Co-authored-by: Bartek Wajda <22300504+barw4@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@alongosz alongosz added the Fast-forward merge PR should be merged in a fast-forward way label Nov 3, 2026
@alongosz
alongosz marked this pull request as ready for review November 3, 2026 10:40
@alongosz
alongosz requested review from barw4 and vidarl November 3, 2026 10:40
@alongosz
alongosz merged commit 39e13c3 into 6.0 Nov 3, 2026
9 checks passed
@alongosz
alongosz deleted the merge/5.0-to-6.0 branch November 3, 2026 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fast-forward merge PR should be merged in a fast-forward way

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants