maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix aws-sdk-php functional test cases for GCS gateway (#8613)

Browse source 
Fixes #8570
This commit is contained in:
Praveen raj Mani 2019-12-16 12:41:49 +05:30 committed by Nitish Tiwari
parent 1dc5f2d0af
commit 842d0241ed
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mint/run/core/aws-sdk-php/quick-tests.php
View file

@ -818,6 +818,28 @@ function testAnonDeleteObjects($s3Client, $params) {
}
}
// Check if the policy statements are equal
function are_statements_equal($expected, $got) {
$expected = json_decode($expected, TRUE);
$got = json_decode($got, TRUE);
function are_actions_equal($action1, $action2) {
return (
is_array($action1)
&& is_array($action2)
&& count($action1) == count($action2)
&& array_diff($action1, $action2) === array_diff($action2, $action1)
);
}
foreach ($expected['Statement'] as $index => $value) {
if (!are_actions_equal($value['Action'], $got['Statement'][$index]['Action']))
return FALSE;
}
return TRUE;
}
/**
* testBucketPolicy tests GET/PUT Bucket policy S3 APIs
*
@ -830,8 +852,7 @@ function testAnonDeleteObjects($s3Client, $params) {
function testBucketPolicy($s3Client, $params) {
$bucket = $params['Bucket'];
// Taken from policy set using `mc policy download`
$downloadPolicy = sprintf('{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"AWS":["*"]},"Action":["s3:GetObject"],"Resource":["arn:aws:s3:::%s/*"]}]}', $bucket);
$downloadPolicy = sprintf('{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"AWS":["*"]},"Action":["s3:GetBucketLocation","s3:ListBucket","s3:GetObject"],"Resource":["arn:aws:s3:::%s","arn:aws:s3:::%s/*"]}]}', $bucket, $bucket);
$result = $s3Client->putBucketPolicy([
'Bucket' => $bucket,
@ -846,7 +867,9 @@ function testBucketPolicy($s3Client, $params) {
$bucket);
if ($result['Policy'] != $downloadPolicy)
throw new Exception('bucket policy we got is not we set');
if (!are_statements_equal($result['Policy'], $downloadPolicy))
throw new Exception('bucket policy we got is not we set');
// Delete the bucket, make the bucket (again) and check if policy is none
// Ref: https://github.com/minio/minio/issues/4714