Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 71 insertions, 0 deletions

diff --git a/src/auth/RotatingKeyRing.cc b/src/auth/RotatingKeyRing.cc
new file mode 100644
index 000000000..4bc6af6ad
--- /dev/null
+++ b/src/auth/RotatingKeyRing.cc
@@ -0,0 +1,71 @@
+#include <map>
+
+#include "common/debug.h"
+#include "auth/RotatingKeyRing.h"
+#include "auth/KeyRing.h"
+
+#define dout_subsys ceph_subsys_auth
+#undef dout_prefix
+#define dout_prefix *_dout << "auth: "
+
+
+bool RotatingKeyRing::need_new_secrets() const
+{
+  std::lock_guard l{lock};
+  return secrets.need_new_secrets();
+}
+
+bool RotatingKeyRing::need_new_secrets(utime_t now) const
+{
+  std::lock_guard l{lock};
+  return secrets.need_new_secrets(now);
+}
+
+void RotatingKeyRing::set_secrets(RotatingSecrets&& s)
+{
+  std::lock_guard l{lock};
+  secrets = std::move(s);
+  dump_rotating();
+}
+
+void RotatingKeyRing::dump_rotating() const
+{
+  ldout(cct, 10) << "dump_rotating:" << dendl;
+  for (auto iter = secrets.secrets.begin();
+       iter != secrets.secrets.end();
+       ++iter)
+    ldout(cct, 10) << " id " << iter->first << " " << iter->second << dendl;
+}
+
+bool RotatingKeyRing::get_secret(const EntityName& name, CryptoKey& secret) const
+{
+  std::lock_guard l{lock};
+  return keyring->get_secret(name, secret);
+}
+
+bool RotatingKeyRing::get_service_secret(uint32_t service_id_, uint64_t secret_id,
+					 CryptoKey& secret) const
+{
+  std::lock_guard l{lock};
+
+  if (service_id_ != this->service_id) {
+    ldout(cct, 0) << "do not have service " << ceph_entity_type_name(service_id_)
+	    << ", i am " << ceph_entity_type_name(this->service_id) << dendl;
+    return false;
+  }
+
+  auto iter = secrets.secrets.find(secret_id);
+  if (iter == secrets.secrets.end()) {
+    ldout(cct, 0) << "could not find secret_id=" << secret_id << dendl;
+    dump_rotating();
+    return false;
+  }
+
+  secret = iter->second.key;
+  return true;
+}
+
+KeyRing* RotatingKeyRing::get_keyring()
+{
+  return keyring;
+}