R&D External deps

.github/workflows/build.yml

@@ -94,6 +94,8 @@ jobs:
           submodules: recursive
       - name: Create Build Directory
         run: cmake -E make_directory ${{ github.workspace }}/build ${{ github.workspace }}/packages
+      - name: Download cargo arm64 target
+        run: rustup target add aarch64-apple-darwin
       - name: Generating Build Scripts
         run: cmake -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMACOSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }} -DCPACK_PACKAGE_DIRECTORY=${{ github.workspace }}/packages ${{ github.workspace }}
         working-directory: ${{ github.workspace }}/build

CMakeLists.txt

@@ -70,11 +70,11 @@ if(LINUX)
         $<$<BOOL:${LIBRT}>:rt>
         $<$<BOOL:${LIBDL}>:dl>
         $<$<BOOL:${LIBM}>:m>)
-elseif(WIN32)
-    list(APPEND LIBDDWAF_INTERFACE_LIBRARIES ws2_32)
+elseif(MSVC)
+    list(APPEND LIBDDWAF_INTERFACE_LIBRARIES NtDll UserEnv Bcrypt crypt32 wsock32 ws2_32)
 endif()
 
-set(LIBDDWAF_PRIVATE_LIBRARIES "")
+set(LIBDDWAF_PRIVATE_LIBRARIES libstring_checker)
 if(NOT MSVC AND LIBDDWAF_TESTING AND LIBDDWAF_TEST_COVERAGE)
     list(APPEND LIBDDWAF_PRIVATE_LIBRARIES gcov)
 endif()

cmake/static.cmake

