fix

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

@@ -9,178 +9,177 @@ on:
       - v2/test-ci-windows
 
 jobs:
-  # build:
+  build:
-  #   strategy:
+    strategy:
-  #     matrix:
+      matrix:
-  #       arch: [x86, x64]
+        arch: [x86, x64]
-  #   runs-on: windows-latest
-    
-  #   # For Caching
-  #   permissions:
-  #     actions: read
-  #     contents: read
-
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v5
-
-  #   - name: Install Apache for x86
-  #     if: matrix.arch == 'x86'
-  #     shell: pwsh
-  #     run: |
-  #       $apachePath = "${{ github.workspace }}\apache-x86"
-  #       New-Item -ItemType Directory -Path $apachePath -Force
-  #       choco install apache-httpd -y --force --forcex86 --no-progress -r --params="`"/installLocation:$apachePath /noService`""
-  #       echo "APACHE_ROOT=$apachePath\Apache24" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-  #   - name: Set Apache path for x64
-  #     if: matrix.arch == 'x64'
-  #     shell: pwsh
-  #     run: |
-  #       echo "APACHE_ROOT=C:\tools\Apache24" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-  #   - name: Setup MSYS2
-  #     uses: msys2/setup-msys2@v2
-  #     with:
-  #       msystem: ${{ matrix.arch == 'x86' && 'MINGW32' || 'UCRT64' }}
-  #       update: true
-  #       install: >
-  #         git
-  #         make
-  #         autoconf
-  #         automake
-  #         libtool
-  #         ${{ matrix.arch == 'x86' && 'mingw-w64-i686-gcc' || 'mingw-w64-ucrt-x86_64-gcc' }}
-  #         ${{ matrix.arch == 'x86' && 'mingw-w64-i686-pkg-config' || 'mingw-w64-ucrt-x86_64-pkg-config' }}
-
-  #   - name: Clone and build ssdeep
-  #     shell: msys2 {0}
-  #     run: |
-  #       MSYS2_WORKSPACE=$(cygpath -u '${{ github.workspace }}')
-  #       echo "Converted workspace path: $MSYS2_WORKSPACE"
-
-  #       git clone https://github.com/ssdeep-project/ssdeep.git --depth 1
-  #       cd ssdeep
-  #       autoreconf -i
-        
-  #       if [ "${{ matrix.arch }}" = "x86" ]; then
-  #         ./configure --enable-shared --disable-static CFLAGS="-O3" CXXFLAGS="-O3" --build=i686-pc-mingw32
-  #       else
-  #         ./configure --enable-shared --disable-static CFLAGS="-O3" CXXFLAGS="-O3"
-  #       fi
-        
-  #       make dll
-
-  #       mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/bin"
-  #       mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/include"
-  #       cp -v fuzzy.dll "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/bin/"
-  #       cp -v fuzzy.h "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/include/"
-  #       cp -v fuzzy.def "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/"
-
-  #   - name: Restore vcpkg cache
-  #     id: vcpkg-cache
-  #     uses: TAServers/vcpkg-cache@v3
-  #     with:
-  #       token: ${{ secrets.GITHUB_TOKEN }}
-  #       prefix: vcpkg-iis-module-${{ matrix.arch }}/
-
-  #   - name: Configure CMake for IIS Module
-  #     env:
-  #       VCPKG_FEATURE_FLAGS: "binarycaching"
-  #       VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite"
-  #       VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows
-  #     run: |
-  #       $archFlag = "${{ matrix.arch }}"
-  #       $cmakeArch = if ($archFlag -eq "x86") { "Win32" } else { "x64" }
-  #       $installDir = if ($archFlag -eq "x86") { "x86" } else { "amd64" }
-
-  #       cmake `
-  #       -DAPACHE_ROOT="$env:APACHE_ROOT" `
-  #       -DSSDEEP_ROOT="${{ github.workspace }}\ssdeep-install-${{ matrix.arch }}" `
-  #       -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\iis\release\$installDir" `
-  #       -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" `
-  #       -A $cmakeArch `
-  #       -DWITH_SSDEEP=ON `
-  #       -DWITH_LUA=ON `
-  #       -DWITH_YAJL=ON `
-  #       -S IIS -B "iis\build-${{ matrix.arch }}"
-
-  #   - name: Build IIS Module
-  #     shell: pwsh
-  #     run: |
-  #       cmake --build "iis\build-${{ matrix.arch }}" --config Release
-
-  #   - name: Upload artifacts
-  #     uses: actions/upload-artifact@v4
-  #     with:
-  #       name: iis-module-${{ matrix.arch }}
-  #       path: iis/build-${{ matrix.arch }}/Release/
-    
-  # package:
-  #   needs: build
-  #   runs-on: windows-latest
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v5
-
-  #   - name: Download x64 artifacts
-  #     uses: actions/download-artifact@v4
-  #     with:
-  #       name: iis-module-x64
-  #       path: iis/release/amd64/
-
-  #   - name: Download x86 artifacts
-  #     uses: actions/download-artifact@v4
-  #     with:
-  #       name: iis-module-x86
-  #       path: iis/release/x86/
-
-  #   - name: Generate wxs files
-  #     shell: pwsh
-  #     run: |
-  #       heat dir "iis\release\amd64" -cg ModSec64Components -dr inetsrv64 -gg -sreg -srd -var var.ModSecurityIISRelease64 -out "iis\ModSec64.wxs"
-  #       heat dir "iis\release\x86" -cg ModSec32Components -dr inetsrv32 -gg -sreg -srd -var var.ModSecurityIISRelease32 -out "iis\ModSec32.wxs"
-
-  #   - name: Compile wxs files
-  #     shell: pwsh
-  #     run: |
-  #       candle.exe -ext WixUtilExtension -ext WixUIExtension "iis\installer.wxs" "iis\ModSec64.wxs" -arch x64 -dModSecurityIISRelease64="iis\release\amd64\" -out iis\
-  #       candle.exe -ext WixUtilExtension -ext WixUIExtension "iis\ModSec32.wxs" -arch x86 -dModSecurityIISRelease32="iis\release\x86\" -out iis\
-
-  #   - name: Link wixobj files into MSI
-  #     shell: pwsh
-  #     run: |
-  #       light.exe -ext WixUtilExtension -ext WixUIExtension "iis\installer.wixobj" "iis\ModSec32.wixobj" "iis\ModSec64.wixobj" -out "iis\modsecurityiis.msi"
-
-  #   - name: Upload artifacts
-  #     uses: actions/upload-artifact@v4
-  #     with:
-  #       name: modsecurityiis-installers
-  #       path: iis/modsecurityiis.msi
-
-  test:
-#     needs: package
     runs-on: windows-latest
