Backport #3524971: Defend against \GuzzleHttp\Cookie\FileCookieJar gadget chain to:

  • 11.4.x
  • 11.3.x
  • 10.6.x

Plus a deprecation fix to the original shim that was already committed to 11.x

Issue fork drupal-3620645

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

mcdruid created an issue. See original summary.

mcdruid opened merge request !16965

mcdruid opened merge request !16966

mcdruid opened merge request !16967

mcdruid’s picture

mcdruid commented

I've created the 3 MRs (full disclosure: with some help from Claude).

11.4.x looks okay, but the other two are failing some tests. I'll see if I can sort that out.

mcdruid’s picture

mcdruid commented
Title: Backport Guzzle FW Gadget Chain shim » Guzzle FW Gadget Chain shim followup
Issue summary: View changes

mcdruid opened merge request !16968

mcdruid’s picture

mcdruid commented
Status: Active » Needs review

All MRs are green.

The change from what was committed to 11.x in the parent is to address:

1) /builds/vendor/symfony/deprecation-contracts/function.php:25
Since guzzlehttp/guzzle 7.15: GuzzleHttp\Utils::jsonEncode() is deprecated and will be removed in 8.0. Use PHP's json_encode() instead.

..and same thing for decode.

IIUC this wasn't apparent while guzzle is pinned to an earlier release (7.12.1) which predates the deprecation.

smustgrave’s picture

smustgrave commented
Status: Needs review » Reviewed & tested by the community

Seems like a good backport, know that couldn't of been fun.

  • longwave committed af126e4a on 10.6.x 
    fix: #3620645 Guzzle FW Gadget Chain shim followup

By: mcdruid
By:...

  • longwave committed 88875215 on 11.3.x 
    fix: #3620645 Guzzle FW Gadget Chain shim followup

By: mcdruid
By:...

  • longwave committed 261ee4e7 on 11.4.x 
    fix: #3620645 Guzzle FW Gadget Chain shim followup

By: mcdruid
By:...
longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Version: 11.4.x-dev » 10.6.x-dev
Status: Reviewed & tested by the community » Fixed

Committed and pushed to 11.x, 11.4.x, 11.3.x and 10.6.x. Thanks!

I credited everyone who was involved in the original issue as this is a backport.

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.

  • longwave committed 6379cc8e on 11.x 
    fix: #3620645 Guzzle FW Gadget Chain shim followup

By: mcdruid
By:...

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.