More JNI cleanup

Signed-off-by: Fredy Wijaya <[email protected]>

mobile/library/jni/BUILD

@@ -19,7 +19,6 @@ envoy_cc_library(
         "//library/common/types:c_types_lib",
         "//library/common/types:managed_types_lib",
         "//library/common/types:matcher_data_lib",
-        "//library/jni/types:jni_exception_lib",
         "@envoy//source/common/buffer:buffer_lib",
         "@envoy//source/common/common:assert_lib",
         "@envoy//source/common/http:header_map_lib",
@@ -65,7 +64,6 @@ envoy_cc_library(
         "//library/common/extensions/cert_validator/platform_bridge:c_types_lib",
         "//library/common/extensions/key_value/platform:config",
         "//library/common/types:managed_types_lib",
-        "//library/jni/types:jni_exception_lib",
         "@envoy//source/common/protobuf",
     ],
     # We need this to ensure that we link this into the .so even though there are no code references.
@@ -88,7 +86,6 @@ envoy_cc_library(
         "//library/common/bridge:utility_lib",
         "//library/common/extensions/cert_validator/platform_bridge:c_types_lib",
         "//library/common/types:c_types_lib",
-        "//library/jni/types:jni_exception_lib",
         "@envoy//bazel:boringssl",
     ],
 )

mobile/library/jni/android_network_utility.cc

@@ -88,13 +88,15 @@ static void jvmVerifyX509CertChain(const std::vector<std::string>& cert_chain,
   JniHelper jni_helper(JniHelper::getThreadLocalEnv());
   LocalRefUniquePtr<jobject> result =
       callJvmVerifyX509CertChain(jni_helper, cert_chain, auth_type, hostname);
-  if (Exception::checkAndClear()) {
+  if (jni_helper.exceptionOccurred() != nullptr) {
     *status = CertVerifyStatus::NotYetValid;
+    jni_helper.exceptionCleared();
   } else {
     extractCertVerifyResult(jni_helper, result.get(), status, is_issued_by_known_root,
                             verified_chain);
-    if (Exception::checkAndClear()) {
+    if (jni_helper.exceptionOccurred() != nullptr) {
       *status = CertVerifyStatus::Failed;
+      jni_helper.exceptionCleared();
     }
   }
 }

mobile/library/jni/jni_helper.cc

@@ -100,6 +100,8 @@ LocalRefUniquePtr<jthrowable> JniHelper::exceptionOccurred() {
   return {env_->ExceptionOccurred(), LocalRefDeleter(env_)};
 }
 
+void JniHelper::exceptionCleared() { env_->ExceptionClear(); }
+
 GlobalRefUniquePtr<jobject> JniHelper::newGlobalRef(jobject object) {
   GlobalRefUniquePtr<jobject> result(env_->NewGlobalRef(object), GlobalRefDeleter(env_));
   return result;

mobile/library/jni/jni_helper.h

@@ -233,12 +233,20 @@ class JniHelper {
   void throwNew(const char* java_class_name, const char* message);
 
   /**
-   * Determines if an exception is being thrown.
+   * Determines if an exception is being thrown. Returns a `nullptr` if there is no exception.
    *
    * https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#exceptionoccurred
    */
   [[nodiscard]] LocalRefUniquePtr<jthrowable> exceptionOccurred();
 
+  /**
+   * Clears any exception that is currently being thrown. If no exception is currently being thrown,
+   * this function has no effect.
+   *
+   * https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#exceptionclear
+   */
+  void exceptionCleared();
+
   /**
    * Creates a new global reference to the object referred to by the `object` argument.
    *

mobile/library/jni/jni_impl.cc

@@ -211,11 +211,9 @@ jvm_on_headers(const char* method, const Envoy::Types::ManagedEnvoyHeaders& head
   Envoy::JNI::LocalRefUniquePtr<jobjectArray> result = jni_helper.callObjectMethod<jobjectArray>(
       j_context, jmid_onHeaders, static_cast<jlong>(headers.get().length),
       end_stream ? JNI_TRUE : JNI_FALSE, j_stream_intel.get());
-  // TODO(Augustyniak): Pass the name of the filter in here so that we can instrument the origin of
-  // the JNI exception better.
-  bool exception_cleared = Envoy::JNI::Exception::checkAndClear(method);
 
-  if (!exception_cleared) {
+  if (jni_helper.exceptionOccurred() != nullptr) {
+    jni_helper.exceptionCleared();
     return result;
   }