Merge pull request ceph#37926 from BryceCao/wip-catch-non-int-exception

rgw : catch non int exception
senax · Dec 10, 2020 · 482599e · 482599e
2 parents b32c6f1 + bfd20a5
commit 482599e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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. */