From: Sage Weil <sage@redhat.com>
Date: Fri, 4 May 2018 15:29:50 +0000 (-0500)
Subject: osd/OSDMap: require cephx v2 signatures based on require_min_compat_client, require_o... 
X-Git-Tag: v14.0.1~913^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1fdc85f224d52655d74eff9a29b6029b974661b3;p=ceph.git

osd/OSDMap: require cephx v2 signatures based on require_min_compat_client, require_osd_release

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 03e22ccd5ec..99ccf7716b6 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1420,6 +1420,17 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const
     mask |= kraken_features;
   }
 
+  if (require_min_compat_client >= CEPH_RELEASE_MIMIC) {
+    // if min_compat_client is >= mimic, require v2 cephx signatures
+    // from everyone
+    features |= CEPH_FEATUREMASK_CEPHX_V2;
+  } else if (require_osd_release >= CEPH_RELEASE_MIMIC &&
+	     entity_type == CEPH_ENTITY_TYPE_OSD) {
+    // if osds are >= mimic, at least require the signatures from them
+    features |= CEPH_FEATUREMASK_CEPHX_V2;
+  }
+  mask |= CEPH_FEATUREMASK_CEPHX_V2;
+
   if (pmask)
     *pmask = mask;
   return features;