From: cao.leilc <cao.leilc@inspur.com>
Date: Tue, 3 Nov 2020 01:16:11 +0000 (+0800)
Subject: rgw : catch non int exception
X-Git-Tag: v15.2.13~2^2~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0a97bdeff9d25b81058934dda011786b3b161c7;p=ceph.git

rgw : catch non int exception

Fixes: https://tracker.ceph.com/issues/48034
Signed-off-by: caolei <halei15848934852@163.com>
(cherry picked from commit bfd20a5436548132d5db41f532deee249c5cc6b7)
---

diff --git a/src/rgw/rgw_auth.cc b/src/rgw/rgw_auth.cc
index 60b01d8588e..2c60454e419 100644
--- a/src/rgw/rgw_auth.cc
+++ b/src/rgw/rgw_auth.cc
@@ -323,10 +323,17 @@ rgw::auth::Strategy::apply(const DoutPrefixProvider *dpp, const rgw::auth::Strat
     } catch (const int err) {
       ldpp_dout(dpp, 5) << "applier throwed err=" << err << dendl;
       return err;
+    } catch (const std::exception& e) {
+      ldpp_dout(dpp, 5) << "applier throwed unexpected err: " << e.what()
+                        << dendl;
+      return -EPERM;
     }
   } catch (const int err) {
     ldpp_dout(dpp, 5) << "auth engine throwed err=" << err << dendl;
     return err;
+  } catch (const std::exception& e) {
+    ldpp_dout(dpp, 5) << "auth engine throwed unexpected err: " << e.what()
+                      << dendl;
   }
 
   /* We never should be here. */