github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-27 02:08:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3438 from A13501350/v2/master

Browse Source 
fix: add event message resources to ModSecurityIIS.dll and resolve "Invalid function" errors (#3408)
This commit is contained in:
Ervin Hegedus 2025-08-29 20:11:52 +03:00 committed by GitHub
commit f3f00e348b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
iis/Makefile.win
View File

@ -85,6 +85,8 @@ OBJS4 = libinjection_html5.obj \
libinjection_sqli.obj \ libinjection_sqli.obj \
libinjection_xss.obj libinjection_xss.obj
OBJS5 = ModSecurityIISMessage.res
all: $(DLL) all: $(DLL)
dll: $(DLL) dll: $(DLL)
@ -101,12 +103,21 @@ $(OBJS2): ..\standalone\$*.c
.cpp.obj: .cpp.obj:
$(CC) $(CFLAGS) -c $< -Fo$@ $(CC) $(CFLAGS) -c $< -Fo$@
$(DLL): $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(DLL): $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)
$(LINK) $(LDFLAGS) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(LIBS) $(LINK) $(LDFLAGS) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(LIBS)
IF EXIST $(DLL).manifest $(MT) -manifest $(DLL).manifest -outputresource:$(DLL);#1 IF EXIST $(DLL).manifest $(MT) -manifest $(DLL).manifest -outputresource:$(DLL);#1
$(OBJS5): ModSecurityIISMessage.rc
rc /r ModSecurityIISMessage.rc
ModSecurityIISMessage.rc: ModSecurityIISMessage.mc
mc -U ModSecurityIISMessage.mc
clean: clean:
del /f *.obj del /f *.obj
del /f *.dll del /f *.dll
del /f *.exp del /f *.exp
del /f *.lib del /f *.lib
del /f *.rc
del /f *.bin
del /f *.res

5
iis/ModSecurityIISMessage.mc Normal file
View File

@ -0,0 +1,5 @@
MessageId=0x1
Language=English
%1
.

6
iis/installer.wxs
View File

@ -402,6 +402,9 @@
Source="Release\amd64\zlib1.dll" /> Source="Release\amd64\zlib1.dll" />
<File Id="_64_FUZZY" Name="fuzzy.dll" <File Id="_64_FUZZY" Name="fuzzy.dll"
Source="Release\amd64\fuzzy.dll" /> Source="Release\amd64\fuzzy.dll" />
<util:EventSource Name="ModSecurity" Log="Application"
EventMessageFile="[inetsrv64]ModSecurityIIS.dll"
KeyPath="yes" />
</Component> </DirectoryRef> <DirectoryRef </Component> </DirectoryRef> <DirectoryRef
Id="inetsrv32"> <Component Id="ModSec32" DiskId="1" Id="inetsrv32"> <Component Id="ModSec32" DiskId="1"
Guid="514A81F0-2413-42EF-B19F-E2613125ECE7" Guid="514A81F0-2413-42EF-B19F-E2613125ECE7"
@ -480,6 +483,9 @@
Source="Release\x86\zlib1.dll" /> <File Source="Release\x86\zlib1.dll" /> <File
Id="_32_FUZZY" Name="fuzzy.dll" Id="_32_FUZZY" Name="fuzzy.dll"
Source="Release\x86\fuzzy.dll" /> Source="Release\x86\fuzzy.dll" />
<util:EventSource Name="ModSecurity" Log="Application"
EventMessageFile="[inetsrv32]ModSecurityIIS.dll"
KeyPath="yes" />
</Component> </DirectoryRef> <DirectoryRef </Component> </DirectoryRef> <DirectoryRef
Id="SystemFolderConfigSchema32"> <Component Id="SystemFolderConfigSchema32"> <Component
Id="ConfigSchema32" Id="ConfigSchema32"