Skip to content

bugfix: CLDSRV-291 test for HEAD object with bucket policy#4851

Merged
bert-e merged 2 commits intodevelopment/7.10from
bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy
Nov 3, 2022
Merged

bugfix: CLDSRV-291 test for HEAD object with bucket policy#4851
bert-e merged 2 commits intodevelopment/7.10from
bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy

Conversation

@jonathan-gramain
Copy link
Contributor

Add unit tests to show that HEAD object requests are allowed when bucket policy grants the s3:GetObject permission to another account or user

Add unit tests to show that HEAD object requests are allowed when
bucket policy grants the `s3:GetObject` permission to another account
or user
@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

Hello jonathan-gramain,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

Incorrect fix version

The Fix Version/s in issue CLDSRV-291 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.19

  • 7.70.10

  • 8.4.15

  • 8.5.17

  • 8.6.2

Please check the Fix Version/s of CLDSRV-291, or the target
branch of this pull request.

@jonathan-gramain
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.4/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy with contents from w/7.70/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy
and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy origin/development/8.4
 $ git merge origin/w/7.70/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy

});

it('should allow access to non-object owner for objectHead action with s3:GetObject permission',
function itFn(done) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why no arrow function like in the previous tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's to access the this variable, actually most of the previous tests have an actual function for that reason

done();
});
it('should deny access to non-object owner for objectHead action without s3:GetObject permission',
function itFn(done) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question as above.

@jonathan-gramain jonathan-gramain force-pushed the bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy branch from daab172 to 9505422 Compare November 2, 2022 22:03
@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

History mismatch

Merge commit #daab1729ef0ec0ff3012ebc1127841c4efcf7d84 on the integration branch
w/7.70/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy is merging a branch which is neither the current
branch bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@jonathan-gramain
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.4/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy with contents from w/7.70/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy
and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy origin/development/8.4
 $ git merge origin/w/7.70/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy

@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Nov 2, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2022

History mismatch

Merge commit #6325b175625ba06109baa1c9772563b5f4790d53 on the integration branch
w/8.5/bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy is merging a branch which is neither the current
branch bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy nor the development branch
development/8.5.

It is likely due to a rebase of the branch bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@jonathan-gramain
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@jonathan-gramain
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/6.4
  • development/7.4

Please check the status of the associated issue CLDSRV-291.

Goodbye jonathan-gramain.

@bert-e bert-e merged commit 9505422 into development/7.10 Nov 3, 2022
@bert-e bert-e deleted the bugfix/CLDSRV-291-testObjectHeadWithBucketPolicy branch November 3, 2022 23:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants