.

microsoft · Oct 23, 2023 · 7439497 · 7439497
1 parent 0024962
commit 7439497
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/src/apps/js_generic/js_generic_base.cpp b/src/apps/js_generic/js_generic_base.cpp
@@ -503,8 +503,9 @@ namespace ccfapp
                 "Invalid endpoint function return value (header type).");
               return;
             }
+            auto prop_val = response_headers_js.get_property(prop_name);
             auto prop_val_str =
-              ctx.to_str(response_headers_js.get_property(prop_name));
+              ctx.to_str(prop_val);
             if (!prop_val_str)
             {
               endpoint_ctx.rpc_ctx->set_error(

diff --git a/src/js/wrap.h b/src/js/wrap.h
@@ -305,6 +305,22 @@ namespace ccf::js
       return JS_IsException(val);
     }
 
+    bool is_obj() const
+    {
+      return JS_IsObject(val);
+    }
+
+    bool is_str() const
+    {
+      return JS_IsString(val);
+    }
+
+    bool is_true() const
+    {
+      int rc = JS_ToBool(ctx, val);
+      return rc > 0;
+    }
+
     JSValue take()
     {
       JSValue r = val;
@@ -506,15 +522,7 @@ namespace ccf::js
 
     JSWrappedValue get_global_property(const char* s) const
     {
-      return W(JS_GetPropertyStr(ctx, get_global_obj(), s));
-    }
-
-    JSWrappedValue stringify(
-      const JSWrappedValue& obj,
-      const JSWrappedValue& replacer,
-      const JSWrappedValue& space0) const
-    {
-      return W(JS_JSONStringify(ctx, obj, replacer, space0));
+      return W(JS_GetPropertyStr(ctx, JS_GetGlobalObject(ctx), s));
     }
 
     JSWrappedValue json_stringify(const JSWrappedValue& obj) const

diff --git a/src/node/gov/handlers/proposals.h b/src/node/gov/handlers/proposals.h
@@ -467,7 +467,7 @@ namespace ccf::gov::endpoints
 
             // Handle error cases of validation
             {
-              if (JS_IsException(validate_result))
+              if (validate_result.is_exception())
               {
                 auto [reason, trace] = js_error_message(context);
                 if (context.interrupt_data.request_timed_out)
@@ -485,7 +485,7 @@ namespace ccf::gov::endpoints
                 return;
               }
 
-              if (!JS_IsObject(validate_result))
+              if (!validate_result.is_obj())
               {
                 detail::set_gov_error(
                   ctx.rpc_ctx,
@@ -496,16 +496,14 @@ namespace ccf::gov::endpoints
               }
 
               std::string description;
-              auto desc = context(
-                JS_GetPropertyStr(context, validate_result, "description"));
-              if (JS_IsString(desc))
+              auto desc = validate_result["description"];
+              if (desc.is_str())
               {
                 description = context.to_str(desc).value_or("");
               }
 
-              auto valid =
-                context(JS_GetPropertyStr(context, validate_result, "valid"));
-              if (!JS_ToBool(context, valid))
+              auto valid = validate_result["valid"];
+              if (!valid.is_true())
               {
                 detail::set_gov_error(
                   ctx.rpc_ctx,

diff --git a/src/node/rpc/member_frontend.h b/src/node/rpc/member_frontend.h
@@ -168,7 +168,7 @@ namespace ccf
           &tx,
           js::RuntimeLimitsPolicy::NO_LOWER_THAN_DEFAULTS);
 
-        if (!JS_IsException(val))
+        if (!val.is_exception())
         {
           votes.emplace_back(mid, JS_ToBool(context, val));
         }