Skip to content

Commit 6bbc3ba

Browse files
committed
Update 2020.03.26
1 parent 7a3f5d5 commit 6bbc3ba

File tree

1,178 files changed

+63916
-35116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,178 files changed

+63916
-35116
lines changed

composer.lock

Lines changed: 634 additions & 995 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/amzn/amazon-pay-sdk-php/AmazonPay/Client.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
class Client implements ClientInterface, LoggerAwareInterface
2525
{
26-
const SDK_VERSION = '3.7.0';
26+
const SDK_VERSION = '3.7.1';
2727
const MWS_VERSION = '2013-01-01';
2828
const MAX_ERROR_RETRY = 3;
2929

@@ -316,16 +316,21 @@ public function getUserInfo($accessToken)
316316

317317
// To make sure double encoding doesn't occur decode first and encode again.
318318
$accessToken = urldecode($accessToken);
319-
$url = $this->profileEndpoint . '/auth/o2/tokeninfo?access_token=' . $this->urlEncode($accessToken);
319+
$url = $this->profileEndpoint . '/auth/o2/tokeninfo';
320320

321321
$httpCurlRequest = new HttpCurl($this->config);
322+
$httpCurlRequest->setAccessToken($accessToken);
323+
$httpCurlRequest->setHttpHeader();
322324

323325
$response = $httpCurlRequest->httpGet($url);
324326
$data = json_decode($response);
325327

326328
// Ensure that the Access Token matches either the supplied Client ID *or* the supplied App ID
327329
// Web apps and Mobile apps will have different Client ID's but App ID should be the same
328330
// As long as one of these matches, from a security perspective, we have done our due diligence
331+
if (!isset($data->aud)) {
332+
throw new \Exception('The tokeninfo API call did not succeed');
333+
}
329334
if (($data->aud != $this->config['client_id']) && ($data->app_id != $this->config['app_id'])) {
330335
// The access token does not belong to us
331336
throw new \Exception('The Access Token belongs to neither your Client ID nor App ID');

vendor/amzn/amazon-pay-sdk-php/AmazonPay/HttpCurl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function httpGet($url, $userAgent = null)
102102

103103
// Setting the HTTP header with the Access Token only for Getting user info
104104
if ($this->header) {
105-
$this->headerArray[] = 'Authorization: bearer ' . $this->accessToken;
105+
$this->headerArray[] = 'x-amz-access-token : ' . $this->accessToken;
106106
}
107107

108108
$response = $this->execute($ch);

vendor/amzn/amazon-pay-sdk-php/CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
3.7.1 - March 2021
2+
- Fixed Secuity issue - Sending access token via HTTP header instead of query string in URL for GetUserInfo API
3+
14
3.7.0 - January 2021
25
- Added additional attribute (expect_immediate_authorization) to ConfirmOrderReference. This value can be set to true or false (Boolean). See Amazon Pay Strong Customer Authentication (SCA) Upgrade Integration Guide for more information.
36

vendor/amzn/amazon-pay-sdk-php/NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
*-*-**-***-*****-********-*************
22
Amazon Pay SDK (PHP)
3-
Copyright 2013-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
Licensed under the Apache License, Version 2.0 (the "License");
55
*-*-**-***-*****-********-*************
66

vendor/amzn/amazon-pay-sdk-php/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amzn/amazon-pay-sdk-php",
33
"type": "library",
44
"description": "Amazon Pay SDK (PHP)",
5-
"version": "3.7.0",
5+
"version": "3.7.1",
66
"keywords": [
77
"amazon",
88
"pay",

vendor/aws/aws-sdk-php/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"require": {
1919
"php": ">=5.5",
2020
"guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
21-
"guzzlehttp/psr7": "^1.4.1",
22-
"guzzlehttp/promises": "^1.0",
23-
"mtdowling/jmespath.php": "^2.5",
21+
"guzzlehttp/psr7": "^1.7.0",
22+
"guzzlehttp/promises": "^1.4.0",
23+
"mtdowling/jmespath.php": "^2.6",
2424
"ext-pcre": "*",
2525
"ext-json": "*",
2626
"ext-simplexml": "*"

vendor/aws/aws-sdk-php/src/AccessAnalyzer/AccessAnalyzerClient.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* This client is used to interact with the **Access Analyzer** service.
88
* @method \Aws\Result applyArchiveRule(array $args = [])
99
* @method \GuzzleHttp\Promise\Promise applyArchiveRuleAsync(array $args = [])
10+
* @method \Aws\Result createAccessPreview(array $args = [])
11+
* @method \GuzzleHttp\Promise\Promise createAccessPreviewAsync(array $args = [])
1012
* @method \Aws\Result createAnalyzer(array $args = [])
1113
* @method \GuzzleHttp\Promise\Promise createAnalyzerAsync(array $args = [])
1214
* @method \Aws\Result createArchiveRule(array $args = [])
@@ -15,6 +17,8 @@
1517
* @method \GuzzleHttp\Promise\Promise deleteAnalyzerAsync(array $args = [])
1618
* @method \Aws\Result deleteArchiveRule(array $args = [])
1719
* @method \GuzzleHttp\Promise\Promise deleteArchiveRuleAsync(array $args = [])
20+
* @method \Aws\Result getAccessPreview(array $args = [])
21+
* @method \GuzzleHttp\Promise\Promise getAccessPreviewAsync(array $args = [])
1822
* @method \Aws\Result getAnalyzedResource(array $args = [])
1923
* @method \GuzzleHttp\Promise\Promise getAnalyzedResourceAsync(array $args = [])
2024
* @method \Aws\Result getAnalyzer(array $args = [])
@@ -23,6 +27,10 @@
2327
* @method \GuzzleHttp\Promise\Promise getArchiveRuleAsync(array $args = [])
2428
* @method \Aws\Result getFinding(array $args = [])
2529
* @method \GuzzleHttp\Promise\Promise getFindingAsync(array $args = [])
30+
* @method \Aws\Result listAccessPreviewFindings(array $args = [])
31+
* @method \GuzzleHttp\Promise\Promise listAccessPreviewFindingsAsync(array $args = [])
32+
* @method \Aws\Result listAccessPreviews(array $args = [])
33+
* @method \GuzzleHttp\Promise\Promise listAccessPreviewsAsync(array $args = [])
2634
* @method \Aws\Result listAnalyzedResources(array $args = [])
2735
* @method \GuzzleHttp\Promise\Promise listAnalyzedResourcesAsync(array $args = [])
2836
* @method \Aws\Result listAnalyzers(array $args = [])
@@ -43,5 +51,7 @@
4351
* @method \GuzzleHttp\Promise\Promise updateArchiveRuleAsync(array $args = [])
4452
* @method \Aws\Result updateFindings(array $args = [])
4553
* @method \GuzzleHttp\Promise\Promise updateFindingsAsync(array $args = [])
54+
* @method \Aws\Result validatePolicy(array $args = [])
55+
* @method \GuzzleHttp\Promise\Promise validatePolicyAsync(array $args = [])
4656
*/
4757
class AccessAnalyzerClient extends AwsClient {}

vendor/aws/aws-sdk-php/src/Acm/AcmClient.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* @method \GuzzleHttp\Promise\Promise describeCertificateAsync(array $args = [])
1515
* @method \Aws\Result exportCertificate(array $args = [])
1616
* @method \GuzzleHttp\Promise\Promise exportCertificateAsync(array $args = [])
17+
* @method \Aws\Result getAccountConfiguration(array $args = [])
18+
* @method \GuzzleHttp\Promise\Promise getAccountConfigurationAsync(array $args = [])
1719
* @method \Aws\Result getCertificate(array $args = [])
1820
* @method \GuzzleHttp\Promise\Promise getCertificateAsync(array $args = [])
1921
* @method \Aws\Result importCertificate(array $args = [])
@@ -22,6 +24,8 @@
2224
* @method \GuzzleHttp\Promise\Promise listCertificatesAsync(array $args = [])
2325
* @method \Aws\Result listTagsForCertificate(array $args = [])
2426
* @method \GuzzleHttp\Promise\Promise listTagsForCertificateAsync(array $args = [])
27+
* @method \Aws\Result putAccountConfiguration(array $args = [])
28+
* @method \GuzzleHttp\Promise\Promise putAccountConfigurationAsync(array $args = [])
2529
* @method \Aws\Result removeTagsFromCertificate(array $args = [])
2630
* @method \GuzzleHttp\Promise\Promise removeTagsFromCertificateAsync(array $args = [])
2731
* @method \Aws\Result renewCertificate(array $args = [])

vendor/aws/aws-sdk-php/src/Arn/ArnParser.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
namespace Aws\Arn;
33

44
use Aws\Arn\S3\AccessPointArn as S3AccessPointArn;
5+
use Aws\Arn\ObjectLambdaAccessPointArn;
56
use Aws\Arn\S3\OutpostsBucketArn;
67
use Aws\Arn\S3\RegionalBucketArn;
78
use Aws\Arn\S3\OutpostsAccessPointArn;
@@ -35,6 +36,9 @@ public static function isArn($string)
3536
public static function parse($string)
3637
{
3738
$data = Arn::parse($string);
39+
if ($data['service'] === 's3-object-lambda') {
40+
return new ObjectLambdaAccessPointArn($string);
41+
}
3842
$resource = self::explodeResourceComponent($data['resource']);
3943
if ($resource[0] === 'outpost') {
4044
if (isset($resource[2]) && $resource[2] === 'bucket') {

0 commit comments

Comments
 (0)