From d016abfefd3e2993cb30499e06b8cb0f8ee5d57d Mon Sep 17 00:00:00 2001 From: brenosilva Date: Mon, 29 Nov 2010 14:07:35 +0000 Subject: [PATCH] MODSEC-182 --- CHANGES | 6 +-- MODSECURITY_LICENSING_EXCEPTION | 6 +-- README.TXT | 2 +- README_WINDOWS.TXT | 18 +++---- apache2/acmp.c | 6 +-- apache2/acmp.h | 6 +-- apache2/apache2.h | 6 +-- apache2/apache2_config.c | 6 +-- apache2/apache2_io.c | 6 +-- apache2/apache2_util.c | 6 +-- apache2/mlogc-src/mlogc-batch-load.pl.in | 6 +-- apache2/mlogc-src/mlogc.c | 6 +-- apache2/mod_security2.c | 6 +-- apache2/modsecurity.c | 6 +-- apache2/modsecurity.h | 6 +-- apache2/msc_geo.c | 6 +-- apache2/msc_geo.h | 6 +-- apache2/msc_logging.c | 6 +-- apache2/msc_logging.h | 6 +-- apache2/msc_lua.c | 6 +-- apache2/msc_lua.h | 6 +-- apache2/msc_multipart.c | 6 +-- apache2/msc_multipart.h | 6 +-- apache2/msc_parsers.c | 6 +-- apache2/msc_parsers.h | 6 +-- apache2/msc_pcre.c | 6 +-- apache2/msc_pcre.h | 6 +-- apache2/msc_release.c | 8 +-- apache2/msc_release.h | 10 ++-- apache2/msc_reqbody.c | 6 +-- apache2/msc_test.c | 6 +-- apache2/msc_util.c | 6 +-- apache2/msc_util.h | 6 +-- apache2/msc_xml.c | 6 +-- apache2/msc_xml.h | 6 +-- apache2/pdf_protect.c | 6 +-- apache2/pdf_protect.h | 6 +-- apache2/persist_dbm.c | 6 +-- apache2/persist_dbm.h | 6 +-- apache2/re.c | 6 +-- apache2/re.h | 6 +-- apache2/re_actions.c | 6 +-- apache2/re_operators.c | 6 +-- apache2/re_tfns.c | 6 +-- apache2/re_variables.c | 6 +-- .../t/regression/misc/00-multipart-parser.t | 50 +++++++++--------- apache2/utf8tables.h | 6 +-- doc/Makefile | 2 +- doc/breach-logo-small.gif | Bin 2389 -> 0 bytes doc/html-chunked.xsl | 4 +- doc/html.xsl | 4 +- doc/main-index.html | 4 +- doc/migration-matrix.html | 2 +- doc/migration-matrix.xml | 4 +- doc/modsecurity2-apache-reference.xml | 18 +++---- doc/modsecurity2-data-formats.xml | 4 +- doc/trustwave-logo-small.gif | Bin 0 -> 4654 bytes 57 files changed, 191 insertions(+), 191 deletions(-) delete mode 100644 doc/breach-logo-small.gif create mode 100644 doc/trustwave-logo-small.gif diff --git a/CHANGES b/CHANGES index 932a7a97..21eb72fc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,12 +1,12 @@ 22 Nov 2010 - 2.5.13-dev3 +------------------------- - * Add SecReadStateLimit to limit the number threads in BUSY connections per ip address + * Add SecReadStateLimit to limit the number of concurrent threads in BUSY connections per ip address * Fixed redirect action was not expanding macros in chained rules - 04 Nov 2010 - 2.5.13-dev2 --------------------- +------------------------- * Fixed Geo lookup concurrent connections bug diff --git a/MODSECURITY_LICENSING_EXCEPTION b/MODSECURITY_LICENSING_EXCEPTION index 1e99ad2c..c31a655d 100644 --- a/MODSECURITY_LICENSING_EXCEPTION +++ b/MODSECURITY_LICENSING_EXCEPTION @@ -5,7 +5,7 @@ MODSECURITY LICENSING EXCEPTION Version 1.0, 29 July 2008 As a special exception ("Exception") to the terms and conditions of version 2 -of the GPL, Breach Security, Inc. hereby grants you the rights described +of the GPL, Trustwave Holdings, Inc. hereby grants you the rights described below, provided you agree to the terms and conditions in this Exception, including its obligations and restrictions on use. @@ -54,7 +54,7 @@ following conditions are met: If the above conditions are not met, then the Program may only be copied, modified, distributed or used under the terms and conditions of the GPLv2 -or another valid licensing option from Breach Security, Inc. +or another valid licensing option from Trustwave Holdings, Inc. FLOSS License List @@ -106,7 +106,7 @@ Definitions Applicability ============= -This Exception applies to all Programs that contain a notice placed by Breach +This Exception applies to all Programs that contain a notice placed by Trustwave Holdings Security, Inc. saying that the Program may be distributed under the terms of this Exception. If you create or distribute a work which is a Derivative Work of both the Program and any other work licensed under the GPL, then this FLOSS diff --git a/README.TXT b/README.TXT index d6ede95f..152a7619 100644 --- a/README.TXT +++ b/README.TXT @@ -1,5 +1,5 @@ ModSecurity for Apache 2.x, http://www.modsecurity.org/ -Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) +Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) ModSecurity for Apache is an open source product, released under terms of the General Public Licence, Version 2 (GPLv2). Please refer to the diff --git a/README_WINDOWS.TXT b/README_WINDOWS.TXT index 6fa91f12..2993da24 100644 --- a/README_WINDOWS.TXT +++ b/README_WINDOWS.TXT @@ -2,7 +2,7 @@ Build notes for Windows from Tom Donovan ============================================================ These are the raw build notes from Tom Donovan for building -ModSecurity 2.5.12 with Apache httpd 2.2.14 on Windows. Some +ModSecurity 2.5.13 with Apache httpd 2.2.14 on Windows. Some day these should be incorporated into the official docs, but there has not yet been time, so they are included here in their raw format for now. @@ -77,9 +77,9 @@ BUILD CURL-7.20.0 NMAKE -BUILD MOD_SECURITY-2.5.12 +BUILD MOD_SECURITY-2.5.13 - Edited the top of C:\work\mod_security-2.5.12\apache2\Makefile.win and set my local paths + Edited the top of C:\work\mod_security-2.5.13\apache2\Makefile.win and set my local paths (note that pcre.lib is not in $(PCRE)\LibR as it is in the original Makefile.win ) # Path to Apache httpd installation @@ -99,12 +99,12 @@ BUILD MOD_SECURITY-2.5.12 $(LUA)\lua5.1.lib \ wsock32.lib - CD C:\work\mod_security-2.5.12\apache2 + CD C:\work\mod_security-2.5.13\apache2 NMAKE -f Makefile.win -BUILD MOD_SECURITY-2.5.12 MLOGC program +BUILD MOD_SECURITY-2.5.13 MLOGC program - Edited the top of C:\work\mod_security-2.5.12\apache2\mlogc-src\Makefile.win and set my local paths + Edited the top of C:\work\mod_security-2.5.13\apache2\mlogc-src\Makefile.win and set my local paths # Path to Apache httpd installation BASE = C:\Apache2214 @@ -121,7 +121,7 @@ BUILD MOD_SECURITY-2.5.12 MLOGC program wsock32.lib - CD C:\work\mod_security-2.5.12\apache2\mlogc-src + CD C:\work\mod_security-2.5.13\apache2\mlogc-src NMAKE -f Makefile.win INSTALL AND RUN @@ -131,11 +131,11 @@ INSTALL AND RUN C:\work\lua-5.1.4\src\lua5.1.dll C:\work\libxml2-2.7.6\win32\bin.msvc\libxml2.dll C:\work\curl-7.20.0\libcurl.dll - C:\work\mod_security-2.5.12\apache2\mlogc-src\mlogc.exe + C:\work\mod_security-2.5.13\apache2\mlogc-src\mlogc.exe Copied this one file to C:\Apache2214\modules: - C:\work\mod_security-2.5.12\apache2\mod_security2.so + C:\work\mod_security-2.5.13\apache2\mod_security2.so You could also copy C:\work\curl-7.20.0\\curl.exe to C:\Apache2214\bin, if you want to use the cURL command-line. diff --git a/apache2/acmp.c b/apache2/acmp.c index f52a48a5..a8fae4af 100644 --- a/apache2/acmp.c +++ b/apache2/acmp.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ diff --git a/apache2/acmp.h b/apache2/acmp.h index c4652223..dcd473d9 100644 --- a/apache2/acmp.h +++ b/apache2/acmp.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef ACMP_H_ diff --git a/apache2/apache2.h b/apache2/apache2.h index b6f8edf7..e9b4a9e7 100644 --- a/apache2/apache2.h +++ b/apache2/apache2.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _APACHE2_H_ diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c index 752a5ca8..70b4ece3 100644 --- a/apache2/apache2_config.c +++ b/apache2/apache2_config.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/apache2_io.c b/apache2/apache2_io.c index 5e2005cc..9dd95f13 100644 --- a/apache2/apache2_io.c +++ b/apache2/apache2_io.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/apache2_util.c b/apache2/apache2_util.c index cf1be8e4..05206921 100644 --- a/apache2/apache2_util.c +++ b/apache2/apache2_util.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "modsecurity.h" diff --git a/apache2/mlogc-src/mlogc-batch-load.pl.in b/apache2/mlogc-src/mlogc-batch-load.pl.in index a32f57fa..f7bd240a 100755 --- a/apache2/mlogc-src/mlogc-batch-load.pl.in +++ b/apache2/mlogc-src/mlogc-batch-load.pl.in @@ -1,7 +1,7 @@ #!@PERL@ # # ModSecurity for Apache 2.x, http://www.modsecurity.org/ -# Copyright (c) 2004-2009 Breach Security, Inc. (http://www.breach.com/) +# Copyright (c) 2004-2009 Trustwave Holdings, Inc. (http://www.trustwave.com/) # # This product is released under the terms of the General Public Licence, # version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -13,8 +13,8 @@ # distribution. # # If any of the files related to licensing are missing or if you have any -# other questions related to licensing please contact Breach Security, Inc. -# directly using the email address support@breach.com. +# other questions related to licensing please contact Trustwave Holdings, Inc. +# directly using the email address support@trustwave.com. # use strict; diff --git a/apache2/mlogc-src/mlogc.c b/apache2/mlogc-src/mlogc.c index b22ec2d9..36717f40 100644 --- a/apache2/mlogc-src/mlogc.c +++ b/apache2/mlogc-src/mlogc.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2009 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2009 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c index 4e14617c..55c43f40 100644 --- a/apache2/mod_security2.c +++ b/apache2/mod_security2.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c index 663f5030..9785031b 100644 --- a/apache2/modsecurity.c +++ b/apache2/modsecurity.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h index 3d64e848..6141bd9b 100644 --- a/apache2/modsecurity.h +++ b/apache2/modsecurity.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MODSECURITY_H_ diff --git a/apache2/msc_geo.c b/apache2/msc_geo.c index 2e7626bd..061340db 100644 --- a/apache2/msc_geo.c +++ b/apache2/msc_geo.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "msc_geo.h" diff --git a/apache2/msc_geo.h b/apache2/msc_geo.h index 26bee2ef..e97d5a1a 100644 --- a/apache2/msc_geo.h +++ b/apache2/msc_geo.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_GEO_H_ diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c index b6ae2c06..c2336aff 100644 --- a/apache2/msc_logging.c +++ b/apache2/msc_logging.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/msc_logging.h b/apache2/msc_logging.h index ee9b399d..f0abb091 100644 --- a/apache2/msc_logging.h +++ b/apache2/msc_logging.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_LOGGING_H_ diff --git a/apache2/msc_lua.c b/apache2/msc_lua.c index 692abf9c..7d481471 100644 --- a/apache2/msc_lua.c +++ b/apache2/msc_lua.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #if defined(WITH_LUA) diff --git a/apache2/msc_lua.h b/apache2/msc_lua.h index 04e72556..cd60e17a 100644 --- a/apache2/msc_lua.h +++ b/apache2/msc_lua.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #if defined(WITH_LUA) diff --git a/apache2/msc_multipart.c b/apache2/msc_multipart.c index 692dac82..9aaedd67 100644 --- a/apache2/msc_multipart.c +++ b/apache2/msc_multipart.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/msc_multipart.h b/apache2/msc_multipart.h index 5fff0fce..ed5b5834 100644 --- a/apache2/msc_multipart.h +++ b/apache2/msc_multipart.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_MULTIPART_H_ diff --git a/apache2/msc_parsers.c b/apache2/msc_parsers.c index c61ebc25..83736f62 100644 --- a/apache2/msc_parsers.c +++ b/apache2/msc_parsers.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "msc_parsers.h" diff --git a/apache2/msc_parsers.h b/apache2/msc_parsers.h index a5dac5b6..30ff6bca 100644 --- a/apache2/msc_parsers.h +++ b/apache2/msc_parsers.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_PARSERS_H_ diff --git a/apache2/msc_pcre.c b/apache2/msc_pcre.c index 7c90278b..e82ca1a4 100644 --- a/apache2/msc_pcre.c +++ b/apache2/msc_pcre.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "msc_pcre.h" diff --git a/apache2/msc_pcre.h b/apache2/msc_pcre.h index 63a8f8c5..a8c2e18a 100644 --- a/apache2/msc_pcre.h +++ b/apache2/msc_pcre.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_PCRE_H_ diff --git a/apache2/msc_release.c b/apache2/msc_release.c index 2ce72334..82667ce5 100644 --- a/apache2/msc_release.c +++ b/apache2/msc_release.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ @@ -23,7 +23,7 @@ modsec_build_type_rec modsec_build_type[] = { { "-dev", 1 }, /* Development build */ { "-rc", 3 }, /* Release Candidate build */ { "", 9 }, /* Production build */ - { "-breach", 9 }, /* Breach build */ + { "-tw", 9 }, /* Trustwave Holdings build */ { "-trunk", 9 }, /* Trunk build */ { NULL, -1 } /* terminator */ }; diff --git a/apache2/msc_release.h b/apache2/msc_release.h index 624c04ad..c0566e79 100644 --- a/apache2/msc_release.h +++ b/apache2/msc_release.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_RELEASE_H_ @@ -49,8 +49,8 @@ extern DSOLOCAL modsec_build_type_rec modsec_build_type[]; #define MODSEC_VERSION_MAJOR "2" #define MODSEC_VERSION_MINOR "5" #define MODSEC_VERSION_MAINT "13" -#define MODSEC_VERSION_TYPE "dev" -#define MODSEC_VERSION_RELEASE "3" +#define MODSEC_VERSION_TYPE "" +#define MODSEC_VERSION_RELEASE "" #define MODSEC_VERSION_SUFFIX MODSEC_VERSION_TYPE MODSEC_VERSION_RELEASE diff --git a/apache2/msc_reqbody.c b/apache2/msc_reqbody.c index 76a04a4c..18da2f9b 100644 --- a/apache2/msc_reqbody.c +++ b/apache2/msc_reqbody.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "modsecurity.h" diff --git a/apache2/msc_test.c b/apache2/msc_test.c index bf0cd15d..7cacccf7 100644 --- a/apache2/msc_test.c +++ b/apache2/msc_test.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/msc_util.c b/apache2/msc_util.c index 99429fce..985934a8 100644 --- a/apache2/msc_util.c +++ b/apache2/msc_util.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/msc_util.h b/apache2/msc_util.h index c7be2591..b8482dd2 100644 --- a/apache2/msc_util.h +++ b/apache2/msc_util.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _UTIL_H_ diff --git a/apache2/msc_xml.c b/apache2/msc_xml.c index c13d8331..7361f371 100644 --- a/apache2/msc_xml.c +++ b/apache2/msc_xml.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "msc_xml.h" diff --git a/apache2/msc_xml.h b/apache2/msc_xml.h index aaf00e95..9e27fe32 100644 --- a/apache2/msc_xml.h +++ b/apache2/msc_xml.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_XML_H_ diff --git a/apache2/pdf_protect.c b/apache2/pdf_protect.c index 0844f1a5..233fe60f 100644 --- a/apache2/pdf_protect.c +++ b/apache2/pdf_protect.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "modsecurity.h" diff --git a/apache2/pdf_protect.h b/apache2/pdf_protect.h index 7474f239..dddc20b8 100644 --- a/apache2/pdf_protect.h +++ b/apache2/pdf_protect.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _PDF_PROTECT_H_ diff --git a/apache2/persist_dbm.c b/apache2/persist_dbm.c index 2d2634b4..70a0730f 100644 --- a/apache2/persist_dbm.c +++ b/apache2/persist_dbm.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "persist_dbm.h" diff --git a/apache2/persist_dbm.h b/apache2/persist_dbm.h index 8d20a679..b94b58da 100644 --- a/apache2/persist_dbm.h +++ b/apache2/persist_dbm.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _PERSIST_DBM_H_ diff --git a/apache2/re.c b/apache2/re.c index 744ea03f..0c3626f8 100644 --- a/apache2/re.c +++ b/apache2/re.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/re.h b/apache2/re.h index 960a6c6a..24eb47e3 100644 --- a/apache2/re.h +++ b/apache2/re.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef _MSC_RE_H_ diff --git a/apache2/re_actions.c b/apache2/re_actions.c index 001deed5..ea50e160 100644 --- a/apache2/re_actions.c +++ b/apache2/re_actions.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2008 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2008 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "re.h" diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 2d1dd36e..ccc38655 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "re.h" diff --git a/apache2/re_tfns.c b/apache2/re_tfns.c index 034afe87..d1865cfb 100644 --- a/apache2/re_tfns.c +++ b/apache2/re_tfns.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include diff --git a/apache2/re_variables.c b/apache2/re_variables.c index ccc56d28..c3e58a07 100644 --- a/apache2/re_variables.c +++ b/apache2/re_variables.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #include "http_core.h" diff --git a/apache2/t/regression/misc/00-multipart-parser.t b/apache2/t/regression/misc/00-multipart-parser.t index 5ed94ebc..3c58a291 100644 --- a/apache2/t/regression/misc/00-multipart-parser.t +++ b/apache2/t/regression/misc/00-multipart-parser.t @@ -14,7 +14,7 @@ SecRule REQBODY_PROCESSOR_ERROR "\@eq 1" "phase:2,deny" ), match_log => { - debug => [ qr/Added file part [0-9a-h]+ to the list: name "image" file name "image.jpg" \(offset 258, length 10\).*Adding request argument \(BODY\): name "name", value "Brian Rectanus".*Adding request argument \(BODY\): name "email", value "brian.rectanus\@breach.com"/s, 1 ], + debug => [ qr/Added file part [0-9a-h]+ to the list: name "image" file name "image.jpg" \(offset 258, length 10\).*Adding request argument \(BODY\): name "name", value "Brian Rectanus".*Adding request argument \(BODY\): name "email", value "bpinto\@trustwave.com"/s, 1 ], -debug => [ qr/Multipart.*(?i:error|warning)/, 1 ], }, match_response => { @@ -34,7 +34,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -773,7 +773,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -818,7 +818,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -867,7 +867,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -914,7 +914,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -963,7 +963,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1010,7 +1010,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1055,7 +1055,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1102,7 +1102,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1130,7 +1130,7 @@ SecRule REQBODY_PROCESSOR_ERROR "\@eq 1" "phase:2,deny" ), match_log => { - debug => [ qr/Added file part [0-9a-h]+ to the list: name "image" file name "image.jpg" \(offset 258, length 10\).*Adding request argument \(BODY\): name "name", value "Brian Rectanus".*Adding request argument \(BODY\): name "email", value "brian.rectanus\@breach.com"/s, 1 ], + debug => [ qr/Added file part [0-9a-h]+ to the list: name "image" file name "image.jpg" \(offset 258, length 10\).*Adding request argument \(BODY\): name "name", value "Brian Rectanus".*Adding request argument \(BODY\): name "email", value "brian.rectanus\@trustwave.com"/s, 1 ], -debug => [ qr/Multipart.*(?i:error|warning)/, 1 ], }, match_response => { @@ -1150,7 +1150,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1198,7 +1198,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1245,7 +1245,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1294,7 +1294,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1340,7 +1340,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1387,7 +1387,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1434,7 +1434,7 @@ --0000 1111 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 1111 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1480,7 +1480,7 @@ --00"00 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --00"00 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1526,7 +1526,7 @@ --00"00 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --00"00 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1572,7 +1572,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1618,7 +1618,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image"; filename="image.jpg" Content-Type: image/jpeg @@ -1663,7 +1663,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: attachment Content-Type: multipart/mixed; boundary=BbC04y @@ -1716,7 +1716,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Type: multipart/mixed; boundary=BbC04y @@ -1787,7 +1787,7 @@ --0000 Content-Disposition: form-data; name="email" - brian.rectanus@breach.com + brian.rectanus@trustwave.com --0000 Content-Disposition: form-data; name="image1"; filename="image1.jpg" Content-Type: image/jpeg diff --git a/apache2/utf8tables.h b/apache2/utf8tables.h index 80a20902..d88809d8 100644 --- a/apache2/utf8tables.h +++ b/apache2/utf8tables.h @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -12,8 +12,8 @@ * distribution. * * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Breach Security, Inc. - * directly using the email address support@breach.com. + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address support@trustwave.com. * */ #ifndef UTF8TABLES_H_ diff --git a/doc/Makefile b/doc/Makefile index 43d82b8e..e39b8906 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -30,7 +30,7 @@ html-multipage/index.html: modsecurity2-apache-reference.xml $(XALAN) -q -xsl html-chunked.xsl -in modsecurity2-apache-reference.xml -param base.dir html-multipage/; \ cp modsecurity-reference.css html-multipage/; \ cp modsecurity.gif html-multipage/; \ - cp breach-logo-small.gif html-multipage/; \ + cp trustwave-logo-small.gif html-multipage/; \ cp apache_request_cycle-modsecurity.jpg html-multipage/ index.html: main-index.html diff --git a/doc/breach-logo-small.gif b/doc/breach-logo-small.gif deleted file mode 100644 index d732ac5018a0110c7a1bc11349528f3e1bb966c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2389 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 H2?zi?XVITh diff --git a/doc/html-chunked.xsl b/doc/html-chunked.xsl index 8b250969..bd47f88b 100644 --- a/doc/html-chunked.xsl +++ b/doc/html-chunked.xsl @@ -9,11 +9,11 @@ modsecurity-reference.css -
ModSecurity
+
ModSecurity
 -