+    
+    # For Caching
+    permissions:
+      actions: read
+      contents: read
+
     steps:
-    - name: Enable IIS Feature
+    - name: Checkout code
+      uses: actions/checkout@v5
+
+    - name: Install Apache for x86
+      if: matrix.arch == 'x86'
       shell: pwsh
       run: |
-        $iisStatus = Get-WindowsFeature -Name Web-Server
+        $apachePath = "${{ github.workspace }}\apache-x86"
-        if ($iisStatus.Installed -eq $false) {
+        New-Item -ItemType Directory -Path $apachePath -Force
-          Write-Host "IIS is not installed. Installing now..."
+        choco install apache-httpd -y --force --forcex86 --no-progress -r --params="'/installLocation:$apachePath /noService'"
-          Install-WindowsFeature -Name Web-Server -IncludeManagementTools
+        echo "APACHE_ROOT=$apachePath\Apache24" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        } else {
-          Write-Host "IIS is already installed."
-        }
-        Install-WindowsFeature -name Web-Server -IncludeManagementTools
-        Install-WindowsFeature -name Web-Server, Web-ASP, Web-Mgmt-Tools, Web-WebSockets
 
-    # - name: Download MSI
+    - name: Set Apache path for x64
-    #   uses: actions/download-artifact@v4
+      if: matrix.arch == 'x64'
+      shell: pwsh
+      run: |
+        echo "APACHE_ROOT=C:\tools\Apache24" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    # - name: Setup MSYS2
+    #   uses: msys2/setup-msys2@v2
     #   with:
-    #     name: modsecurityiis-installers
+    #     msystem: ${{ matrix.arch == 'x86' && 'MINGW32' || 'UCRT64' }}
-    #     path: iis/
+    #     update: true
+    #     install: >
+    #       git
+    #       make
+    #       autoconf
+    #       automake
+    #       libtool
+    #       ${{ matrix.arch == 'x86' && 'mingw-w64-i686-gcc' || 'mingw-w64-ucrt-x86_64-gcc' }}
+    #       ${{ matrix.arch == 'x86' && 'mingw-w64-i686-pkg-config' || 'mingw-w64-ucrt-x86_64-pkg-config' }}
 
