RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 15:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: Use PaxosServiceMessage::caps instead of Session::caps where applicable

Browse Source
This commit is contained in:
Greg Farnum 2010-03-15 17:02:09 -07:00
parent 0c688f94be
commit e33e17ec2f
1 changed files with 7 additions and 8 deletions

15
src/mon/OSDMonitor.cc
View File

@ -1006,10 +1006,10 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
int OSDMonitor::prepare_new_pool(MPoolOp *m)
{
//check permissions for the auid, then pass off to next function
Session * session = (Session *) m->get_connection()->get_priv();
dout(10) << "prepare_new_pool from Session " << std::endl << session << dendl;
dout(10) << "prepare_new_pool from Session " << std::endl
<< ((Session *) m->get_connection()->get_priv()) << dendl;
if (m->auid) {
if(session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W, m->auid)) {
if(m->caps->check_privileges(PAXOS_OSDMAP, MON_CAP_W, m->auid)) {
return prepare_new_pool(m->name, m->auid);
} else {
dout(5) << "attempt to create new pool without sufficient auid privileges!"
@ -1017,8 +1017,8 @@ int OSDMonitor::prepare_new_pool(MPoolOp *m)
return -EPERM;
}
} else {
if (session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W)) {
return prepare_new_pool(m->name, session->caps.auid);
if (m->caps->check_privileges(PAXOS_OSDMAP, MON_CAP_W)) {
return prepare_new_pool(m->name, m->caps->auid);
} else {
dout(5) << "attempt to create new pool without sufficient caps!"
<< *m << dendl;
@ -1416,12 +1416,11 @@ bool OSDMonitor::prepare_pool_op_delete (MPoolOp *m)
bool OSDMonitor::prepare_pool_op_auid (MPoolOp *m)
{
Session * session = (Session *) m->get_connection()->get_priv();
//check that current user can write to new auid
if(session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W, m->auid)) {
if(m->caps->check_privileges(PAXOS_OSDMAP, MON_CAP_W, m->auid)) {
//check that current user can write to old auid
int old_auid = osdmap.get_pg_pool(m->pool)->v.auid;
if(session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W, old_auid)) {
if(m->caps->check_privileges(PAXOS_OSDMAP, MON_CAP_W, old_auid)) {
//update pg_pool_t with new auid
pending_inc.new_pools[m->pool] = *(osdmap.get_pg_pool(m->pool));
pending_inc.new_pools[m->pool].v.auid = m->auid;