Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement/cldsrv 430 delete api implicit deny #5470

Merged

Conversation

benzekrimaha
Copy link
Contributor

@benzekrimaha benzekrimaha commented Dec 5, 2023

Bucket policies are not correctly interpreted, this is part of the following epic to fix that: scality/Arsenal#2181

This PR is aiming to update get apis since object and bucket authorisations are made at API level and need to support implicit denies, ticket linked to this issue here : https://scality.atlassian.net/browse/CLDSRV-430

PRs providing implicit Deny logic to CS for processing in this PR
scality/Arsenal#2181
https://github.com/scality/Vault/pull/2135
#5322
#5420
#5432
#5456
#5462

Here CI links for zenko tests :
https://github.com/scality/Zenko/actions/runs/7130054302
https://github.com/scality/Zenko/actions/runs/7130071959
https://github.com/scality/Zenko/actions/runs/7130085996

@benzekrimaha benzekrimaha force-pushed the improvement/CLDSRV-430-delete-api-implicitDeny branch from ff186d8 to b3ad1e6 Compare December 5, 2023 13:45
Base automatically changed from improvement/CLDSRV-429-get-apis-implicitDeny to development/7.10 December 7, 2023 07:48
@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Hello benzekrimaha,

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.

@scality scality deleted a comment from bert-e Dec 7, 2023
@benzekrimaha
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Incorrect fix version

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

  • 7.10.36

  • 7.70.34

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

  • 7.10.37

  • 7.70.34

  • 8.6.15

  • 8.7.35

  • 8.8.9

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

@benzekrimaha
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@scality scality deleted a comment from bert-e Dec 7, 2023
@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@scality scality deleted a comment from bert-e Dec 7, 2023
@benzekrimaha benzekrimaha force-pushed the improvement/CLDSRV-430-delete-api-implicitDeny branch from 2719387 to 6577286 Compare December 7, 2023 13:30
@benzekrimaha
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny with contents from improvement/CLDSRV-430-delete-api-implicitDeny
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny origin/development/7.70
 $ git merge origin/improvement/CLDSRV-430-delete-api-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny

The following options are set: create_integration_branches

@benzekrimaha
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-430-delete-api-implicitDeny with contents from w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-430-delete-api-implicitDeny origin/development/8.6
 $ git merge origin/w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-430-delete-api-implicitDeny

The following options are set: create_integration_branches

@benzekrimaha
Copy link
Contributor Author

ping

@scality scality deleted a comment from bert-e Dec 7, 2023
@scality scality deleted a comment from bert-e Dec 7, 2023
@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@benzekrimaha
Copy link
Contributor Author

/create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Reset complete

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

The following options are set: create_pull_requests, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny with contents from improvement/CLDSRV-430-delete-api-implicitDeny
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny origin/development/7.70
 $ git merge origin/improvement/CLDSRV-430-delete-api-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny

The following options are set: create_pull_requests, create_integration_branches

Copy link

@KazToozs KazToozs left a comment

Choose a reason for hiding this comment

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

LGTM

lib/api/bucketDeleteCors.js Show resolved Hide resolved
lib/api/multiObjectDelete.js Outdated Show resolved Hide resolved
lib/api/bucketDelete.js Outdated Show resolved Hide resolved
@benzekrimaha benzekrimaha marked this pull request as ready for review December 8, 2023 13:38
@benzekrimaha benzekrimaha force-pushed the improvement/CLDSRV-430-delete-api-implicitDeny branch from 4c2dd56 to 76b8d1f Compare December 8, 2023 14:48
@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2023

History mismatch

Merge commit #3303f5c8f77585901a9e300caff2f293db6be0a7 on the integration branch
w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny is merging a branch which is neither the current
branch improvement/CLDSRV-430-delete-api-implicitDeny nor the development branch
development/7.70.

It is likely due to a rebase of the branch improvement/CLDSRV-430-delete-api-implicitDeny 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.

The following options are set: create_pull_requests, create_integration_branches

As for multiObjectDelete,a new function was added to
ensure that all actions are allowed.
@benzekrimaha benzekrimaha force-pushed the improvement/CLDSRV-430-delete-api-implicitDeny branch from 76b8d1f to 74425d0 Compare December 8, 2023 17:29
@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2023

History mismatch

Merge commit #2eeef31ff587fd0f6b08a3f2783d0c62019c7f56 on the integration branch
w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny is merging a branch which is neither the current
branch improvement/CLDSRV-430-delete-api-implicitDeny nor the development branch
development/7.70.

It is likely due to a rebase of the branch improvement/CLDSRV-430-delete-api-implicitDeny 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.

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2023

Reset complete

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

The following options are set: create_pull_requests, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny with contents from improvement/CLDSRV-430-delete-api-implicitDeny
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny origin/development/7.70
 $ git merge origin/improvement/CLDSRV-430-delete-api-implicitDeny
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/improvement/CLDSRV-430-delete-api-implicitDeny

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2023

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_pull_requests, create_integration_branches

@benzekrimaha
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 11, 2023

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.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches will NOT be impacted:

  • 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, create_pull_requests, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 11, 2023

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches have NOT changed:

  • development/7.4

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

Goodbye benzekrimaha.

@bert-e bert-e merged commit 74425d0 into development/7.10 Dec 11, 2023
13 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-430-delete-api-implicitDeny branch December 11, 2023 07:53
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.

5 participants