Merge branch 'master' into estringana/add-monitor-to-rule-actions

DataDog · Jul 27, 2023 · 48cfdee · 48cfdee
2 parents c1880aa + dd1c9fe
commit 48cfdee
Show file tree

Hide file tree

Showing 67 changed files with 2,181 additions and 2,551 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,7 +1,7 @@
 ---
 # readability-function-cognitive-complexity temporarily disabled until clang-tidy is fixed
 # right now emalloc causes it to misbehave
-Checks: '*,-bugprone-reserved-identifier,-hicpp-signed-bitwise,-llvmlibc-restrict-system-libc-headers,-altera-unroll-loops,-hicpp-named-parameter,-cert-dcl37-c,-cert-dcl51-cpp,-read,-cppcoreguidelines-init-variables,-cppcoreguidelines-avoid-non-const-global-variables,-altera-id-dependent-backward-branch,-performance-no-int-to-ptr,-altera-struct-pack-align,-google-readability-casting,-modernize-use-trailing-return-type,-llvmlibc-implementation-in-namespace,-llvmlibc-callee-namespace,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-fuchsia-default-arguments-declarations,-fuchsia-overloaded-operator,-cppcoreguidelines-pro-type-union-access,-fuchsia-default-arguments-calls,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-google-readability-todo,-llvm-header-guard,-readability-function-cognitive-complexity,-readability-identifier-length,-cppcoreguidelines-owning-memory,-cert-err58-cpp,-fuchsia-statically-constructed-objects,-google-build-using-namespace,-hicpp-avoid-goto,-cppcoreguidelines-avoid-goto,-hicpp-no-array-decay,-cppcoreguidelines-pro-bounds-array-to-pointer-decay'
+Checks: '*,-bugprone-reserved-identifier,-hicpp-signed-bitwise,-llvmlibc-restrict-system-libc-headers,-altera-unroll-loops,-hicpp-named-parameter,-cert-dcl37-c,-cert-dcl51-cpp,-read,-cppcoreguidelines-init-variables,-cppcoreguidelines-avoid-non-const-global-variables,-altera-id-dependent-backward-branch,-performance-no-int-to-ptr,-altera-struct-pack-align,-google-readability-casting,-modernize-use-trailing-return-type,-llvmlibc-implementation-in-namespace,-llvmlibc-callee-namespace,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-fuchsia-default-arguments-declarations,-fuchsia-overloaded-operator,-cppcoreguidelines-pro-type-union-access,-fuchsia-default-arguments-calls,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-google-readability-todo,-llvm-header-guard,-readability-function-cognitive-complexity,-readability-identifier-length,-cppcoreguidelines-owning-memory,-cert-err58-cpp,-fuchsia-statically-constructed-objects,-google-build-using-namespace,-hicpp-avoid-goto,-cppcoreguidelines-avoid-goto,-hicpp-no-array-decay,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers'
 WarningsAsErrors: '*'
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,8 +44,6 @@ if(NOT MSVC)
  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wextra -Wno-narrowing")
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wextra -Wno-narrowing -ggdb")
  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wno-narrowing -ggdb")
-
- add_definitions(-D__STDC_FORMAT_MACROS)
 else()
  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${LIBDDWAF_MSVC_RUNTIME_LIBRARY}")
  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} ${LIBDDWAF_MSVC_RUNTIME_LIBRARY}")