Copyright (C) 2004-2010 Breach Security
+
Copyright (C) 2004-2010 Trustwave Holdings
 diff --git a/doc/html.xsl b/doc/html.xsl index 4d389ee6..9a81181f 100644 --- a/doc/html.xsl +++ b/doc/html.xsl @@ -5,11 +5,11 @@ -
ModSecurity
+
ModSecurity
 -
Copyright (C) 2004-2010 Breach Security
+
Copyright (C) 2004-2010 Trustwave Holdings
 diff --git a/doc/main-index.html b/doc/main-index.html index 321caa01..ab91a5e3 100644 --- a/doc/main-index.html +++ b/doc/main-index.html @@ -8,7 +8,7 @@
ModSecurity
@@ -29,7 +29,7 @@ height="36" width="100" border="0">
Copyright (C) 2004-2006 Breach Security
+href="http://www.trustwave.com">Trustwave Holdings diff --git a/doc/migration-matrix.html b/doc/migration-matrix.html index 70d908a5..707176d6 100644 --- a/doc/migration-matrix.html +++ b/doc/migration-matrix.html @@ -1,6 +1,6 @@ - ModSecurity Migration Matrix

ModSecurity Migration Matrix

Version 1.0 / (April 10, 2007)

Copyright © 2004-2007 Breach Security, Inc. (http://www.breach.com)

Migration from 1.x to 2.x

If you are already using an older version of ModSecurity and want to upgrade/migrate your existing custom rules, you will need to ensure that you properly translate all of your Directives to their corresponding 2.0 counterparts. Some directives have simply changed names, however some directives actually behave differently so it is important that you also review the entire 2.0 Reference Manual. + ModSecurity Migration Matrix

ModSecurity Migration Matrix

Version 1.0 / (April 10, 2007)

Copyright © 2004-2007 Trustwave Holdings, Inc. (http://www.trustwave.com)

Migration from 1.x to 2.x

If you are already using an older version of ModSecurity and want to upgrade/migrate your existing custom rules, you will need to ensure that you properly translate all of your Directives to their corresponding 2.0 counterparts. Some directives have simply changed names, however some directives actually behave differently so it is important that you also review the entire 2.0 Reference Manual. The migration matrix show below should help you to translate ModSecurity 1.X directives to the 2.0 values. There are also some notes that provide additional information is a directive significantly changed how it operates.

Feature/CapabilityModSecurity 1.xModSecurity 2.xNotesHow To Upgrade
Apache Version SupportedApache 1.x/2.xApache 2.x OnlyModSecurity 2.0 will only work with Apache 2.x and not the older 1.3 version.If you are mainly an Apache 1.3 shop and/or you have other web servers that you want to protect (such as IIS) an alternative solution is to deploy an Apache 2.x reverse proxy server and implement ModSecurity 2.x on it.
InstallationCan be installed as either a DSO module or as a statically compiled module.Can currently only be installed as a DSO module.In 1.x, you could use apxs directly, while in 2.x you must use the provided Makefile.If you can not use DSOs in your current Apache configs, you may look at implementing a front-end Apache reverse proxy server.
Configuration - IfModuleApache 1.x - <IfModule mod_security.c> diff --git a/doc/migration-matrix.xml b/doc/migration-matrix.xml index f79fbf93..859b3559 100644 --- a/doc/migration-matrix.xml +++ b/doc/migration-matrix.xml @@ -8,8 +8,8 @@ 2004-2010 - Breach Security, Inc. (http://www.breach.com) + Trustwave Holdings, Inc. (http://www.trustwave.com) diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml index eef40c5d..22626972 100644 --- a/doc/modsecurity2-apache-reference.xml +++ b/doc/modsecurity2-apache-reference.xml @@ -11,8 +11,8 @@ 2004-2010 - Breach Security, Inc. (http://www.breach.com) + Trustwave Holdings, Inc. (http://www.trustwave.com) @@ -180,12 +180,12 @@ version 2 (licence text is included with the distribution), as an Open Source / Free Software product. A range of commercial licenses is also available, together with a range of commercial support contracts. For - more information on commercial licensing please contact Breach + more information on commercial licensing please contact Trustwave Holdings Security. ModSecurity, mod_security, ModSecurity Pro, and ModSecurity Core - Rules are trademarks or registered trademarks of Breach Security, + Rules are trademarks or registered trademarks of Trustwave Holdings, Inc. @@ -200,7 +200,7 @@ ModSecurity is a web application firewall engine that provides very little protection on its own. In order to become useful, ModSecurity must be configured with rules. In order to enable users to - take full advantage of ModSecurity out of the box, Breach Security, Inc. + take full advantage of ModSecurity out of the box, Trustwave Holdings, Inc. is providing a free certified rule set for ModSecurity 2.x. Unlike intrusion detection and prevention systems, which rely on signatures specific to known vulnerabilities, the Core Rules provide generic @@ -523,7 +523,7 @@ LoadFile /usr/lib/liblua5.1.so themselves but rather place all changes (such as SecRuleRemoveByID, etc...) in your custom rules file. This will allow for easier upgrading as newer Core rules are released by - Breach Security on the ModSecurity website. + Trustwave Holdings on the ModSecurity website.
@@ -1488,7 +1488,7 @@ SecMarker 99 Scope: Global - Version: 2.5.12 + Version: 2.5.13 Dependencies/Notes: Default is set at compile (1500 by default). See also @@ -1531,7 +1531,7 @@ SecRule TX:/^MSC_/ "!@eq 0" "phase:5,pass,log,auditlog,msg:'Potential REDoS'"

Scope: Global - Version: 2.5.12 + Version: 2.5.13 Dependencies/Notes: Default is set at compile (1500 by default). See also SecPcreMatchLimit @@ -2582,7 +2582,7 @@ SecRuleUpdateActionById 12345 "t:compressWhitespace,deny,status:403,msg:'A new m Scope: Any - Version: 2.5.12 + Version: 2.5.13 Dependencies/Notes: The default is set to 100 files, but you are encouraged to reduce this value. Any file over the diff --git a/doc/modsecurity2-data-formats.xml b/doc/modsecurity2-data-formats.xml index 27ddb6b1..fdb76541 100644 --- a/doc/modsecurity2-data-formats.xml +++ b/doc/modsecurity2-data-formats.xml @@ -7,8 +7,8 @@ Version 2.5.10-dev1 (March 24, 2009) 2004-2010 - Breach Security, Inc. (http://www.breach.com) + Trustwave Holdings, Inc. (http://www.trustwave.com) The purpose of this document is to describe the formats of the ModSecurity alert messages, diff --git a/doc/trustwave-logo-small.gif b/doc/trustwave-logo-small.gif new file mode 100644 index 0000000000000000000000000000000000000000..e88043092bd67f6824450b72f826d1b21a2e2b95 GIT binary patch literal 4654 zcmWlYc|6pK8^^!LT;`@R&G(vZs9j)|>o*M4V^QMQH(g>4*Z zNOoMC3j1}HY{yu#!rF1H^;6lgK^JZpd_GHvm^}QILd=Fkic3yti-QB&r z{EB99aPs5)|Ni&C_V)I5w~kIuP7VwVeE2YNp-K7j<;&bBZvsk^qO%&_zJ0sAyySSc zjC=GhJ0q&=-O%LRN0Zp1&({{0J}DFmAmkQ?VXdvLwXcWrI_h8iF&JucQ5;s;f&&OQlcyA3b{X z_dg$FavB$xmM^!dCT6BOIyxRacmRZErT<#f`(YH?b8Bv4>Erwo)-`gowsU@IQIz$| z_($#2k+;!5XMXk%1ZUoQ{a9M|QZxSV^xPsClIe1xJhkFAkg~I=tI4I{EbTyUNq6hq z+#DF1WgDlAD`*8mvPP#S{`hB1_v-!)r%Jb_)XXg|e5Prr8wkndWyM0WAnokO&o6#G zHbCB=Q}OGc*73^jkqNg8D#IiBvkPMC=6kUKqGPiuMvKALF zE-$_Rch>quQT<@2buPs?@WK3%VJREV+nsW$(<#DUEi#d+42M_SX*| zKE#LIgo3lj$KQSC{kwMzc?1xe35I444Gj;E{xvc((%0A5-`Cgt`)FJ5*q5kkM_R4r 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 literal 0 HcmV?d00001