-    # - name: Install MSI
+    # - name: Clone and build ssdeep
-    #   shell: pwsh
+    #   shell: msys2 {0}
     #   run: |
+    #     MSYS2_WORKSPACE=$(cygpath -u '${{ github.workspace }}')
+    #     echo "Converted workspace path: $MSYS2_WORKSPACE"
+
+    #     git clone https://github.com/ssdeep-project/ssdeep.git --depth 1
+    #     cd ssdeep
+    #     autoreconf -i
+        
+    #     if [ "${{ matrix.arch }}" = "x86" ]; then
+    #       ./configure --enable-shared --disable-static CFLAGS="-O3" CXXFLAGS="-O3" --build=i686-pc-mingw32
+    #     else
+    #       ./configure --enable-shared --disable-static CFLAGS="-O3" CXXFLAGS="-O3"
+    #     fi
+        
+    #     make dll
+
+    #     mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/bin"
+    #     mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/include"
+    #     cp -v fuzzy.dll "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/bin/"
+    #     cp -v fuzzy.h "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/include/"
+    #     cp -v fuzzy.def "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/"
+
+    - name: Restore vcpkg cache
+      id: vcpkg-cache
+      uses: TAServers/vcpkg-cache@v3
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        prefix: vcpkg-iis-module-${{ matrix.arch }}/
+
+    - name: Configure CMake for IIS Module
+      env:
+        VCPKG_FEATURE_FLAGS: "binarycaching"
+        VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite"
+        VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows
+      run: |
+        $archFlag = "${{ matrix.arch }}"
+        $cmakeArch = if ($archFlag -eq "x86") { "Win32" } else { "x64" }
+        $installDir = if ($archFlag -eq "x86") { "x86" } else { "amd64" }
+
+        cmake `
+        -DAPACHE_ROOT="$env:APACHE_ROOT" `
+        # -DSSDEEP_ROOT="${{ github.workspace }}\ssdeep-install-${{ matrix.arch }}" `
+        -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\iis\release\$installDir" `
+        -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" `
+        -A $cmakeArch `
+        # -DWITH_SSDEEP=ON `
+        -DWITH_LUA=ON `
+        -DWITH_YAJL=ON `
+        -S IIS -B "iis\build-${{ matrix.arch }}"
+
+    - name: Build IIS Module
+      shell: pwsh
+      run: |
+        cmake --build "iis\build-${{ matrix.arch }}" --config Release
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: iis-module-${{ matrix.arch }}
+        path: iis/build-${{ matrix.arch }}/Release/
+    
+  package:
+    needs: build
+    runs-on: windows-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v5
+
+    - name: Download x64 artifacts
+      uses: actions/download-artifact@v4
+      with:
+        name: iis-module-x64
+        path: iis/release/amd64/
+
+    - name: Download x86 artifacts
+      uses: actions/download-artifact@v4
+      with:
+        name: iis-module-x86
+        path: iis/release/x86/
+
+    - name: Generate wxs files
+      shell: pwsh
+      run: |
+        heat dir "iis\release\amd64" -cg ModSec64Components -dr inetsrv64 -gg -sreg -srd -var var.ModSecurityIISRelease64 -out "iis\ModSec64.wxs"
+        heat dir "iis\release\x86" -cg ModSec32Components -dr inetsrv32 -gg -sreg -srd -var var.ModSecurityIISRelease32 -out "iis\ModSec32.wxs"
+
+    - name: Compile wxs files
+      shell: pwsh
+      run: |
+        candle.exe -ext WixUtilExtension -ext WixUIExtension "iis\installer.wxs" "iis\ModSec64.wxs" -arch x64 -dModSecurityIISRelease64="iis\release\amd64\" -out iis\
+        candle.exe -ext WixUtilExtension -ext WixUIExtension "iis\ModSec32.wxs" -arch x86 -dModSecurityIISRelease32="iis\release\x86\" -out iis\
+
+    - name: Link wixobj files into MSI
+      shell: pwsh
+      run: |
+        light.exe -ext WixUtilExtension -ext WixUIExtension "iis\installer.wixobj" "iis\ModSec32.wixobj" "iis\ModSec64.wixobj" -out "iis\modsecurityiis.msi"
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: modsecurityiis-installers
+        path: iis/modsecurityiis.msi
+
+  test:
+    needs: package
+    runs-on: windows-latest
+    steps:
+    - name: Download MSI
+      uses: actions/download-artifact@v4
+      with:
+        name: modsecurityiis-installers
+        path: ${{ github.workspace }}\
+
+    - name: Install MSI
+      shell: pwsh
+      run: |
+        msiexec /i modsecurityiis.msi /qn /norestart
+
+    - name: ReStart IIS Feature
+      shell: pwsh
+      run: |
+        Restart-Service W3SVC
+
+    - name: Test IIS Module
+      shell: pwsh
+      run: |
+        curl -I http://localhost/
+        Get-EventLog -LogName Application -Newest 10