@@ -77,14 +75,14 @@ set(LIBDDWAF_SOURCE
  ${libddwaf_SOURCE_DIR}/src/ruleset_info.cpp
  ${libddwaf_SOURCE_DIR}/src/ip_utils.cpp
  ${libddwaf_SOURCE_DIR}/src/iterator.cpp
- ${libddwaf_SOURCE_DIR}/src/PWTransformer.cpp
  ${libddwaf_SOURCE_DIR}/src/utils.cpp
  ${libddwaf_SOURCE_DIR}/src/log.cpp
  ${libddwaf_SOURCE_DIR}/src/obfuscator.cpp
  ${libddwaf_SOURCE_DIR}/src/waf.cpp
  ${libddwaf_SOURCE_DIR}/src/exclusion/input_filter.cpp
  ${libddwaf_SOURCE_DIR}/src/exclusion/object_filter.cpp
  ${libddwaf_SOURCE_DIR}/src/exclusion/rule_filter.cpp
+ ${libddwaf_SOURCE_DIR}/src/parser/common.cpp
  ${libddwaf_SOURCE_DIR}/src/parser/parser.cpp
  ${libddwaf_SOURCE_DIR}/src/parser/parser_v1.cpp
  ${libddwaf_SOURCE_DIR}/src/parser/parser_v2.cpp
@@ -101,8 +99,17 @@ set(LIBDDWAF_SOURCE
  ${libddwaf_SOURCE_DIR}/src/transformer/manager.cpp
  ${libddwaf_SOURCE_DIR}/src/transformer/remove_nulls.cpp
  ${libddwaf_SOURCE_DIR}/src/transformer/remove_comments.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/shell_unescape.cpp
  ${libddwaf_SOURCE_DIR}/src/transformer/unicode_normalize.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/url_basename.cpp
  ${libddwaf_SOURCE_DIR}/src/transformer/url_decode.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/url_querystring.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/url_path.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/base64_decode.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/base64_encode.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/css_decode.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/html_entity_decode.cpp
+ ${libddwaf_SOURCE_DIR}/src/transformer/js_decode.cpp
  ${libddwaf_SOURCE_DIR}/src/transformer/common/utf8.cpp
  ${libddwaf_SOURCE_DIR}/src/libcxx-compat/monotonic_buffer_resource.cpp
 )

diff --git a/fuzzing/CMakeLists.txt b/fuzzing/CMakeLists.txt
@@ -2,7 +2,7 @@ file(GLOB_RECURSE LIBDDWAF_FUZZER_SOURCE src/*.cpp)
 add_executable(fuzzer ${LIBDDWAF_SOURCE} ${LIBDDWAF_FUZZER_SOURCE})
 
 set_target_properties(fuzzer PROPERTIES
- CXX_STANDARD 17
+ CXX_STANDARD 20
  CXX_STANDARD_REQUIRED YES
  CXX_EXTENSIONS NO)
 

diff --git a/fuzzing/scripts/build_corpus.py b/fuzzing/scripts/build_corpus.py
@@ -329,28 +329,41 @@ def get_random_transformation_array():
 
  return _get_random_array2(
  [
- "urlDecodeUni",
- "htmlEntityDecode",
- "jsDecode",
- "cssDecode",
- "cmdLine",
- "base64Decode",
- "base64DecodeExt",
- "urlDecode",
+ "keys_only",
+ "lowercase",
+ "remove_nulls",
+ "compress_whitespace",
+ "normalize_path",
+ "normalize_path_win",
+ "url_decode",
+ "url_decode_iis",
+ "css_decode",
+ "js_decode",
+ "html_entity_decode",
+ "base64_decode",
+ "base64_encode",
+ "shell_unescape",
+ "url_basename",
+ "url_path",
+ "url_querystring",
+ "remove_comments",
+ "unicode_normalize",
  "removeNulls",
+ "compressWhiteSpace",
  "normalizePath",
  "normalizePathWin",
- "compressWhiteSpace",
- "lowercase",
- # "length", # no really complex, and will skip a lot of use cases
+ "urlDecode",
+ "urlDecodeUni",
+ "cssDecode",
+ "jsDecode",
+ "htmlEntityDecode",
+ "base64Decode",
  "base64Encode",
+ "cmdLine",
  "_sqr_basename",
  "_sqr_filename",
  "_sqr_querystring",
  "removeComments",
- "numerize",
- "keys_only",
- "unicode_normalize",
  ],
  0,
  self.transformation_max_count,

diff --git a/fuzzing/src/object_builder.cpp b/fuzzing/src/object_builder.cpp
@@ -74,9 +74,9 @@ void pop_string(Data *data, ddwaf_object *object)
 
 bool popBoolean(Data *data)
 {
- bool result = false;
+ uint8_t result = 0;
  popBytes(data, &result, 1);
- return result;
+ return result > 0;
 }
 
 uint64_t popUnsignedInteger(Data *data)