Merge pull request ceph#55229 from tobias-urdin/http-error-keystone-issue-admin-token-request

rgw: fix http error check in keystone issue_admin_token_request

Reviewed-by: Casey Bodley <[email protected]>

Author: cbodley

src/rgw/rgw_keystone.cc

@@ -211,16 +211,18 @@ int Service::issue_admin_token_request(const DoutPrefixProvider *dpp,
   token_req.set_url(token_url);
 
   const int ret = token_req.process(y);
-  if (ret < 0) {
-    return ret;
-  }
 
   /* Detect rejection earlier than during the token parsing step. */
   if (token_req.get_http_status() ==
           RGWGetKeystoneAdminToken::HTTP_STATUS_UNAUTHORIZED) {
     return -EACCES;
   }
 
+  // throw any other http or connection errors
+  if (ret < 0) {
+    return ret;
+  }
+
   if (t.parse(dpp, token_req.get_subject_token(), token_bl,
               keystone_version) != 0) {
     return -EINVAL;