Skip to content

Commit 3a7def6

Browse files
author
Felipe "Zimmerle" Costa
committed
IIS: Adds mlogc to ModSecurity solution
1 parent 90c5a42 commit 3a7def6

File tree

4 files changed

+172
-40
lines changed

4 files changed

+172
-40
lines changed

‎iis/ModSecurityIIS.sln

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Express 2013 for Windows Desktop
4-
VisualStudioVersion = 12.0.21005.1
5-
MinimumVisualStudioVersion = 10.0.40219.1
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Express 2013 for Windows Desktop
4+
VisualStudioVersion = 12.0.21005.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModSecurityIIS", "ModSecurityIIS.vcxproj", "{D1F7201F-064B-48AB-868C-FED22464841C}"
77
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mlogc", "mlogc.vcxproj", "{DD595511-33F2-475A-B36F-2A6B27E03FA0}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -32,6 +34,22 @@ Global
3234
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x64.Build.0 = Release|x64
3335
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.ActiveCfg = Release|Win32
3436
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.Build.0 = Release|Win32
37+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
38+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
39+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|Win32.ActiveCfg = Debug|Win32
40+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|Win32.Build.0 = Debug|Win32
41+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|x64.ActiveCfg = Debug|x64
42+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|x64.Build.0 = Debug|x64
43+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|x86.ActiveCfg = Debug|Win32
44+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|x86.Build.0 = Debug|Win32
45+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
46+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|Mixed Platforms.Build.0 = Release|Win32
47+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|Win32.ActiveCfg = Release|Win32
48+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|Win32.Build.0 = Release|Win32
49+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|x64.ActiveCfg = Release|x64
50+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|x64.Build.0 = Release|x64
51+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|x86.ActiveCfg = Release|Win32
52+
{DD595511-33F2-475A-B36F-2A6B27E03FA0}.Release|x86.Build.0 = Release|Win32
3553
EndGlobalSection
3654
GlobalSection(SolutionProperties) = preSolution
3755
HideSolutionNode = FALSE

