Deploying version 3.2.2

deliciousbrains · May 18, 2023 · 9f0b98d · 9f0b98d
1 parent bf73f7a
commit 9f0b98d
Show file tree

Hide file tree

Showing 1,234 changed files with 24,293 additions and 5,769 deletions.
diff --git a/README.md b/README.md
@@ -2,10 +2,10 @@
 
 **Contributors:** wpengine, deliciousbrains, ianmjones, eriktorsner, kevinwhoffman, tysonreeder, dalewilliams, lewisia32, mattshaw, aaemnnosttv, a5hleyrich, polevaultweb, bradt, joetan \
 **Tags:** uploads, amazon, s3, amazon s3, digitalocean, digitalocean spaces, google cloud storage, gcs, mirror, admin, media, cdn, cloudfront \
-**Requires at least:** 5.3 \
+**Requires at least:** 5.5 \
 **Tested up to:** 6.2 \
 **Requires PHP:** 7.2 \
-**Stable tag:** 3.2.1 \
+**Stable tag:** 3.2.2 \
 **License:** GPLv3
 
 Copies files to Amazon S3, DigitalOcean Spaces or Google Cloud Storage as they are uploaded to the Media Library. Optionally configure Amazon CloudFront or another CDN for faster delivery.
@@ -103,6 +103,10 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin
 
 ## Changelog
 
