WolfSSL
/
wolfssljni
mirror of https://github.com/wolfSSL/wolfssljni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

JNI: skip throwing Java exceptions from NativeLoggingCallback

pull/254/head
Chris Conlon 2025-02-12 11:08:11 -07:00
parent 8dfd9aebf8
commit d245630133
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
native/com_wolfssl_WolfSSL.c
View File

@ -1162,11 +1162,18 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_setLoggingCb
return ret; return ret;
} }
/**
* Native wolfSSL logging callback.
*
* We skip throwing exceptions in this function and just move on without
* printing the log. Otherwise, our non-important exception here could cause
* bad things to happen at the Java level - ie, causing the
* certificate verify callback to fail unnecessarily.
*/
void NativeLoggingCallback(const int logLevel, const char *const logMessage) void NativeLoggingCallback(const int logLevel, const char *const logMessage)
{ {
JNIEnv* jenv = NULL; JNIEnv* jenv = NULL;
jint vmret = 0; jint vmret = 0;
jclass excClass;
jclass logClass; jclass logClass;
jmethodID logMethod; jmethodID logMethod;
jstring logMsg; jstring logMsg;
@ -1197,17 +1204,6 @@ void NativeLoggingCallback(const int logLevel, const char *const logMessage)
return; return;
} }
/* find exception class */
excClass = (*jenv)->FindClass(jenv, "java/lang/Exception");
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
if (needsDetach == 1) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return;
}
/* check if our stored object reference is valid */ /* check if our stored object reference is valid */
refcheck = (*jenv)->GetObjectRefType(jenv, g_loggingCbIfaceObj); refcheck = (*jenv)->GetObjectRefType(jenv, g_loggingCbIfaceObj);
if (refcheck == 2) { if (refcheck == 2) {
@ -1220,9 +1216,6 @@ void NativeLoggingCallback(const int logLevel, const char *const logMessage)
(*jenv)->ExceptionClear(jenv); (*jenv)->ExceptionClear(jenv);
} }
(*jenv)->ThrowNew(jenv, excClass,
"Can't get native WolfSSLLoggingCallback class reference");
if (needsDetach == 1) { if (needsDetach == 1) {
(*g_vm)->DetachCurrentThread(g_vm); (*g_vm)->DetachCurrentThread(g_vm);
} }
@ -1237,8 +1230,6 @@ void NativeLoggingCallback(const int logLevel, const char *const logMessage)
(*jenv)->ExceptionDescribe(jenv); (*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv); (*jenv)->ExceptionClear(jenv);
} }
(*jenv)->ThrowNew(jenv, excClass,
"Error getting loggingCallback method from JNI");
if (needsDetach == 1) { if (needsDetach == 1) {
(*g_vm)->DetachCurrentThread(g_vm); (*g_vm)->DetachCurrentThread(g_vm);
} }
@ -1255,22 +1246,16 @@ void NativeLoggingCallback(const int logLevel, const char *const logMessage)
(*jenv)->ExceptionDescribe(jenv); (*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv); (*jenv)->ExceptionClear(jenv);
(*jenv)->ThrowNew(jenv, excClass, /* Not throwing exception, just move on without printing the log.
"Error calling logging callback from JNI"); * Otherwise, our non-important exception here could cause
* bad things to happen at the Java level - ie, causing the
* certificate verify callback to fail unnecessarily. */
if (needsDetach == 1) { if (needsDetach == 1) {
(*g_vm)->DetachCurrentThread(g_vm); (*g_vm)->DetachCurrentThread(g_vm);
} }
return; return;
} }
} else {
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
}
(*jenv)->ThrowNew(jenv, excClass,
"Object reference invalid in NativeLoggingCallback");
} }
if (needsDetach == 1) { if (needsDetach == 1) {