mon: ceph osd blacklist add/rm read-write permissions not validated

The RWX permissions were retrieved from "osd blacklist list" since that
prefix matched "osd blacklist" first. Re-ordered the monitor commands
to ensure the permissions are properly enforced.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 41e3f79f1175a7e6f3ccb170ae50183b91d8f929..3d30ff11192a0b5107486e72c41b8849c0c5cedb 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -499,9 +499,6 @@ COMMAND("osd map " \
 COMMAND("osd lspools " \
        "name=auid,type=CephInt,req=false", \
        "list pools", "osd", "r", "cli,rest")
-COMMAND("osd blacklist ls", "show blacklisted clients", "osd", "r", "cli,rest")
-COMMAND("osd blacklist clear", "clear all blacklisted clients", "osd", "rw",
-        "cli,rest")
 COMMAND_WITH_FLAG("osd crush rule list", "list crush rules", "osd", "r", "cli,rest",
                  FLAG(DEPRECATED))
 COMMAND("osd crush rule ls", "list crush rules", "osd", "r", "cli,rest")
@@ -881,6 +878,9 @@ COMMAND("osd blacklist " \
        "name=expire,type=CephFloat,range=0.0,req=false", \
        "add (optionally until <expire> seconds from now) or remove <addr> from blacklist", \
        "osd", "rw", "cli,rest")
+COMMAND("osd blacklist ls", "show blacklisted clients", "osd", "r", "cli,rest")
+COMMAND("osd blacklist clear", "clear all blacklisted clients", "osd", "rw",
+        "cli,rest")
 COMMAND("osd pool mksnap " \
        "name=pool,type=CephPoolname " \
        "name=snap,type=CephString", \