Skip to content

Commit 85c7ba0

Browse files
author
Felipe Zimmerle
committed
IIS: Adds ssdeep/libfuzzy to msi installer
fuzzy.dll should be installed by the ModSecurityIIS installer.
1 parent 858d480 commit 85c7ba0

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

iis/build_release.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ mkdir "%X86%"
1717
set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"
1818
set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
1919

20+
set SSDEEP_ARCH="x64"
2021
call build_dependencies.bat %VCARGS64%
2122
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
2223
call build_modsecurity.bat %VCARGS64%
@@ -33,8 +34,9 @@ copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%AMD64%"
3334
copy "%OUTPUT_DIR%\pcre.dll" "%AMD64%"
3435
copy "%OUTPUT_DIR%\zlib1.dll" "%AMD64%"
3536
copy "%OUTPUT_DIR%\yajl.dll" "%AMD64%"
37+
copy "%OUTPUT_DIR%\fuzzy.dll" "%AMD64%"
3638

37-
39+
set SSDEEP_ARCH="x86"
3840
call build_dependencies.bat %VCARGS32%
3941
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
4042
call build_modsecurity.bat %VCARGS32%
@@ -51,6 +53,7 @@ copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%X86%"
5153
copy "%OUTPUT_DIR%\pcre.dll" "%X86%"
5254
copy "%OUTPUT_DIR%\zlib1.dll" "%X86%"
5355
copy "%OUTPUT_DIR%\yajl.dll" "%X86%"
56+
copy "%OUTPUT_DIR%\fuzzy.dll" "%X86%"
5457

5558

5659
:: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR%

iis/installer.wxs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383
<DirectorySearch Id="CheckFileDir18" Path="C:\Windows\System32\inetsrv" Depth="0">
8484
<FileSearch Id="CheckFile18" Name="zlib1.dll" />
8585
</DirectorySearch>
86+
<DirectorySearch Id="CheckFileDir19" Path="C:\Windows\System32\inetsrv" Depth="0">
87+
<FileSearch Id="CheckFile19" Name="fuzzy.dll" />
88+
</DirectorySearch>
8689
</Property>
8790
<Property Id="WWWROOT">
8891
<RegistrySearch Id="FindInetPubFolder" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp" Name="PathWWWRoot" Type="directory" />
@@ -323,9 +326,9 @@
323326
<Shortcut Id="EULA" Name="EULA" Description="EULA" Target="[INSTALLFOLDER]EULA.rtf" WorkingDirectory="INSTALLFOLDER" />
324327
<Shortcut Id="Readme" Name="EULA" Description="EULA" Target="[INSTALLFOLDER]README.TXT" WorkingDirectory="INSTALLFOLDER" />
325328
<?if $(var.Win64) = "yes" ?>
326-
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv64]libapr-1.dll&quot; &quot;[inetsrv64]libapriconv-1.dll&quot; &quot;[inetsrv64]libaprutil-1.dll&quot; &quot;[inetsrv64]libcurl.dll&quot; &quot;[inetsrv64]libxml2.dll&quot; &quot;[inetsrv64]lua5.1.dll&quot; &quot;[inetsrv64]mlogc.exe&quot; &quot;[inetsrv64]ModSecurityIIS.dll&quot; &quot;[inetsrv64]pcre.dll&quot; &quot;[inetsrv64]zlib1.dll&quot; &quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
329+
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv64]libapr-1.dll&quot; &quot;[inetsrv64]libapriconv-1.dll&quot; &quot;[inetsrv64]libaprutil-1.dll&quot; &quot;[inetsrv64]libcurl.dll&quot; &quot;[inetsrv64]libxml2.dll&quot; &quot;[inetsrv64]lua5.1.dll&quot; &quot;[inetsrv64]mlogc.exe&quot; &quot;[inetsrv64]ModSecurityIIS.dll&quot; &quot;[inetsrv64]pcre.dll&quot; &quot;[inetsrv64]zlib1.dll&quot; &quot;[inetsrv64]fuzzy.dll&quot; &quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot; &quot;[inetsrv32]fuzzy.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
327330
<?else ?>
328-
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
331+
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot; &quot;[inetsrv32]fuzzy.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
329332
<?endif ?>
330333
</Component>
331334
</Directory>
@@ -366,6 +369,7 @@
366369
<File Id="_64_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\amd64\ModSecurityIIS.dll" />
367370
<File Id="_64_PCRE" Name="pcre.dll" Source="Release\amd64\pcre.dll" />
368371
<File Id="_64_ZLIB1" Name="zlib1.dll" Source="Release\amd64\zlib1.dll" />
372+
<File Id="_64_FUZZY" Name="fuzzy.dll" Source="Release\amd64\fuzzy.dll" />
369373
</Component>
370374
</DirectoryRef>
371375
<DirectoryRef Id="inetsrv32">
@@ -381,6 +385,7 @@
381385
<File Id="_32_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\x86\ModSecurityIIS.dll" />
382386
<File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
383387
<File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
388+
<File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
384389
</Component>
385390
</DirectoryRef>
386391
<DirectoryRef Id="SystemFolderConfigSchema32">
@@ -407,6 +412,7 @@
407412
<File Id="_32_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\x86\ModSecurityIIS.dll" />
408413
<File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
409414
<File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
415+
<File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
410416
</Component>
411417
</DirectoryRef>
412418
<DirectoryRef Id="SystemFolderConfigSchema32">

0 commit comments

Comments
 (0)