libddwaf 1.8.2.0.0 → 1.9.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30f298fcc92fb8b2489965b0b4710e22de5b3350a53a7bcd2cde8b08ba093cbc
-  data.tar.gz: 88e66343e82297fdb2cb5471be19dbd84642128c8e899c77b98f67932688a21a
+  metadata.gz: bd38633600d82ecc9166a86fe314f6704d9a0e18662989811d6a4031bf313647
+  data.tar.gz: aed657ca737793808c6400966b4a05c405ef16734e53d73e0eade264fa8d360d
 SHA512:
-  metadata.gz: b6518befb55b60e1ac680a588ebaa30b913e775e54af30d1b99529fefd05d1943c4bc6c09adcaa2683a4a3367c987adda9fdf309f1967d29a8b41ec1a5c152e9
-  data.tar.gz: 561d74e78f7699287a2981599fb448438dadd6f76424d1822adf6f3d2ebe76cfc56f93c19bbac9ee3d4b501040fc0c54e533919d3b57a87a11ad8d13d042bcd5
+  metadata.gz: ac2c774e31e97902a60296084de6304cfd6f8528fadf1013b73c8cbed52a538e4b20082c3f2e6085f16e32ca27d71b767cb2a1e8c01207c07776d991210faddc
+  data.tar.gz: 99446731f04d3fff037549cba900ea96eb904b3fc8f617b57c7d6b6ff8543d0d0903b3722c52df383362d972b0204b467d54e30b2a0b4e57aac30cae8d5ae7e9

data/.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: File a bug report
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Current behaviour**
+<!-- What is be happening. -->
+
+**Expected behaviour**
+<!-- What should be happening. -->
+
+**Steps to reproduce**
+<!--
+  How can we reproduce this issue in order to diagnose it?
+  Code snippets, log messages, screenshots and sample apps are encouraged!
+-->
+
+**How does `libddwaf` help you?**
+<!-- Optionally, tell us why and how you're using ddtrace, and what your overall experience with it is! -->
+
+**Environment**
+
+* **libddwaf version:**
+* **libddwaf gem platform:**
+* **Ruby version:**
+* **Ruby platform:**
+* **Operating system:**
+

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+**What does this PR do?**
+<!-- A brief description of the change being made with this pull request. -->
+
+**Motivation**
+<!-- What inspired you to submit this pull request? -->
+
+**Additional Notes**
+<!-- Anything else we should know when reviewing? -->
+
+**How to test the change?**
+<!--
+Describe here how the change can be validated.
+You are strongly encouraged to provide automated tests for this PR.
+If this change cannot be feasibly tested, please explain why,
+unless the change does not modify code (e.g. only modifies docs, comments).
+-->
+

data/.gitignore

@@ -2,7 +2,6 @@ Gemfile.lock
 /.envrc
 /vendor/bundle
 /vendor/libddwaf
-/*.nix
 /pkg
 *.gem
 *.vim

data/lib/datadog/appsec/waf/version.rb

@@ -2,8 +2,8 @@ module Datadog
   module AppSec
     module WAF
       module VERSION
-        BASE_STRING = '1.8.2'
-        STRING = "#{BASE_STRING}.0.0"
+        BASE_STRING = '1.9.0'
+        STRING = "#{BASE_STRING}.0.1"
         MINIMUM_RUBY_VERSION = '2.1'
       end
     end

data/lib/datadog/appsec/waf.rb

@@ -4,6 +4,7 @@ require 'datadog/appsec/waf/version'
 
 module Datadog
   module AppSec
+    # rubocop:disable Metrics/ModuleLength
     module WAF
       module LibDDWAF
         class Error < StandardError
@@ -281,9 +282,9 @@ module Datadog
 
         attach_function :ddwaf_set_log_cb, [:ddwaf_log_cb, :ddwaf_log_level], :bool
 
-        DEFAULT_MAX_CONTAINER_SIZE  = 0
-        DEFAULT_MAX_CONTAINER_DEPTH = 0
-        DEFAULT_MAX_STRING_LENGTH   = 0
+        DEFAULT_MAX_CONTAINER_SIZE  = 256
+        DEFAULT_MAX_CONTAINER_DEPTH = 20
+        DEFAULT_MAX_STRING_LENGTH   = 16_384 # in bytes, UTF-8 worst case being 4x size in terms of code point)
 
         DDWAF_MAX_CONTAINER_SIZE  = 256
         DDWAF_MAX_CONTAINER_DEPTH = 20
@@ -296,6 +297,7 @@ module Datadog
         LibDDWAF.ddwaf_get_version
       end
 
+      # rubocop:disable Metrics/MethodLength
       def self.ruby_to_object(val, max_container_size: nil, max_container_depth: nil, max_string_length: nil, coerce: true)
         case val
         when Array
@@ -349,7 +351,8 @@ module Datadog
           obj
         when String
           obj = LibDDWAF::Object.new
-          val = val.to_s[0, max_string_length] if max_string_length
+          encoded_val = val.to_s.encode('utf-8', invalid: :replace, undef: :replace)
+          val = encoded_val[0, max_string_length] if max_string_length
           str = val.to_s
           res = LibDDWAF.ddwaf_object_stringl(obj, str, str.bytesize)
           if res.null?
@@ -405,6 +408,7 @@ module Datadog
           ruby_to_object(''.freeze)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def self.object_to_ruby(obj)
         case obj[:type]
@@ -699,5 +703,6 @@ module Datadog
         end
       end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

data/shell.nix

@@ -0,0 +1,35 @@
+{
+  # use the environment channel
+  pkgs ? import <nixpkgs> {},
+
+  # use a pinned package state
+  pinned ? import(fetchTarball("https://github.com/NixOS/nixpkgs/archive/14d9b465c71.tar.gz")) {},
+}:
+let
+  # specify ruby version to use
+  ruby = pinned.ruby_3_1;
+
+  # control llvm/clang version (e.g for packages built form source)
+  llvm = pinned.llvmPackages_12;
+in llvm.stdenv.mkDerivation {
+  # unique project name for this environment derivation
+  name = "libddwaf-rb.devshell";
+
+  buildInputs = [
+    ruby
+  ];
+
+  shellHook = ''
+    # get major.minor.0 ruby version
+    export RUBY_VERSION="$(ruby -e 'puts RUBY_VERSION.gsub(/\d+$/, "0")')"
+
+    # make gem install work in-project, compatibly with bundler
+    export GEM_HOME="$(pwd)/vendor/bundle/ruby/$RUBY_VERSION"
+
+    # make bundle work in-project
+    export BUNDLE_PATH="$(pwd)/vendor/bundle"
+
+    # enable calling gem scripts without bundle exec
+    export PATH="$GEM_HOME/bin:$PATH"
+  '';
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.8.2.0.0
+  version: 1.9.0.0.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -33,6 +33,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/lint.yml"
 - ".github/workflows/package.yml"
 - ".github/workflows/test.yml"
@@ -50,6 +52,7 @@ files:
 - lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
 - libddwaf.gemspec
+- shell.nix
 - sig/datadog/appsec/waf.rbs
 - sig/datadog/appsec/waf/version.rbs
 - sig/libddwaf.rbs