client: track which request uid/gid granted a cap

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 50699c716c0ba97999c8eb95c257c43cce215088..abd01e86ca446f98dd28a042f81b4ebdf39a724d 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -813,7 +813,8 @@ void Client::_fragmap_remove_non_leaves(Inode *in)
 }
 
 Inode * Client::add_update_inode(InodeStat *st, utime_t from,
-                                MetaSession *session)
+                                MetaSession *session,
+                                uid_t request_uid, gid_t request_gid)
 {
   Inode *in;
   bool was_new = false;
@@ -910,7 +911,9 @@ Inode * Client::add_update_inode(InodeStat *st, utime_t from,
   }
 
   if (in->snapid == CEPH_NOSNAP) {
-    add_update_cap(in, session, st->cap.cap_id, st->cap.caps, st->cap.seq, st->cap.mseq, inodeno_t(st->cap.realm), st->cap.flags);
+    add_update_cap(in, session, st->cap.cap_id, st->cap.caps, st->cap.seq,
+                  st->cap.mseq, inodeno_t(st->cap.realm), st->cap.flags,
+                  request_uid, request_gid);
     if (in->auth_cap && in->auth_cap->session == session)
       in->max_size = st->max_size;
   } else
@@ -1144,7 +1147,8 @@ void Client::insert_readdir_results(MetaRequest *request, MetaSession *session,
 
       ldout(cct, 15) << "" << i << ": '" << dname << "'" << dendl;
 
-      Inode *in = add_update_inode(&ist, request->sent_stamp, session);
+      Inode *in = add_update_inode(&ist, request->sent_stamp, session,
+                                  request->get_uid(), request->get_gid());
       Dentry *dn;
       if (diri->dir->dentries.count(dname)) {
        Dentry *olddn = diri->dir->dentries[dname];
@@ -1299,12 +1303,14 @@ Inode* Client::insert_trace(MetaRequest *request, MetaSession *session)
          assert(0 == "MDS reply does not contain xattrs");
     }
 
-    in = add_update_inode(&ist, request->sent_stamp, session);
+    in = add_update_inode(&ist, request->sent_stamp, session,
+                         request->get_uid(), request->get_gid());
   }
 
   Inode *diri = NULL;
   if (reply->head.is_dentry) {
-    diri = add_update_inode(&dirst, request->sent_stamp, session);
+    diri = add_update_inode(&dirst, request->sent_stamp, session,
+                           request->get_uid(), request->get_gid());
     update_dir_dist(diri, &dst);  // dir stat info is attached to ..
 
     if (in) {
@@ -3736,7 +3742,7 @@ void Client::check_cap_issue(Inode *in, Cap *cap, unsigned issued)
 
 void Client::add_update_cap(Inode *in, MetaSession *mds_session, uint64_t cap_id,
                            unsigned issued, unsigned seq, unsigned mseq, inodeno_t realm,
-                           int flags)
+                           int flags, uid_t cap_uid, gid_t cap_gid)
 {
   Cap *cap = 0;
   mds_rank_t mds = mds_session->mds_num;
@@ -3769,6 +3775,7 @@ void Client::add_update_cap(Inode *in, MetaSession *mds_session, uint64_t cap_id
       ldout(cct, 15) << "add_update_cap first one, opened snaprealm " << in->snaprealm << dendl;
     }
     in->caps[mds] = cap = new Cap;
+
     mds_session->caps.push_back(&cap->cap_item);
     cap->session = mds_session;
     cap->inode = in;
@@ -3797,6 +3804,8 @@ void Client::add_update_cap(Inode *in, MetaSession *mds_session, uint64_t cap_id
   cap->seq = seq;
   cap->issue_seq = seq;
   cap->mseq = mseq;
+  cap->latest_uid = cap_uid;
+  cap->latest_gid = cap_gid;
   ldout(cct, 10) << "add_update_cap issued " << ccap_string(old_caps) << " -> " << ccap_string(cap->issued)
           << " from mds." << mds
           << " on " << *in
@@ -4571,17 +4580,25 @@ void Client::handle_cap_import(MetaSession *session, Inode *in, MClientCaps *m)
   ldout(cct, 5) << "handle_cap_import ino " << m->get_ino() << " mseq " << m->get_mseq()
                << " IMPORT from mds." << mds << dendl;
 
+  const mds_rank_t peer_mds = mds_rank_t(m->peer.mds);
+  Cap *cap = NULL;
+  uid_t cap_uid = -1;
+  gid_t cap_gid = -1;
+  if (m->peer.cap_id && in->caps.count(peer_mds)) {
+    cap = in->caps[peer_mds];
+    if (cap) {
+      cap_uid = cap->latest_uid;
+      cap_gid = cap->latest_gid;
+    }
+  }
+
   // add/update it
   update_snap_trace(m->snapbl);
   add_update_cap(in, session, m->get_cap_id(),
                 m->get_caps(), m->get_seq(), m->get_mseq(), m->get_realm(),
-                CEPH_CAP_FLAG_AUTH);
-
-  const mds_rank_t peer_mds = mds_rank_t(m->peer.mds);
-
-  if (m->peer.cap_id && in->caps.count(peer_mds)) {
-    Cap *cap = in->caps[peer_mds];
-    if (cap && cap->cap_id == m->peer.cap_id)
+                CEPH_CAP_FLAG_AUTH, cap_uid, cap_gid);
+  
+  if (cap && cap->cap_id == m->peer.cap_id) {
       remove_cap(cap, (m->peer.flags & CEPH_CAP_FLAG_RELEASE));
   }
   
@@ -4628,7 +4645,8 @@ void Client::handle_cap_export(MetaSession *session, Inode *in, MClientCaps *m)
       } else {
        add_update_cap(in, tsession, m->peer.cap_id, cap->issued,
                       m->peer.seq - 1, m->peer.mseq, (uint64_t)-1,
-                      cap == in->auth_cap ? CEPH_CAP_FLAG_AUTH : 0);
+                      cap == in->auth_cap ? CEPH_CAP_FLAG_AUTH : 0,
+                      cap->latest_uid, cap->latest_gid);
       }
     } else {
       if (cap == in->auth_cap)

diff --git a/src/client/Client.h b/src/client/Client.h
index 7fa22ed378bf8ecf0e35e311ad9658a8fb21c1a5..cc4970f89aa3c03249c8e17bd178230cab8b7641 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -640,7 +640,7 @@ protected:
   void check_cap_issue(Inode *in, Cap *cap, unsigned issued);
   void add_update_cap(Inode *in, MetaSession *session, uint64_t cap_id,
                      unsigned issued, unsigned seq, unsigned mseq, inodeno_t realm,
-                     int flags);
+                     int flags, uid_t cap_uid, gid_t cap_gid);
   void remove_cap(Cap *cap, bool queue_release);
   void remove_all_caps(Inode *in);
   void remove_session_caps(MetaSession *session);
@@ -724,7 +724,8 @@ protected:
                              uint64_t time_warp_seq, utime_t ctime, utime_t mtime, utime_t atime,
                              version_t inline_version, bufferlist& inline_data,
                              int issued);