+### WP Offload Media Lite 3.2.2 - 2023-05-16
+
+* Security: Updated AWS SDK and Google Cloud SDK to address a vulnerability in `guzzlehttp/psr7` as reported in [CVE-2023-29197](https://nvd.nist.gov/vuln/detail/CVE-2023-29197)
+
 ### WP Offload Media Lite 3.2.1 - 2023-03-27
 
 * Bug fix: Saving settings no longer prevented when access credentials are missing but bucket is set

diff --git a/assets/css/settings.css b/assets/css/settings.css
diff --git a/assets/css/settings.min.css b/assets/css/settings.min.css
diff --git a/languages/amazon-s3-and-cloudfront-en.pot b/languages/amazon-s3-and-cloudfront-en.pot
@@ -2,14 +2,14 @@
 # # This file is distributed under the same license as the amazon-s3-and-cloudfront package.
 msgid ""
 msgstr ""
-"Project-Id-Version: amazon-s3-and-cloudfront 3.2.1\n"
+"Project-Id-Version: amazon-s3-and-cloudfront 3.2.2\n"
 "Report-Msgid-Bugs-To: mailto:nom@deliciousbrains.com\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-03-27T10:28:20+00:00\n"
+"POT-Creation-Date: 2023-05-18T08:37:11+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.5.0\n"
 "X-Domain: amazon-s3-and-cloudfront\n"

diff --git a/readme.txt b/readme.txt
@@ -1,10 +1,10 @@
 === WP Offload Media Lite for Amazon S3, DigitalOcean Spaces, and Google Cloud Storage ===
 Contributors: wpengine, deliciousbrains, ianmjones, eriktorsner, kevinwhoffman, tysonreeder, dalewilliams, lewisia32, mattshaw, aaemnnosttv, a5hleyrich, polevaultweb, bradt, joetan
 Tags: uploads, amazon, s3, amazon s3, digitalocean, digitalocean spaces, google cloud storage, gcs, mirror, admin, media, cdn, cloudfront
-Requires at least: 5.3
+Requires at least: 5.5
 Tested up to: 6.2
 Requires PHP: 7.2
-Stable tag: 3.2.1
+Stable tag: 3.2.2
 License: GPLv3
 
 Copies files to Amazon S3, DigitalOcean Spaces or Google Cloud Storage as they are uploaded to the Media Library. Optionally configure Amazon CloudFront or another CDN for faster delivery.
@@ -85,6 +85,9 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin
 
 == Changelog ==
 
+= WP Offload Media Lite 3.2.2 - 2023-05-16 =
+* Security: Updated AWS SDK and Google Cloud SDK to address a vulnerability in `guzzlehttp/psr7` as reported in [CVE-2023-29197](https://nvd.nist.gov/vuln/detail/CVE-2023-29197)
+
 = WP Offload Media Lite 3.2.1 - 2023-03-27 =
 * Bug fix: Saving settings no longer prevented when access credentials are missing but bucket is set
 * Bug fix: Changing delivery provider no longer prevented when delivery settings are incomplete

diff --git a/vendor/Aws3/Aws/Api/AbstractModel.php b/vendor/Aws3/Aws/Api/AbstractModel.php
@@ -11,6 +11,8 @@ abstract class AbstractModel implements \ArrayAccess
  protected $definition;
  /** @var ShapeMap */
  protected $shapeMap;
+ /** @var array */
+ protected $contextParam;
  /**
  * @param array $definition Service description
  * @param ShapeMap $shapeMap Shapemap used for creating shapes
@@ -19,6 +21,9 @@ public function __construct(array $definition, ShapeMap $shapeMap)
  {
  $this->definition = $definition;
  $this->shapeMap = $shapeMap;
+ if (isset($definition['contextParam'])) {
+ $this->contextParam = $definition['contextParam'];
+ }
  }
  public function toArray()
  {

diff --git a/vendor/Aws3/Aws/Api/DocModel.php b/vendor/Aws3/Aws/Api/DocModel.php
@@ -85,7 +85,12 @@ public function getShapeDocs($shapeName, $parentName, $ref)
  $result = $d['base'];
  }
  if (isset($d['append'])) {
- $result .= $d['append'];
+ if (!isset($d['excludeAppend']) || !\in_array($parentName, $d['excludeAppend'])) {
+ $result .= $d['append'];
+ }
+ }
+ if (isset($d['appendOnly']) && \in_array($parentName, $d['appendOnly']['shapes'])) {
+ $result .= $d['appendOnly']['message'];
  }
  return $this->clean($result);
  }

diff --git a/vendor/Aws3/Aws/Api/ErrorParser/JsonParserTrait.php b/vendor/Aws3/Aws/Api/ErrorParser/JsonParserTrait.php
@@ -14,7 +14,18 @@ trait JsonParserTrait
  private function genericHandler(ResponseInterface $response)
  {
  $code = (string) $response->getStatusCode();
- return ['request_id' => (string) $response->getHeaderLine('x-amzn-requestid'), 'code' => null, 'message' => null, 'type' => $code[0] == '4' ? 'client' : 'server', 'parsed' => $this->parseJson($response->getBody(), $response)];
+ if ($this->api && !\is_null($this->api->getMetadata('awsQueryCompatible')) && $response->getHeaderLine('x-amzn-query-error')) {
+ $queryError = $response->getHeaderLine('x-amzn-query-error');
+ $parts = \explode(';', $queryError);
+ if (isset($parts) && \count($parts) == 2 && $parts[0] && $parts[1]) {
+ $error_code = $parts[0];
+ $error_type = $parts[1];
+ }
+ }
+ if (!isset($error_type)) {
+ $error_type = $code[0] == '4' ? 'client' : 'server';
+ }
+ return ['request_id' => (string) $response->getHeaderLine('x-amzn-requestid'), 'code' => isset($error_code) ? $error_code : null, 'message' => null, 'type' => $error_type, 'parsed' => $this->parseJson($response->getBody(), $response)];
  }
  protected function payload(ResponseInterface $response, StructureShape $member)
  {

diff --git a/vendor/Aws3/Aws/Api/ErrorParser/JsonRpcErrorParser.php b/vendor/Aws3/Aws/Api/ErrorParser/JsonRpcErrorParser.php
@@ -26,8 +26,10 @@ public function __invoke(ResponseInterface $response, CommandInterface $command
  $data['parsed'] = \array_change_key_case($data['parsed']);
  }
  if (isset($data['parsed']['__type'])) {
- $parts = \explode('#', $data['parsed']['__type']);
- $data['code'] = isset($parts[1]) ? $parts[1] : $parts[0];
+ if (!isset($data['code'])) {
+ $parts = \explode('#', $data['parsed']['__type']);
+ $data['code'] = isset($parts[1]) ? $parts[1] : $parts[0];
+ }
  $data['message'] = isset($data['parsed']['message']) ? $data['parsed']['message'] : null;
  }
  $this->populateShape($data, $response, $command);