iis/CMakeLists.txt

@@ -171,6 +171,12 @@ if(APACHE_ROOT)
         IMPORTED_LOCATION "${APACHE_ROOT}/bin/libaprutil-1.dll"
     )
 
+    add_library(Apache::apriconv SHARED IMPORTED)
+    set_target_properties(Apache::apriconv SHARED IMPORTED PROPERTIES
+        IMPORTED_IMPLIB "${APACHE_ROOT}/lib/libapriconv-1.lib"
+        IMPORTED_LOCATION "${APACHE_ROOT}/bin/libapriconv-1.dll"
+    )
+
     target_include_directories(${IIS_MODULE_NAME} PRIVATE
         ${APACHE_ROOT}/include
     )
@@ -283,9 +289,6 @@ if(WITH_SSDEEP)
                 )
                  
              endif()
-        else()
-            message(WARNING "SSDEEP include (fuzzy.h) not found at ${SSDEEP_ROOT}/include. Disabling SSDEEP support.")
-            set(WITH_SSDEEP OFF CACHE BOOL "Enable SSDEEP support" FORCE)
         endif()
     endif()
 endif()
@@ -335,6 +338,7 @@ if(APACHE_ROOT)
         Apache::httpd
         Apache::apr
         Apache::aprutil
+        Apache::apriconv
     )
 else()
     message(WARNING "APACHE_ROOT is not defined or path does not exist. Current APACHE_ROOT: '${APACHE_ROOT}'. Please set APACHE_ROOT to the Apache installation directory.")
@@ -351,9 +355,6 @@ endif()
 
 if(WITH_SSDEEP AND SSDEEP_INCLUDE_DIR AND SSDEEP_GENERATED_LIB)
     target_link_libraries(${IIS_MODULE_NAME} PRIVATE SSDEEP::fuzzy)
-else()
-    message(WARNING "SSDEEP library not found or generated. Disabling SSDEEP support.")
-    option(WITH_SSDEEP "Enable SSDEEP support" OFF) # Disable if library not found
 endif()
 
 if(APACHE_ROOT AND EXISTS "${APACHE_ROOT}/bin")
@@ -364,6 +365,9 @@ if(APACHE_ROOT AND EXISTS "${APACHE_ROOT}/bin")
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
             "${APACHE_ROOT}/bin/libaprutil-1.dll"
             $<TARGET_FILE_DIR:${IIS_MODULE_NAME}>
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${APACHE_ROOT}/bin/libapriconv-1.dll"
+            $<TARGET_FILE_DIR:${IIS_MODULE_NAME}>
         COMMENT "Copying Apache DLLs to output directory"
     )
 else()
@@ -377,8 +381,6 @@ if(WITH_SSDEEP AND SSDEEP_ROOT AND EXISTS "${SSDEEP_ROOT}/bin/fuzzy.dll")
             $<TARGET_FILE_DIR:${IIS_MODULE_NAME}>
         COMMENT "Copying SSDEEP DLL to output directory"
     )
-else()
-    message(WARNING "SSDEEP_ROOT is not defined or path does not exist. Current SSDEEP_ROOT: '${SSDEEP_ROOT}'. Please set SSDEEP_ROOT to the SSDEEP installation directory.")
 endif()
 
 
@@ -392,6 +394,7 @@ if(APACHE_ROOT AND EXISTS "${APACHE_ROOT}/bin")
     install(FILES
         "${APACHE_ROOT}/bin/libhttpd.dll"
         "${APACHE_ROOT}/bin/libaprutil-1.dll"
+        "${APACHE_ROOT}/bin/libapriconv-1.dll"
         DESTINATION .
     )
 endif()