1540 Commits

Author SHA1 Message Date
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
f70f6f4281 Redefines unixd_set_global_mutex_perms on tests
Avoding conflicts with the standalone implementation
2013-12-04 19:56:54 -08:00
Felipe Zimmerle
cef72855e4 test: Avoids conflict of fuctions definition 2013-12-04 18:53:03 -08:00
Felipe Zimmerle
cc982ae42e test: Makes the unit tests to work again
The unit tests was not working due to lack update. This patch adds
the necessary stuff to have it work again.
2013-12-12 11:44:41 -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
69c5ccac66 QA: Avoids the utilization of 3rd filedescriptor
No need to use a 3rd description on the quality check scripts.
Stderr is now redirected to stdout and filtered as needed.
2013-12-04 08:22:39 -08:00
Felipe Zimmerle
baaf502363 Supports WarningCountingShellCommand in cppcheck and vera
WarningCountingShellCommand allow us to have some measurements on
the buildbot waterfall.
2013-12-04 08:05:08 -08:00
Felipe Zimmerle
388943440c Adds verbose quality check
Vera++ and ccpcheck are not outputing to the stderr instead stdout
allowing the buildbot to extract some numbers about it.
2013-12-04 06:19:11 -08:00
Felipe Zimmerle
b77e90152d Adds support for coding style and quality check
Initial effort to get the code on shape. This will be executed
by the buildbots as soon as they get ready for it.
2013-12-03 11:09:31 -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
a4202146b8 iis: Fix inet_pton build problem
There is a function named inet_pton on windows API, with different
signature. This patch just override the windows function and point
the inet_pton to our implementation.
2013-11-07 17:15:52 -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
9b7663fa79 iis: Fix mlogc build on windows
The libcurl path was not pointing to the correct directory
2013-11-06 07:04:24 -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
Felipe Zimmerle
e3c19d53d2 Removes standalone/Makefile.in
Makefile.in is recommended to be in the repository whenever it is edit manually,
in our case the automatically generated Makefile.in is ok.
2013-12-12 10:47:44 -08:00
Felipe Zimmerle
1734221d9d Fix #154, Uses addn instead of apr_table_setn
The headers are represented in the format of an apr_table, which
is able to handle elements with the same key, however the function
apr_table_setn checks if the key exists before add the element, if so
it replaces the old value with the new one. This was making our
implementation to just keep the last added Cookie. The apr_table_addn
function, which is now used, just add a new item without check for
olders one.
2013-10-24 10:55:58 -03:00
Felipe Zimmerle
61e54f2067 Merge pull request #579 from zimmerle/revert_139
Revert merge request #139
2013-10-18 07:32:00 -07:00
Felipe Zimmerle
7f7d00fa2c Revert "Merge pull request #139 from chaizhenhua/remotes/trunk"
This reverts commit 10fd40fb0d06f6c577d870b6f15d2f6e2a3a5b1b, reversing
changes made to 414033aafa94cd50c9b310afd3f164740caccc94.
2013-10-18 11:02:10 -03:00
Felipe Zimmerle
b0c3977845 Merge pull request #578 from client9/remotes/trunk
libinjection sync to v3.8.0
2013-10-18 05:14:17 -07:00
Nick Galbreath
a5f175d79f libinjection sync 2013-10-18 14:18:55 +09:00
Felipe Zimmerle
88ebf8a0bd Merge pull request #152 from client9/remotes/trunk
Merge pull request #152 from client9/remotes/trunk

Sync to libinjection v3.7.1
2013-10-14 07:11:39 -07:00
Nick Galbreath
fcb6dc13ed libinjection sync 2013-10-12 22:04:16 +09:00
Nick Galbreath
f52242a013 libinjection sync 2013-10-12 21:51:26 +09:00
Ryan Barnett
b76e26d81d Merge pull request #148 from zimmerle/bugfix_charset_missing_string_terminator
Bugfix: missing string terminator while mounting the charset (nginx)
2013-10-01 05:55:31 -07:00
Felipe Zimmerle
ff19dcd5c5 Bugfix: missing string terminator while mounting the charset (nginx)
The charset in headers is mounted using ngx_snprintf which
does not place the string terminator. This patch adds the
terminator at the end of the string. The size was correctly
allocated, just missing the terminator.

This bug was report at:
- https://www.modsecurity.org/tracker/browse/MODSEC-420
- https://github.com/SpiderLabs/ModSecurity/issues/142

Both reports cames with patch, first by Veli Pekka Jutila and
second by wellumies.
2013-09-30 21:56:57 -03:00
Ryan Barnett
786773189a Merge pull request #147 from zimmerle/fix_nginx_build_config_top_of_trunk
Try 3 - nginx: Makes the build script to check for deps
2013-09-26 12:39:47 -07:00