From 5d53f663903de8b0a816e4f7eede8c3edc1690d4 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Wed, 22 Jun 2022 08:10:00 +0200
Subject: [PATCH] [BUGFIX] Update guzzlehttp/guzzle to 7.4.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The maintainers of the package guzzlehttp/guzzle released a new version
7.4.5 that fixes two security issues:
* CURLOPT_HTTPAUTH option not cleared on change of origin [1]
* Change in port should be considered a change in origin [2]
Executed commands:
composer require \
guzzlehttp/guzzle:^7.4.5 \
-W
composer require \
-d typo3/sysext/core \
guzzlehttp/guzzle:^7.4.5 \
--no-update
[1] https://github.com/guzzle/guzzle/security/advisories/GHSA-25mq-v84q-4j7r
[2] https://github.com/guzzle/guzzle/security/advisories/GHSA-q559-8m2m-g699
Resolves: #97802
Releases: main, 11.5, 10.4
Change-Id: Ia49f75f8ed078beb43ba42f89efdd8e68ee146c5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74972
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
---
composer.json | 2 +-
composer.lock | 30 +++++++++++++++---------------
typo3/sysext/core/composer.json | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/composer.json b/composer.json
index ba983b98f808..4629385dca98 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
"doctrine/lexer": "^1.2.3",
"egulias/email-validator": "^3.1",
"enshrined/svg-sanitize": "^0.15.4",
- "guzzlehttp/guzzle": "^7.4.4",
+ "guzzlehttp/guzzle": "^7.4.5",
"guzzlehttp/promises": "^1.4.0",
"guzzlehttp/psr7": "^1.8.5 || ^2.1.2",
"lolli42/finediff": "^1.0.1",
diff --git a/composer.lock b/composer.lock
index a4f4f2c60414..1d54ff681fd7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "e7b6ae1818b11f1b9deb74e5fd08f4b6",
+ "content-hash": "4ddfaa7a5defe2ced94d76525ac24180",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -823,22 +823,22 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.4.4",
+ "version": "7.4.5",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8"
+ "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
- "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+ "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5",
- "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+ "guzzlehttp/psr7": "^1.9 || ^2.4",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -927,7 +927,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.4.4"
+ "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
},
"funding": [
{
@@ -943,7 +943,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-09T21:39:15+00:00"
+ "time": "2022-06-20T22:16:13+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -1031,16 +1031,16 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "2.3.0",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee"
+ "reference": "13388f00956b1503577598873fffb5ae994b5737"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee",
- "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
+ "reference": "13388f00956b1503577598873fffb5ae994b5737",
"shasum": ""
},
"require": {
@@ -1064,7 +1064,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev"
+ "dev-master": "2.4-dev"
}
},
"autoload": {
@@ -1126,7 +1126,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.3.0"
+ "source": "https://github.com/guzzle/psr7/tree/2.4.0"
},
"funding": [
{
@@ -1142,7 +1142,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-09T08:26:02+00:00"
+ "time": "2022-06-20T21:43:11+00:00"
},
{
"name": "lolli42/finediff",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index ac3bb299b180..9adb2f36973d 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -37,7 +37,7 @@
"doctrine/lexer": "^1.2.3",
"egulias/email-validator": "^3.1",
"enshrined/svg-sanitize": "^0.15.4",
- "guzzlehttp/guzzle": "^7.4.4",
+ "guzzlehttp/guzzle": "^7.4.5",
"guzzlehttp/psr7": "^1.8.5 || ^2.1.2",
"lolli42/finediff": "^1.0.1",
"masterminds/html5": "^2.7.5",
--
GitLab