From: Sage Weil <sage@redhat.com>
Date: Tue, 23 Apr 2019 18:52:07 +0000 (-0500)
Subject: mon/MonClient: discard old challenge if authorizer is bad
X-Git-Tag: v15.1.0~2836^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc8d9c11350a908d61f12a1ee34be589fc1af820;p=ceph.git

mon/MonClient: discard old challenge if authorizer is bad

If we are a server/accepter, and we get a bad authorizer, discard our old
challenge, since the previous exchange has failed.  This way if the client
retries, their new authorize attempt won't conflict with our old challenge.

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 8df084b7df6d..d01c436a2358 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -1472,6 +1472,8 @@ int MonClient::handle_auth_request(
     return 0;
   }
   ldout(cct,10) << __func__ << " bad authorizer on " << con << dendl;
+  // discard old challenge
+  auth_meta->authorizer_challenge.reset();
   return -EACCES;
 }