115 Commits

Author SHA1 Message Date
Felipe Zimmerle
66939d059b Adds initial support to @detectXSS
Libinject was recently updated to support XSS detection. This commit adds
initial support to it.
2014-03-31 16:22:11 -07:00
Felipe "Zimmerle" Costa
8ff3de5b6f iis: Disables installer repair
Currently we don't have support to repair, so, this commit is
marking it as disabled.
2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
d6dd1f0e94 iis: Adding VC110 files to the Windows installer
For some reason the DLLs still demands the dependencies of the
VC110 files. Providing those as part of the MSI installer
2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
93b12df721 iis: Removes unnecessary files.
"Installer project" is now longer used.
2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
fe727c7021 iis: Updated OWASP crs to version 2.2.9 2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
10db384316 iis: Adds cleanup methods to the installer
Older versions of ModSecurity left files/configurations behind. This commit
adds capability to cleanup the IIS configuration files.
2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
f8f06f7930 IIS: Updates build_msi.bat to fit the new WiX install options
Instead of -dPlatform a recent update in the WiX files are demanding
the parameter -arch, although this parameter is not valid nor needed
while running "light".
2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
4d7d1ba822 iis: Adds listing dependencies script
This script could be used in order to verify all ModSecurity run time
dependencies. It is now part of ModSecurity folder in Program menu.
Cosmetics changes in the installer
2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
619758c0c2 iis: Adds condition to avoid the use of 32b msi on a 64b os
The 64bits version of the package offer the possibility to install the 32bits
version of the DLL along with all 32bits dependencies.
2014-03-31 16:22:10 -07:00
Felipe "Zimmerle" Costa
93a86f6f33 iis: Adds Visual C++ 12.0 Runtime to be part of the msi package
Visual C++ 12.0 Runtime files are now part of ModSecurity MSI package.
Users don't have to download the vcredist files anymore. Build script
was also updated, to handle the new flag -arch.
2014-03-31 16:22:10 -07:00
Felipe Zimmerle
ec61749a68 Changes JSON parser to not accept parcial contents
Also cleanup installer file.
2014-03-31 16:22:10 -07:00
Felipe Zimmerle
a95f37196e Adds JSON support on ISS port
The JSON parse is already supported in Nginx and Apache
versions. This patch adds support on the IIS port.
2014-03-31 16:22:09 -07:00
Felipe Zimmerle
0787b45481 Adds support to JSON parser in the nginx module
Building with --enable-standalone-module was failing due
the lack of the reference to the msc_json.c file inside the
standalone/Makefile.am. This patch also place the dependency
of the yajl to the nginx module config script.
2014-03-31 16:22:09 -07:00
Ulisses Albuquerque
c23097ce18 Added support for JSON body processor 2014-03-31 16:22:09 -07:00
Felipe "Zimmerle" Costa
20014c808c Adds modsecStatusEngineCall to standalone API
In ModSecurityIIS the configuration is loaded upon the first request
is received. In other words, SecStatusEngine value can be only
loaded once the first request hit the server, and so, the status
function was moved to proceed just after the configuration got loaded.
This update is IIS only.
2014-03-31 07:14:55 -07:00
Felipe Zimmerle
e131e2222d Adds support to status engine on IIS version
Fixes on the windows versions: build, mac address and machine name retrieval
2014-03-31 07:14:55 -07:00
Felipe Zimmerle
5342f36162 iis: Uses code 400 instead of 44 in modsecurity.conf
Following the recent changes that has been made on:
modsecurity.conf-recommended
2014-03-31 07:14:55 -07:00
Felipe Zimmerle
a0ed3dbbe2 Merge pull request #666 from derhansen/master
Uses code 400 instead of 44 in modsecurity.conf-recommended
2014-03-31 07:13:46 -07:00
David Andrews
dda91f1689 Standalone: independently destroy the connection and request pools
Add independent modsecFinishConnection API that allows you to independently
destroy the connection and request pools. This is to facilitate reuse of a
connection for multiple requests.
2014-03-03 14:17:00 -08:00
Felipe \"Zimmerle\" Costa
7366f35c1d Code cosmetics.
Changed to reduce the number of possible fails during
Build Bot compilation.
2013-12-12 14:53:32 -08:00
Felipe \"Zimmerle\" Costa
9bf2959c91 iis: Waiting for 5 seconds before move curl directory
Testing buildbot.
2013-12-12 11:47:11 -08:00
Felipe \"Zimmerle\" Costa
ad330a44bf iis: Avoids directory link while building
Build scripts was creating links allowing the project to
be loaded into Visual Studio without care about the
dependencies versions. Sometimes windows refuse to delete
those links leading the script to fail. This patch
moves the sources directories instead of create links
to it.
2013-12-12 11:43:11 -08:00
Felipe \"Zimmerle\" Costa
7b1537058f iis: Using base_rules instead of activated_rules 2013-11-13 18:32:55 -02:00
Felipe \"Zimmerle\" Costa
2ea5a74a7b iis: New improvements on the Wix installer
- Now the installation is divided in modules: ModSecurity and CRS.
- Added default configuration
- Configuration was moved to "Program Files" folder
- Build_msi script now using candle available in %PATH%
2013-11-13 17:26:28 -02:00
Felipe \"Zimmerle\" Costa
1a12648c9f iis: Removes the installer helper dependency
Now using appcmd directly with WiX instead of calling the installer
helper.
2013-11-12 16:22:01 -08:00
Felipe \\\"Zimmerle\\\" Costa
550d5aae21 iis: Remove readme.html
This HTML is about "Creating a Native Module for IIS7" not straight
related to ModSecurity itself.
2013-11-08 10:33:17 -02:00
Felipe \\\"Zimmerle\\\" Costa
a2c5fc831b iis: Adds batch script to compile Wix
This batch script can be used to generate our
msi installer.
2013-11-07 19:22:50 -02:00
Felipe \\\"Zimmerle\\\" Costa
3604763e15 iis: Adds Wix installer resources
This is all about cosmetic changes.
2013-11-07 18:47:16 -02:00
Felipe \\\"Zimmerle\\\" Costa
b32cb7d9ab iis: Adds Wix installer xml file.c
This commit adds the Wix template to our git repository.
2013-11-07 16:49:09 -02:00
Felipe \\\"Zimmerle\\\" Costa
7e03e3f840 iis: build_modsecurity.bat fixies
This commit enable a cleanup on the mod_security build directory
avoiding symbols with different architectures.
2013-11-07 07:01:48 -06:00
Felipe \\\"Zimmerle\\\" Costa
9477118903 iis: Adds release script 2013-11-06 21:10:44 -06:00
Felipe \\\"Zimmerle\\\" Costa
79875b1af8 iis: fixies the Installer.cpp coding style 2013-11-06 15:21:53 -06:00
Felipe \\\"Zimmerle\\\" Costa
91738f93bc iis: Removes AppWizard remade file
Apparently the AppWizard was used to generate part of this
Installer, the ReadMe.txt created by the AppWizard was removed
by this commit
2013-11-06 15:14:39 -06:00
Felipe \\\"Zimmerle\\\" Costa
adfbeb85dc iss: Removes pre-compiled headers
No need to use the pre-compiled headers in InstallerHelper,
removing it, in order to keep the project lean.
2013-11-06 15:13:05 -06:00
Felipe \\\"Zimmerle\\\" Costa
6adf25667d iis: Moves installer to InstallerHelper
To organize the folder the Installer application was
renamed to installer helper. It is not the real
installer, it is just an helper which is executed
during the installation phase.
2013-11-06 15:08:47 -06:00
Felipe \\\"Zimmerle\\\" Costa
8c3b8d81b6 iss: Removes fart dependencies
This commit removes the dependency of the fart.exe utility.
The utility was responsible to rename contents inside some
dependencies build files. Those modifications are not longer
needed.
2013-11-06 10:31:36 -06:00
Felipe \\\"Zimmerle\\\" Costa
192599bf63 iss: Better err handling in build scripts.
Now checking for errors in every step of the build
phase
2013-11-06 08:49:25 -06:00
Felipe \\\"Zimmerle\\\" Costa
e25c6b2e85 iis: Moves build_module.bat to build_modsecurity.bat
The build_modsecurity.bat is now on the iis sub-directory,
not in the dependencies anymore. Its content was also
changed fixing all the paths.
2013-11-06 07:17:17 -06:00
Felipe \\\"Zimmerle\\\" Costa
28bbde1bb2 iss: Removes Post-Build event.
There was a copy on Post-Build event using a hard coded path.
This patch removes this Post-Build event.
2013-11-05 21:04:07 -06:00
Felipe \\\"Zimmerle\\\" Costa
368617ddb2 iis: Relative paths on the VS project file
There are a ModSecurityIIS solution and project files, those
were using hard coded paths to meet the dependencies. As
consequence of the last update in our build scripts, now we
are able to built the dependencies and load it to our Visual
Studio project using relative paths.
2013-11-05 20:55:23 -06:00
Felipe \\\"Zimmerle\\\" Costa
cf5de78dfb iis: Identifies arch before unzip apache
Currently we need the Apache binary which could be used in
32 or 64 bits. This patch makes usage of 'cl' to identify
which architecture is set.
2013-11-05 20:25:01 -06:00
Felipe \\\"Zimmerle\\\" Costa
1447766e81 iis: Renamves winbuild to dependencies
Since the directory becomes all about dependencies
there is no need to call it winbuild anymore.
2013-11-05 19:44:55 -06:00
Felipe \\\"Zimmerle\\\" Costa
9f8cbf6ed8 iis: Removes unnecessary files from winbuild dir
Those .mak files seems to be part of an old build system.
Since the script are now working fine, this commit removes
all those .mac files and also a CMakeList.txt and the
Makefile.win.
2013-11-05 19:34:58 -06:00
Felipe \\\"Zimmerle\\\" Costa
b277e538f2 iis: Improves the iis build system
Now checking for common errors while building. Refactoring
on the build scripts, now there is this build_dependencies.bat
script on the iis sub-folder. By calling this script all the
dependencies should be build under the winbuild/.
This commit also removes build scripts that were not needed
anymore.
2013-11-05 19:29:48 -06:00
Felipe Zimmerle
a946a163f0 iis: Fixes the vcxproj file
Versions of the dependencies were changed, as long as the version
of the Visual Studio, now 12.
2013-11-05 13:05:01 -03:00
Felipe Zimmerle
26738d2e34 iis: Removes unecessary files from the build system
The following files were removed:
  - VCVarsQueryRegistry.bat
  - vcvars64.bat
  - vsvars32.bat
The visual studio files can be called direcltly, not necessary
to distribute those files, at least in VS12.
2013-11-05 12:18:00 -03:00
Felipe Zimmerle
0a772cb074 iss: Changes httpd version 2.4.6
Apache version was changed to 2.4.6 to sync with the current
apache lounge version.
2013-11-05 09:50:04 -03:00
Felipe Zimmerle
3e6fb41d36 iis: Changes the version of the dependencies
- pcre from 8.30 to 8.33
- zlib from 1.2.7 to 1.2.8
- libxml2 from 2.7.7 to 2.9.1
- curl from 7.24 to 7.33.0
2013-11-05 09:43:27 -03:00
Breno Silva
2c2adc20f3 Fix IIS Makefile.win typo 2013-07-26 03:05:25 -07:00
Breno Silva
5ee4c1786c Fix libjection Makefile 2013-06-03 19:15:20 -07:00