V2/libinjection4

.github/workflows/ci.yml

@@ -28,7 +28,10 @@ jobs:
         run: |
           sudo apt-get update -y -qq
           sudo apt-get install -y apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev libpcre3-dev libpcre3 pkg-config libyajl-dev apache2 apache2-bin apache2-data
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - name: autogen.sh
         run: ./autogen.sh
       - name: configure ${{ matrix.configure.label }}
@@ -98,7 +101,10 @@ jobs:
         run: |
           sudo apt-get update -y -qq
           sudo apt-get install -y --no-install-recommends apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev libpcre3-dev libpcre3 pkg-config libyajl-dev apache2 apache2-bin apache2-data
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - name: autogen.sh
         run: ./autogen.sh
       - name: configure ${{ matrix.configure.label }}
@@ -125,7 +131,10 @@ jobs:
         run: |
           sudo apt-get update -y -qq
           sudo apt-get install -y --no-install-recommends apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev libpcre3-dev libpcre3 pkg-config libyajl-dev apache2 apache2-bin apache2-data perl libwww-perl ssdeep libfuzzy-dev libfuzzy2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - name: autogen.sh
         run: ./autogen.sh
       - name: configure ${{ matrix.configure.label }}
@@ -162,10 +171,11 @@ jobs:
               libfuzzy-dev \
               ssdeep \
               curl \
-              ca-certificates
+              ca-certificates \
+              git
       - uses: actions/checkout@v4
         with:
-          submodules: false
+          submodules: recursive
           fetch-depth: 0
       - name: configure
         run: |

.github/workflows/test-ci-windows.yml

@@ -20,7 +20,9 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v5
-
+      with:
+        submodules: recursive
+        fetch-depth: 0
     - name: Install Apache for x86
       if: matrix.arch == 'x86'
       shell: pwsh
@@ -122,6 +124,9 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v5
+      with:
+        submodules: recursive
+        fetch-depth: 0
 
     - name: Download x64 artifacts
       uses: actions/download-artifact@v4
@@ -159,6 +164,9 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v5
+      with:
+        submodules: recursive
+        fetch-depth: 0
 
     - name: Download MSI files
       uses: actions/download-artifact@v4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "apache2/others/libinjection"]
+	path = apache2/others/libinjection
+	url = https://github.com/libinjection/libinjection.git

apache2/Makefile.am

@@ -5,9 +5,9 @@ mod_security2_la_SOURCES = acmp.c \
     apache2_config.c \
     apache2_io.c \
     apache2_util.c \
-    libinjection/libinjection_html5.c \
-    libinjection/libinjection_sqli.c \
-    libinjection/libinjection_xss.c \
+    others/libinjection/src/libinjection_html5.c \
+    others/libinjection/src/libinjection_sqli.c \
+    others/libinjection/src/libinjection_xss.c \
     mod_security2.c \
     modsecurity.c \
     msc_status_engine.c \

apache2/Makefile.win

@@ -11,19 +11,19 @@ LIBS = $(APACHE)\lib\libhttpd.lib \
        $(APACHE)\lib\libapr-1.lib \
        $(APACHE)\lib\libaprutil-1.lib \
        $(PCRE)\pcre.lib \
-       $(CURL)\libcurl.lib \
+       $(CURL)\libcurl.lib \
        $(LIBXML2)\win32\bin.msvc\libxml2.lib \
        Ws2_32.lib \
        "iphlpapi.lib"
 
 ###########################################################################
 ###########################################################################
 
-
-!IF "$(IIS_BUILD)" == "yes"
-DEFS=$(DEFS) -DVERSION_IIS
-!ENDIF
-
+
+!IF "$(IIS_BUILD)" == "yes"
+DEFS=$(DEFS) -DVERSION_IIS
+!ENDIF
+
 CC = CL
 
 MT = mt
@@ -37,9 +37,9 @@ INCLUDES = -I. -I.. \
            -I$(PCRE)\include -I$(PCRE) \
            -I$(LIBXML2)\include \
            -I$(APACHE)\include
-
-# Enables support for SecRemoteRules and external resources.
-DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
+
+# Enables support for SecRemoteRules and external resources.
+DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
 
 # Lua is optional
 !IF "$(LUA)" != ""
@@ -65,12 +65,12 @@ OBJS = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
        msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
        msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_crypt.obj msc_tree.obj msc_unicode.obj acmp.obj msc_lua.obj \
        msc_release.obj \
-       msc_status_engine.obj \
-       msc_remote_rules.obj \
+       msc_status_engine.obj \
+       msc_remote_rules.obj \
        msc_json.obj \
-       libinjection/libinjection_html5.obj \
-       libinjection/libinjection_sqli.obj \
-       libinjection/libinjection_xss.obj
+       others/libinjection/src/libinjection_html5.obj \
+       others/libinjection/src/libinjection_sqli.obj \
+       others/libinjection/src/libinjection_xss.obj
 
 all: $(DLL)