mon: MSG_LOG uses an in-handler cap check instead of a macro

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index c53565172cc3b1b944df0f97c97c97a7d370afff..aed7e1ebb6140e8aefe296b871c1e48a20412638 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -229,6 +229,12 @@ void LogMonitor::committed()
 bool LogMonitor::preprocess_log(MLog *m)
 {
   dout(10) << "preprocess_log " << *m << " from " << m->get_orig_source() << dendl;
+
+  if (!m->caps->check_privileges(PAXOS_LOG, MON_CAP_X)) {
+    dout(0) << "Received MLog from entity with insufficient privileges "
+           << m->caps << dendl;
+    return true; //no reply expected
+  }
   
   int num_new = 0;
   for (deque<LogEntry>::iterator p = m->entries.begin();

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index e94ae0a47f02e14be2abc2e222bdd2488b3eeb31..d0570e593d92001a80122ba9d3038ad7584dd432 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -663,7 +663,6 @@ do { \
 
       // log
     case MSG_LOG:
-      ALLOW_CAPS(PAXOS_LOG, MON_CAP_RW);
       fill_caps(m);
       paxos_service[PAXOS_LOG]->dispatch((PaxosServiceMessage*)m);
       break;