-  Inode *add_update_inode(InodeStat *st, utime_t ttl, MetaSession *session);
+  Inode *add_update_inode(InodeStat *st, utime_t ttl, MetaSession *session,
+                         uid_t request_uid, gid_t request_gid);
   Dentry *insert_dentry_inode(Dir *dir, const string& dname, LeaseStat *dlease, 
                              Inode *in, utime_t from, MetaSession *session,
                              Dentry *old_dentry = NULL);

diff --git a/src/client/Inode.h b/src/client/Inode.h
index b7ed726a2df1bdffb41eabfd02cbbc2181f8eb61..b51b9d86d58ea0260f5bfd801aa3e98a3ea1e9b8 100644 (file)
--- a/src/client/Inode.h
+++ b/src/client/Inode.h
@@ -37,9 +37,12 @@ struct Cap {
   uint64_t seq, issue_seq;
   __u32 mseq;  // migration seq
   __u32 gen;
+  uid_t latest_uid;
+  gid_t latest_gid;
 
   Cap() : session(NULL), inode(NULL), cap_item(this), cap_id(0), issued(0),
-              implemented(0), wanted(0), seq(0), issue_seq(0), mseq(0), gen(0) {}
+         implemented(0), wanted(0), seq(0), issue_seq(0), mseq(0), gen(0),
+         latest_uid(-1), latest_gid(-1) {}
 
   void dump(Formatter *f) const;
 };

diff --git a/src/client/MetaRequest.h b/src/client/MetaRequest.h
index 1776bdefbe47fd1d235a517f49a13f75f1c9a138..8e13ad5f1e9ac9b8158cc832b8d050b552ce1dcf 100644 (file)
--- a/src/client/MetaRequest.h
+++ b/src/client/MetaRequest.h
@@ -171,6 +171,8 @@ public:
   void set_string2(const char *s) { path2.set_path(s, 0); }
   void set_caller_uid(unsigned u) { head.caller_uid = u; }
   void set_caller_gid(unsigned g) { head.caller_gid = g; }
+  uid_t get_uid() { return head.caller_uid; }
+  uid_t get_gid() { return head.caller_gid; }
   void set_data(const bufferlist &d) { data = d; }
   void set_dentry_wanted() {
     head.flags = head.flags | CEPH_MDS_FLAG_WANT_DENTRY;