Add support for all ddwaf_object types in from_ddwaf_object (#145)

Author: CarlesDD

src/convert.cpp

@@ -250,12 +250,21 @@ Napi::Value from_ddwaf_object(const ddwaf_object *object, Napi::Env env) {
   Napi::Value result;
 
   switch (type) {
+    case DDWAF_OBJ_NULL:
+      result = env.Null();
+      break;
+    case DDWAF_OBJ_BOOL:
+      result = Napi::Boolean::New(env, object->boolean);
+      break;
     case DDWAF_OBJ_SIGNED:
       result = Napi::Number::New(env, object->intValue);
       break;
     case DDWAF_OBJ_UNSIGNED:
       result = Napi::Number::New(env, object->uintValue);
       break;
+    case DDWAF_OBJ_FLOAT:
+      result = Napi::Number::New(env, object->f64);
+      break;
     case DDWAF_OBJ_STRING:
       result = Napi::String::New(env, object->stringValue, object->nbEntries);
       break;

test/index.js

@@ -42,6 +42,7 @@ describe('DDWAF', () => {
           'value_matchall',
           'key_matchall',
           'custom_action_rule',
+          'test-marshalling',
           'long_rule'
         ],
         skipped: [],
@@ -417,6 +418,7 @@ describe('DDWAF', () => {
             'value_matchall',
             'key_matchall',
             'custom_action_rule',
+            'test-marshalling',
             'long_rule'
           ],
           failed: ['invalid_1', 'invalid_2', 'invalid_3'],
@@ -970,6 +972,32 @@ describe('DDWAF', () => {
     waf.dispose()
   })
 
+  it('should perform correct marshalling of ddwaf_object', () => {
+    const waf = new DDWAF(rules, 'recommended')
+    const context = waf.createContext()
+    const result = context.run({
+      persistent: {
+        'server.request.headers.no_cookies': 'marshalling'
+      }
+    }, TIMEOUT)
+
+    assert.strictEqual(result.timeout, false)
+    assert.strictEqual(result.status, 'match')
+    assert.strictEqual(result.keep, true)
+    assert.strictEqual(result.attributes['_dd.appsec.trace.integer'], 662607015)
+    assert.strictEqual(result.attributes['_dd.appsec.trace.negative_integer'], -662607015)
+    assert.strictEqual(result.attributes['_dd.appsec.trace.float'], 2.71828)
+    assert.strictEqual(result.attributes['_dd.appsec.trace.negative_float'], -3.14159)
+    assert.strictEqual(result.attributes['_dd.appsec.trace.bool'], true)
+    assert.strictEqual(
+      result.attributes['_dd.appsec.trace.string'],
+      'It was a bright cold day in April, and the clocks were striking thirteen.'
+    )
+
+    context.dispose()
+    waf.dispose()
+  })
+
   describe('Action semantics', () => {
     it('should support action definition in initialisation', () => {
       const waf = new DDWAF(rules, 'recommended')

test/rules.json

@@ -213,6 +213,54 @@
         "customblock"
       ]
     },
+    {
+      "id": "test-marshalling",
+      "name": "Test ddwaf_object marshalling",
+      "tags": {
+        "type": "security_scanner",
+        "category": "attack_attempt"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.headers.no_cookies"
+              }
+            ],
+            "list": [
+              "marshalling"
+            ]
+          },
+          "operator": "phrase_match"
+        }
+      ],
+      "output": {
+        "event": false,
+        "keep": true,
+        "attributes": {
+          "_dd.appsec.trace.string": {
+            "value": "It was a bright cold day in April, and the clocks were striking thirteen."
+          },
+          "_dd.appsec.trace.integer": {
+            "value": 662607015
+          },
+          "_dd.appsec.trace.negative_integer": {
+            "value": -662607015
+          },
+          "_dd.appsec.trace.float": {
+            "value": 2.71828
+          },
+          "_dd.appsec.trace.negative_float": {
+            "value": -3.14159
+          },
+          "_dd.appsec.trace.bool": {
+            "value": true
+          }
+        }
+      },
+      "on_match": []
+    },
     {
       "id": "long_rule",
       "name": "long rule that shouldn't be truncated",