Skip to content

mon/MonCap: check profile_grants too while checking caps#37190

Merged
batrick merged 1 commit intoceph:masterfrom
rishabh-d-dave:fs-fix-47423
Sep 19, 2020
Merged

mon/MonCap: check profile_grants too while checking caps#37190
batrick merged 1 commit intoceph:masterfrom
rishabh-d-dave:fs-fix-47423

Conversation

@rishabh-d-dave
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave commented Sep 16, 2020 •
edited
Loading

When checking if a certain fs subcommand can and should be executed in
FSCommands.cc, check permissions in "profile_grants" too when the caps
for that entity contains a cap profile.

Fixes: https://tracker.ceph.com/issues/47423

Related PR: #32581

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@rishabh-d-dave rishabh-d-dave mentioned this pull request Sep 16, 2020
Closed
@rishabh-d-dave rishabh-d-dave added the wip-rishabh-testing Rishabh's testing label label Sep 16, 2020
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Sep 16, 2020 •
edited
Loading

From vstart cluster -

+ ./bin/ceph fs ls
name: a, metadata pool: cephfs.a.meta, data pools: [cephfs.a.data ]
name: cephfs2, metadata pool: cephfs2_data, data pools: [cephfs2_meta ]
+ ./bin/ceph fs volume rm cephfs2 --yes-i-really-mean-it
metadata pool: cephfs2_data data pool: ['cephfs2_meta'] removed
+ ./bin/ceph fs ls
name: a, metadata pool: cephfs.a.meta, data pools: [cephfs.a.data ]

batrick
batrick requested changes Sep 16, 2020
View reviewed changes
kotreshhr
kotreshhr reviewed Sep 16, 2020
View reviewed changes
@rishabh-d-dave rishabh-d-dave force-pushed the fs-fix-47423 branch 2 times, most recently from 0e1abec to 0b0b609 Compare September 16, 2020 18:10
@rishabh-d-dave rishabh-d-dave changed the title src/mon: check profile_grants too while checking caps mon/MonCap: check profile_grants too while checking caps Sep 16, 2020
ajarr
ajarr reviewed Sep 16, 2020
View reviewed changes
tchaikov
tchaikov reviewed Sep 17, 2020
View reviewed changes
batrick
batrick requested changes Sep 17, 2020
View reviewed changes
Copy link
Member

@batrick batrick left a comment

Choose a reason for hiding this comment

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

otherwise lgtm

@rishabh-d-dave
mon/MonCap: check profile_grants too while checking caps
e7a721f 
When checking if a certain fs subcommand can and should be executed in
FSCommands.cc, check permissions in "profile_grants" too when the caps
for that entity contains a cap profile.

Fixes: https://tracker.ceph.com/issues/47423
Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Sep 18, 2020 •
edited
Loading

@batrick @varshar16 @tchaikov

FYI: I just updated this PR branch. (Since you all might have pushed a copy of this PR branch to ceph-ci)

EDIT:
I'll update wip-rishabh-fs-fix-47423, the intended ceph-ci copy for this PR branch. Feel free to use it.

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Sep 18, 2020

test_nfs with teuth passed - https://pulpito.ceph.com/rishabh-2020-09-18_10:22:27-rados-wip-rishabh-fs-fix-47423-distro-basic-smithi/

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Sep 18, 2020

jenkins test api

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Sep 18, 2020

Link to last ceph API tests - https://jenkins.ceph.com/job/ceph-api/3321/

@varshar16 varshar16 mentioned this pull request Sep 18, 2020
Merged
@batrick
Copy link
Member

batrick commented Sep 19, 2020

https://pulpito.ceph.com/pdonnell-2020-09-18_17:47:08-fs-wip-pdonnell-testing-20200918.022453-distro-basic-smithi/

@batrick batrick merged commit 22b3d48 into ceph:master Sep 19, 2020
@rishabh-d-dave rishabh-d-dave deleted the fs-fix-47423 branch September 23, 2020 02:32
@0dig 0dig mentioned this pull request May 24, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@batrick batrick batrick approved these changes

@neha-ojha neha-ojha Awaiting requested review from neha-ojha

@tchaikov tchaikov Awaiting requested review from tchaikov

@ajarr ajarr Awaiting requested review from ajarr

@kotreshhr kotreshhr Awaiting requested review from kotreshhr

Assignees

No one assigned

Labels

bug-fix cephfs Ceph File System mon needs-qa needs-review wip-kefu-testing wip-pdonnell-testing wip-rishabh-testing Rishabh's testing label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@rishabh-d-dave @batrick @tchaikov @ajarr @kotreshhr @varshar16