Skip to content

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

Open
vidarl wants to merge 9 commits into
6.0from
merge/5.0-to-6.0
Open

vidarl wants to merge 9 commits into
6.0from
merge/5.0-to-6.0

Conversation

@vidarl

@vidarl vidarl commented Nov 3, 2026 •

Copy link
Copy Markdown
Contributor

vidarl and others added 7 commits October 28, 2026 17:23
…VCL (#87)

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

Key changes:

* Stripped client-supplied `X-Forwarded-*`, `Forwarded`, `X-Client-IP` and `Client-Cdn` headers in `vcl_recv` of `varnish5/6/7/9.vcl` unless the peer is in the new `trusted_proxies` ACL

* Overwrote `X-Forwarded-For` with the real client IP for untrusted peers

* Added the `trusted_proxies` ACL to `parameters.vcl` and documented it in the Varnish README

* Added varnishtest coverage for trusted and untrusted peers, run in a new CI job

* Added Behat coverage for header filtering and trusted proxy pass-through
For more details see https://ibexa.atlassian.net/browse/IBX-11181 and #111

Key changes:

* Fixed the `ibexa/rest`, `ibexa/behat` and `ibexa/doctrine-schema` version constraints in `composer.json` to use `~4.6.x-dev`, aligning them with the other 4.6 Ibexa packages.

* Removed the `ibexa/ci-scripts` dev dependency from `composer.json`.

---------

Co-Authored-By: Andrew Longosz <alongosz@users.noreply.github.com>
# Conflicts:
#	composer.json
@vidarl vidarl added the Fast-forward merge PR should be merged in a fast-forward way label Nov 3, 2026
@vidarl
vidarl marked this pull request as ready for review November 3, 2026 10:27
@vidarl vidarl closed this Nov 3, 2026
@vidarl vidarl reopened this Nov 3, 2026
@vidarl

vidarl commented Nov 3, 2026

Copy link
Copy Markdown
Contributor Author

@alongosz : SonarCloud complains about duplications in behat_suites.php. Okay to leave as-is?
A fix would require a factory or something I think?

@alongosz

alongosz commented Nov 3, 2026

Copy link
Copy Markdown
Member

@alongosz : SonarCloud complains about duplications in behat_suites.php. Okay to leave as-is? A fix would require a factory or something I think?

No, this one can be skipped as pre-existing. There's no way to mark code duplication as resolved, so we will just merge this with red Sonar (mentioning this because it should be an exception, not a habit ;-) ).

@vidarl vidarl closed this Nov 3, 2026
@vidarl vidarl reopened this Nov 3, 2026
@sonarqubecloud

sonarqubecloud Bot commented Nov 3, 2026

Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
7.4% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

Comment thread composer.json
"toflar/psr6-symfony-http-cache-store": "^4.2"
},
"require-dev": {
"behat/behat": "^4.0@alpha",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@vidarl what's the source of this change?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It was in order to be able to do this here on 6.0 without changing minimum requierment

        "ibexa/behat": "~6.0.x-dev",

see for instance admin-ui : ibexa/admin-ui@6cd6dfd

The commit where I added this here is named "Allowed the alpha behat packages ibexa/behat 6.0 requires", in an attempt to explain that

@alongosz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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