‎iis/ModSecurityIIS.vcxproj

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -26,19 +26,19 @@
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
29-
<PlatformToolset>v120</PlatformToolset>
29+
<PlatformToolset>v120</PlatformToolset>
3030
</PropertyGroup>
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3232
<ConfigurationType>Application</ConfigurationType>
33-
<PlatformToolset>v120</PlatformToolset>
33+
<PlatformToolset>v120</PlatformToolset>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
37-
<PlatformToolset>v120</PlatformToolset>
37+
<PlatformToolset>v120</PlatformToolset>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4040
<ConfigurationType>DynamicLibrary</ConfigurationType>
41-
<PlatformToolset>v120</PlatformToolset>
41+
<PlatformToolset>v120</PlatformToolset>
4242
</PropertyGroup>
4343
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4444
<ImportGroup Label="ExtensionSettings">
@@ -83,7 +83,7 @@
8383
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8484
<ClCompile>
8585
<Optimization>Disabled</Optimization>
86-
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;dependencies\build_dir\apache24\include;..\apache2;..\standalone;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
86+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;dependencies\build_dir\apache24\include;..\apache2;..\standalone;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
8787
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions>
8888
<PrecompiledHeader>NotUsing</PrecompiledHeader>
8989
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -93,17 +93,17 @@
9393
<Link>
9494
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
9595
<GenerateDebugInformation>true</GenerateDebugInformation>
96-
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib</AdditionalDependencies>
96+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib</AdditionalDependencies>
9797
</Link>
9898
<PostBuildEvent>
99-
<Command>
100-
</Command>
99+
<Command>
100+
</Command>
101101
</PostBuildEvent>
102102
</ItemDefinitionGroup>
103103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
104104
<ClCompile>
105105
<Optimization>Disabled</Optimization>
106-
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
106+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
107107
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
108108
<PrecompiledHeader>NotUsing</PrecompiledHeader>
109109
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -113,63 +113,65 @@
113113
<Link>
114114
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
115115
<GenerateDebugInformation>true</GenerateDebugInformation>
116-
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;</AdditionalDependencies>
117-
<AdditionalLibraryDirectories>C:\core__\ModSecurity\iis\release\x64</AdditionalLibraryDirectories>
118-
<AdditionalOptions> /LIBPATH:"C:\core__\ModSecurity\iis\release\x64" %(AdditionalOptions)</AdditionalOptions>
116+
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;</AdditionalDependencies>
117+
<AdditionalLibraryDirectories>
118+
</AdditionalLibraryDirectories>
119+
<AdditionalOptions>
120+
</AdditionalOptions>
119121
</Link>
120122
<PostBuildEvent>
121-
<Command>
122-
</Command>
123+
<Command>
124+
</Command>
123125
</PostBuildEvent>
124126
</ItemDefinitionGroup>
125127
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
126128
<ClCompile>
127129
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions>
128130
<PrecompiledHeader>NotUsing</PrecompiledHeader>
129-
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
131+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
130132
</ClCompile>
131133
<Link>
132134
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
133-
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib</AdditionalDependencies>
135+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib</AdditionalDependencies>
134136
</Link>
135137
<PostBuildEvent>
136-
<Command>
137-
</Command>
138+
<Command>
139+
</Command>
138140
</PostBuildEvent>
139141
</ItemDefinitionGroup>
140142
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
141143
<ClCompile>
142144
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
143145
<PrecompiledHeader>NotUsing</PrecompiledHeader>
144-
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
146+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;</AdditionalIncludeDirectories>
145147
</ClCompile>
146148
<Link>
147149
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
148-
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;</AdditionalDependencies>
149-
<AdditionalLibraryDirectories>
150-
</AdditionalLibraryDirectories>
151-
<GenerateDebugInformation>false</GenerateDebugInformation>
150+
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;</AdditionalDependencies>
151+
<AdditionalLibraryDirectories>
152+
</AdditionalLibraryDirectories>
153+
<GenerateDebugInformation>false</GenerateDebugInformation>
152154
</Link>
153155
<PostBuildEvent>
154-
<Command>
155-
</Command>
156+
<Command>
157+
</Command>
156158
</PostBuildEvent>
157159
</ItemDefinitionGroup>
158160
<ItemGroup>
159161
<ClCompile Include="..\apache2\acmp.c" />
160162
<ClCompile Include="..\apache2\apache2_config.c" />
161163
<ClCompile Include="..\apache2\apache2_io.c" />
162164
<ClCompile Include="..\apache2\apache2_util.c" />
163-
<ClCompile Include="..\apache2\libinjection\libinjection_html5.c" />
164-
<ClCompile Include="..\apache2\libinjection\libinjection_sqli.c" />
165-
<ClCompile Include="..\apache2\libinjection\libinjection_xss.c" />
165+
<ClCompile Include="..\apache2\libinjection\libinjection_html5.c" />
166+
<ClCompile Include="..\apache2\libinjection\libinjection_sqli.c" />
167+
<ClCompile Include="..\apache2\libinjection\libinjection_xss.c" />
166168
<ClCompile Include="..\apache2\modsecurity.c" />
167169
<ClCompile Include="..\apache2\mod_security2.c" />
168-
<ClCompile Include="..\apache2\msc_status_engine.c" />
170+
<ClCompile Include="..\apache2\msc_status_engine.c" />
169171
<ClCompile Include="..\apache2\msc_crypt.c" />
170172
<ClCompile Include="..\apache2\msc_geo.c" />
171173
<ClCompile Include="..\apache2\msc_gsb.c" />
172-
<ClCompile Include="..\apache2\msc_json.c" />
174+
<ClCompile Include="..\apache2\msc_json.c" />
173175
<ClCompile Include="..\apache2\msc_logging.c" />
174176
<ClCompile Include="..\apache2\msc_lua.c" />
175177
<ClCompile Include="..\apache2\msc_multipart.c" />
@@ -210,16 +212,16 @@
210212
<ItemGroup>
211213
<ClInclude Include="..\apache2\acmp.h" />
212214
<ClInclude Include="..\apache2\apache2.h" />
213-
<ClInclude Include="..\apache2\libinjection\libinjection.h" />
214-
<ClInclude Include="..\apache2\libinjection\libinjection_sqli_data.h" />
215+
<ClInclude Include="..\apache2\libinjection\libinjection.h" />
216+
<ClInclude Include="..\apache2\libinjection\libinjection_sqli_data.h" />
215217
<ClInclude Include="..\apache2\modsecurity.h" />
216218
<ClInclude Include="..\apache2\modsecurity_config.h" />
217219
<ClInclude Include="..\apache2\modsecurity_config_auto.h" />
218-
<ClInclude Include="..\apache2\msc_status_engine.h" />
220+
<ClInclude Include="..\apache2\msc_status_engine.h" />
219221
<ClInclude Include="..\apache2\msc_crypt.h" />
220222
<ClInclude Include="..\apache2\msc_geo.h" />
221223
<ClInclude Include="..\apache2\msc_gsb.h" />
222-
<ClInclude Include="..\apache2\msc_json.h" />
224+
<ClInclude Include="..\apache2\msc_json.h" />
223225
<ClInclude Include="..\apache2\msc_logging.h" />
224226
<ClInclude Include="..\apache2\msc_lua.h" />
225227
<ClInclude Include="..\apache2\msc_multipart.h" />
@@ -241,4 +243,4 @@
241243
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
242244
<ImportGroup Label="ExtensionTargets">
243245
</ImportGroup>
244-
</Project>
246+
</Project>

0 commit comments

Comments
 (0)