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.

Sign up for GitHub

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

Jump to bottom

luminous: rgw: get or set rgw realm zonegroup zone should check user's caps for security #25416

Closed
wants to merge 2 commits into from
Closed

luminous: rgw: get or set rgw realm zonegroup zone should check user's caps for security #25416

wants to merge 2 commits into from

Conversation

pdvian
Copy link

@pdvian pdvian commented Dec 5, 2018

yuliyang and others added 2 commits December 5, 2018 01:18
rgw: get or set realm zonegroup zone need check user's caps
cd09624 
fix: https://tracker.ceph.com/issues/37352

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit 6ecaec9)

Conflicts:
	src/rgw/rgw_rest_config.h : Resolved for check_caps
	src/rgw/rgw_rest_realm.cc : Resolved for check_caps and verify_permission
@cbodley
qa/rgw: add credentials to zone 'remove' in test_zonegroup_remove()
57c18d6 
zone credentials are required to 'period update --commit' from
--rgw-zone remove

Signed-off-by: Casey Bodley <cbodley@redhat.com>

Conflicts:
	src/test/rgw/rgw_multi/tests.py
(cherry picked from commit 56021ea)

Conflicts:
	src/test/rgw/rgw_multi/tests.py : Resolved for multisite
@tchaikov tchaikov added this to the luminous milestone Dec 6, 2018
@smithfarm smithfarm added the rgw label Dec 6, 2018
@smithfarm smithfarm changed the title luminous: get or set rgw realm zonegroup zone should check user's caps for security luminous: rgw: get or set rgw realm zonegroup zone should check user's caps for security Dec 6, 2018
@yuriw
Copy link
Contributor

yuriw commented Jan 3, 2019

@pdvian pls resolve conflicts 👍

--- pr 25416 --- pulling https://github.com/pdvian/ceph.git branch wip-37497-luminous
remote: Enumerating objects: 11, done.
remote: Counting objects: 100% (11/11), done.
remote: Total 13 (delta 11), reused 11 (delta 11), pack-reused 2
Unpacking objects: 100% (13/13), done.
From https://github.com/pdvian/ceph

  • branch wip-37497-luminous -> FETCH_HEAD
    Auto-merging src/test/rgw/rgw_multi/tests.py
    CONFLICT (content): Merge conflict in src/test/rgw/rgw_multi/tests.py
    Automatic merge failed; fix conflicts and then commit the result.
    Traceback (most recent call last):
    File "/home/yuriw/wip_master/src/script/build-integration-branch", line 62, in
    assert not r
    AssertionError

@smithfarm
Copy link
Contributor

@pdvian Pinging for rebase.

@smithfarm
Copy link
Contributor

No response.

@smithfarm smithfarm closed this May 30, 2019
@cbodley
Copy link
Contributor

cbodley commented May 30, 2019

see #28332

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbodley cbodley cbodley approved these changes

@yehudasa yehudasa Awaiting requested review from yehudasa

Assignees
No one assigned
Labels
DNM needs-rebase rgw
Projects
None yet
Milestone
luminous
Development

Successfully merging this pull request may close these issues.
5 participants
@pdvian @yuriw @smithfarm @cbodley @tchaikov