From: Sage Weil <sage@redhat.com>
Date: Sun, 17 Mar 2019 18:57:26 +0000 (-0500)
Subject: mon/Monitor: handle v1 call into handle_auth_request
X-Git-Tag: v15.1.0~2836^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6578fd62486bfbf7fe08b009a2cb08c23034bd2a;p=ceph-ci.git

mon/Monitor: handle v1 call into handle_auth_request

A v1 connection should "succeed" at this point because the authentication
happens via MAuth messages.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 2bca52a0c8b..f56907c7cf0 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -6192,6 +6192,14 @@ int Monitor::handle_auth_request(
 	   << " method " << auth_method
 	   << " payload " << payload.length()
 	   << dendl;
+  if (!payload.length()) {
+    if (!con->is_msgr2()) {
+      // for v1 connections, we tolerate no authorizer, because authentication
+      // happens via MAuth messages.
+      return 1;
+    }
+    return -EACCES;
+  }
   if (!more) {
     auth_meta->auth_mode = payload[0];
   }