@@ -17,6 +17,7 @@ if(LINUX)
     add_custom_command(TARGET libddwaf_static POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E make_directory ar_comb
       COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $<TARGET_FILE:libddwaf_static>
+      COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $<TARGET_FILE:libstring_checker>
       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_OBJECTS:glibc_compat> ar_comb
       COMMAND ${CMAKE_AR} -qcs ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} ar_comb/*.o*
 

docker/libddwaf/build/Dockerfile

@@ -4,6 +4,9 @@ ARG ARCH
 
 COPY . /libddwaf
 
+RUN wget https://sh.rustup.rs -O rustup.sh && chmod u+x rustup.sh && ./rustup.sh -y -t x86_64-unknown-linux-musl aarch64-unknown-linux-musl armv7-unknown-linux-musleabihf i686-unknown-linux-musl
+RUN ls /root/.cargo/bin | xargs -n1 bash -c 'echo "Linking $0" ; ln -s /root/.cargo/bin/$0 /usr/bin/$0'
+
 RUN mkdir -p build
 RUN cd build && cmake \
     -G Ninja \

docker/libddwaf/gcc/mingw64/Dockerfile

@@ -2,7 +2,10 @@
 # win64)
 FROM alpine:3.14 AS build
 
-RUN apk --update-cache add cmake make mingw-w64-gcc mingw-w64-winpthreads git
+RUN apk --update-cache add cmake make mingw-w64-gcc mingw-w64-winpthreads git rustup
+RUN rustup-init -y --target x86_64-pc-windows-gnu
+
+RUN ls /root/.cargo/bin | xargs -n1 sh -c 'echo "Linking $0" ; ln -s /root/.cargo/bin/$0 /usr/bin/$0'
 
 ARG BUILD_TYPE=Release
 COPY . /usr/local/src/libddwaf

src/matcher/is_passwd.hpp

@@ -0,0 +1,39 @@
+// Unless explicitly stated otherwise all files in this repository are
+// dual-licensed under the Apache-2.0 License or BSD-3-Clause License.
+//
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2021 Datadog, Inc.
+
+#pragma once
+
+#include <string_checker.h>
+#include <string_view>
+
+#include "matcher/base.hpp"
+
+namespace ddwaf::matcher {
+
+class is_passwd : public base_impl<is_passwd> {
+public:
+    is_passwd() = default;
+    ~is_passwd() override = default;
+    is_passwd(const is_passwd &) = default;
+    is_passwd(is_passwd &&) noexcept = default;
+    is_passwd &operator=(const is_passwd &) = default;
+    is_passwd &operator=(is_passwd &&) noexcept = default;
+
+protected:
+    static constexpr std::string_view to_string_impl() { return ""; }
+    static constexpr std::string_view name_impl() { return "is_passwd"; }
+
+    static constexpr DDWAF_OBJ_TYPE supported_type_impl() { return DDWAF_OBJ_STRING; }
+
+    [[nodiscard]] std::pair<bool, std::string> match_impl(std::string_view obtained) const
+    {
+        return {check_string(obtained.data()), std::string{obtained}};
+    }
+
+    friend class base_impl<is_passwd>;
+};
+
+} // namespace ddwaf::matcher

src/parser/parser_v2.cpp

@@ -18,6 +18,7 @@
 #include "matcher/equals.hpp"
 #include "matcher/exact_match.hpp"
 #include "matcher/ip_match.hpp"
+#include "matcher/is_passwd.hpp"
 #include "matcher/is_sqli.hpp"
 #include "matcher/is_xss.hpp"
 #include "matcher/phrase_match.hpp"
@@ -82,6 +83,8 @@ std::pair<std::string, std::unique_ptr<matcher::base>> parse_matcher(
         matcher = std::make_unique<matcher::is_xss>();
     } else if (name == "is_sqli") {
         matcher = std::make_unique<matcher::is_sqli>();
+    } else if (name == "is_passwd") {
+        matcher = std::make_unique<matcher::is_passwd>();
     } else if (name == "ip_match") {
         auto it = params.find("list");
         if (it == params.end()) {

third_party/CMakeLists.txt

@@ -133,3 +133,5 @@ ExternalProject_Add(proj_event_rules
 
 set_target_properties(proj_event_rules PROPERTIES EXCLUDE_FROM_ALL TRUE)
 # vim: et
+
+add_subdirectory(string_checker)

third_party/string_checker/.gitignore

@@ -0,0 +1,14 @@
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb

third_party/string_checker/CMakeLists.txt

@@ -0,0 +1,53 @@
+# Files to clean
+set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES target)
+
+set(CARGO_BUILD cargo build)
+set(BUILD_BYPRODUCT "${CMAKE_CURRENT_SOURCE_DIR}/target")
+
+if (LINUX)
+    if (NOT "${CMAKE_C_COMPILER_TARGET}" STREQUAL "")
+        if ("${CMAKE_C_COMPILER_TARGET}" STREQUAL "i386-none-linux-musl")
+            set(BUILD_TARGET "i686-unknown-linux-musl")
+        else()
+            string(REPLACE "none" "unknown" BUILD_TARGET ${CMAKE_C_COMPILER_TARGET})
+        endif()
+    endif()
+endif()
+
+if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+    set(BUILD_TARGET "aarch64-apple-darwin")
+endif()
+
+if (MINGW)
+    set(BUILD_TARGET "x86_64-pc-windows-gnu")
+endif()
+
+if (NOT "${BUILD_TARGET}" STREQUAL "")
+    set(BUILD_BYPRODUCT "${BUILD_BYPRODUCT}/${BUILD_TARGET}")
+    set(CARGO_BUILD ${CARGO_BUILD} --target ${BUILD_TARGET})
+endif()
+
+if (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+    set(BUILD_BYPRODUCT "${BUILD_BYPRODUCT}/release")
+    set(CARGO_BUILD ${CARGO_BUILD} --release)
+else()
+    set(BUILD_BYPRODUCT "${BUILD_BYPRODUCT}/debug")
+endif()
+
+if (MSVC)
+    set(BUILD_BYPRODUCT "${BUILD_BYPRODUCT}/string_checker${CMAKE_STATIC_LIBRARY_SUFFIX}")
+else()
+    set(BUILD_BYPRODUCT "${BUILD_BYPRODUCT}/libstring_checker${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+add_custom_target(
+    libstring_checker_build
+    COMMAND ${CARGO_BUILD}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Compiling Rust library"
+    BYPRODUCTS ${BUILD_BYPRODUCT}
+)
+
+add_library(libstring_checker STATIC IMPORTED GLOBAL)
+set_target_properties(libstring_checker PROPERTIES  IMPORTED_LOCATION ${BUILD_BYPRODUCT})
+target_include_directories(libstring_checker INTERFACE include)
+add_dependencies(libstring_checker libstring_checker_build)

third_party/string_checker/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "string_checker"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+crate-type = ["staticlib"]
+
+[profile.release]
+opt-level = 'z'  # Optimize for size
+lto = false
+codegen-units = 1
+
+[dependencies]

third_party/string_checker/include/string_checker.h

@@ -0,0 +1,17 @@
+#ifndef RUST_C_LIB_H
+#define RUST_C_LIB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+
+bool check_string(const char *c_string);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // RUST_C_LIB_H
+

third_party/string_checker/src/lib.rs

@@ -0,0 +1,12 @@
+use std::ffi::CStr;
+use std::os::raw::c_char;
+
+#[no_mangle]
+pub extern "C" fn check_string(c_string: *const c_char) -> bool {
+    let c_str = unsafe {
+        assert!(!c_string.is_null());
+        CStr::from_ptr(c_string)
+    };
+
+    c_str.to_str().unwrap() == "/etc/passwd"
+}