review changes

Author: martinzink

libminifi/src/minifi-c.cpp

@@ -616,27 +616,30 @@ void MinifiProcessContextGetDynamicProperties(MinifiProcessContext* context, Min
 MinifiStatus MinifiProcessContextGetSslData(MinifiProcessContext* process_context, MinifiStringView controller_service_name,
     void (*cb)(void* user_ctx, const MinifiSslData* ssl_data), void* user_ctx) {
   gsl_Assert(process_context != MINIFI_NULL);
-  const auto context = reinterpret_cast<minifi::core::ProcessContext*>(process_context);
-  const auto name_str = std::string{toStringView(controller_service_name)};
-  const auto service_shared_ptr = context->getControllerService(name_str, context->getProcessorInfo().getUUID());
-  if (!service_shared_ptr) { return MINIFI_STATUS_VALIDATION_FAILED; }
-  if (const auto ssl_context_service = dynamic_cast<minifi::controllers::SSLContextServiceInterface*>(service_shared_ptr.get())) {
-    const std::string ca_cert_file = ssl_context_service->getCACertificate().string();
-    const std::string passphrase = ssl_context_service->getPassphrase();
-    const std::string cert_file = ssl_context_service->getCertificateFile().string();
-    const std::string private_key_file = ssl_context_service->getPrivateKeyFile().string();
-
-    MinifiSslData ssl_data{
-        .version = 1,
+  try {
+    const auto context = reinterpret_cast<minifi::core::ProcessContext*>(process_context);
+    const auto name_str = std::string{toStringView(controller_service_name)};
+    const auto service_shared_ptr = context->getControllerService(name_str, context->getProcessorInfo().getUUID());
+    if (!service_shared_ptr) { return MINIFI_STATUS_VALIDATION_FAILED; }
+    if (const auto ssl_context_service = dynamic_cast<minifi::controllers::SSLContextServiceInterface*>(service_shared_ptr.get())) {
+      const std::string ca_cert_file = ssl_context_service->getCACertificate().string();
+      const std::string passphrase = ssl_context_service->getPassphrase();
+      const std::string cert_file = ssl_context_service->getCertificateFile().string();
+      const std::string private_key_file = ssl_context_service->getPrivateKeyFile().string();
+
+      MinifiSslData ssl_data{
         .ca_certificate_file = minifiStringView(ca_cert_file),
         .certificate_file = minifiStringView(cert_file),
         .private_key_file = minifiStringView(private_key_file),
         .passphrase = minifiStringView(passphrase),
     };
-    cb(user_ctx, &ssl_data);
-    return MINIFI_STATUS_SUCCESS;
+      cb(user_ctx, &ssl_data);
+      return MINIFI_STATUS_SUCCESS;
+    }
+    return MINIFI_STATUS_VALIDATION_FAILED;
+  } catch (...) {
+    return MINIFI_STATUS_UNKNOWN_ERROR;
   }
-  return MINIFI_STATUS_VALIDATION_FAILED;
 }
 
 

minifi-api/include/minifi-c/minifi-c.h

@@ -41,7 +41,8 @@ extern "C" {
 #define MINIFI_REGISTER_EXTENSION_FN MinifiRegisterExtension
 #endif
 
-/// To allow the proper usage of SSLContextServices set the MinifiPropertyDefinition::type to MINIFI_SSL_CONTEXT_SERVICE_PROPERTY_TYPE
+/// To declare a processor property that expects an SSLContextService,
+/// use MINIFI_SSL_CONTEXT_SERVICE_PROPERTY_TYPE in the type field of the property definition (MinifiPropertyDefinition::type)
 #define MINIFI_SSL_CONTEXT_SERVICE_PROPERTY_TYPE "org.apache.nifi.minifi.controllers.SSLContextServiceInterface"
 
 enum : uint32_t {
@@ -273,7 +274,6 @@ MinifiStatus MinifiControllerServiceContextGetProperty(MinifiControllerServiceCo
     void* user_ctx);
 
 typedef struct MinifiSslData {
-  uint8_t version;
   MinifiStringView ca_certificate_file;
   MinifiStringView certificate_file;
   MinifiStringView private_key_file;