From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Sep 2018 19:02:57 +0000 (-0500)
Subject: osd: expose keyring for authenticater verification
X-Git-Tag: v14.0.1~26^2~15
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=14e3cb1555d1c8a0912640280ef5f799e17bb9c5;p=ceph.git

osd: expose keyring for authenticater verification

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3c299699cceb8..6ab07de167c4a 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6928,6 +6928,11 @@ bool OSD::ms_verify_authorizer(
   return true;
 }
 
+KeyStore *OSD::ms_get_auth1_authorizer_keystore()
+{
+  return monc->rotating_secrets.get();
+}
+
 int OSD::ms_handle_authentication(Connection *con)
 {
   int ret = 0;
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 81d0ea758c2df..25c4ffbbaa300 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -235,6 +235,7 @@ class FuseStore;
 class OSDMap;
 class MLog;
 class Objecter;
+class KeyStore;
 
 class Watch;
 class PrimaryLogPG;
@@ -2194,6 +2195,7 @@ private:
   void ms_handle_fast_connect(Connection *con) override;
   void ms_handle_fast_accept(Connection *con) override;
   int ms_handle_authentication(Connection *con) override;
+  KeyStore *ms_get_auth1_authorizer_keystore() override;
   bool ms_handle_reset(Connection *con) override;
   void ms_handle_remote_reset(Connection *con) override {}
   bool ms_handle_refused(Connection *con) override;