diff --git a/LICENSE b/LICENSE index 0cd26d5b..261eeb9e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,281 +1,201 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - Preamble + 1. Definitions. - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. + END OF TERMS AND CONDITIONS - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. + APPENDIX: How to apply the Apache License to your work. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. + Copyright [yyyy] [name of copyright owner] -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/MODSECURITY_LICENSING_EXCEPTION b/MODSECURITY_LICENSING_EXCEPTION deleted file mode 100644 index 78ef0116..00000000 --- a/MODSECURITY_LICENSING_EXCEPTION +++ /dev/null @@ -1,137 +0,0 @@ - -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, 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. - - -Exception Intent -================ - -We want specified Free/Libre and Open Source Software ("FLOSS") programs to be -able to use ModSecurity (the "Program") despite the fact that not all FLOSS -licenses are compatible with version 2 of the GNU General Public License (the -"GPLv2"). - - -Legal Terms and Conditions -========================== - -You are free to distribute a Derivative Work that is formed entirely from the -Program and one or more works (each, a "FLOSS Work") licensed under one or -more of the licenses listed below in section 1, as long as all of the -following conditions are met: - - 1. You obey the GPLv2 in all respects for the Program and the Derivative - Work, except for identifiable sections of the Derivative Work which are - - 1. not derived from the Program, and - - 2. are not designed to interact with the Program, and - - 3. which can reasonably be considered independent and separate works in - themselves. - - 2. All such identifiable sections of the Derivative Work are - - 1. distributed subject to one of the FLOSS licenses listed below, and - - 2. the object code or executable form of those sections are accompanied - by the complete corresponding machine-readable source code for those - sections on the same medium and under the same FLOSS license as the - corresponding object code or executable forms of those sections. - - 3. Any works which are aggregated with the Program or with a Derivative Work - on a volume of a storage or distribution medium in accordance with the - GPLv2, can reasonably be considered independent and separate works in - themselves which are not derivatives of either the Program, a Derivative - Work or a FLOSS Work, and are not designed to interact with the Program. - -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 Trustwave Holdings, Inc. - - -FLOSS License List -================== - -License name Version(s)/Copyright Date ------------------------------------------------------------------------ -Academic Free License 2.0 -Apache Software License 1.0/1.1/2.0 -Apple Public Source License 2.0 -Artistic license From Perl 5.8.0 -BSD license "July 22 1999" -Common Development and Distribution License (CDDL) 1.0 -Common Public License 1.0 -Eclipse Public License 1.0 -GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1/3.0 -Jabber Open Source License 1.0 -MIT License (As listed in file MIT-License.txt) - -Mozilla Public License (MPL) 1.0/1.1 -Open Software License 2.0 -OpenSSL license (with original SSLeay license) "2003" ("1998") -PHP License 3.0 -Python license (CNRI Python License) - -Python Software Foundation License 2.1.1 -Sleepycat License "1999" -University of Illinois/NCSA Open Source License - -W3C License "2001" -X11 License "2001" -Zlib/libpng License - -Zope Public License 2.0 - -Due to the many variants of some of the above licenses, we require that for -any version of the listed FLOSS licenses to qualify under this exception, it -must follow the 2003 version of the Free Software Foundation's Free Software -Definition (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of the -Open Source Definition by the Open Source Initiative -(http://www.opensource.org/docs/definition.php). - - -Definitions -=========== - -1. Terms used, but not defined, herein shall have the meaning provided in the - version 2 of the GPL. - -2. Derivative Work means a derivative work under copyright law. - - -Applicability -============= - -This Exception applies to all Programs that contain a notice placed by Breach -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 -Exception is not available for that work; thus, you must remove the FLOSS -Exception notice from that work and comply with the GPL in all respects, -including by retaining all GPL notices. - -You may choose to redistribute a copy of the Program exclusively under the -terms of the GPLv2 by removing the Exception notice from that copy of the -Program, provided that the copy has never been modified by you or any third -party. - - -Appendix A. Qualified Libraries and Packages -============================================ - -The following is a non-exhaustive list of libraries and packages which are -covered by the Exception when they are licensed under one or more of the -licenses listed above. Please note that this appendix is merely provided as -an additional service to specific FLOSS projects who wish to simplify -licensing information for their users. Compliance with one of the licenses -noted under the "FLOSS license list" section remains a prerequisite. - -Package name Qualifying License and Version ------------------------------------------------------------------ -Apache HTTP Server Apache Software License 2.0 -Apache Portable Runtime (APR) Apache Software License 2.0 - diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..553a3efc --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ + ModSecurity (www.modsecurity.org) +    Copyright [2004-2011] Trustwave Holdings, Inc + +    This product includes software developed at +    Trustwave Holdings, Inc (http://www.trustwave.com/). diff --git a/README.TXT b/README.TXT index 152a7619..75a3ecc3 100644 --- a/README.TXT +++ b/README.TXT @@ -1,14 +1,14 @@ ModSecurity for Apache 2.x, http://www.modsecurity.org/ -Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/) +Copyright (c) 2004-2011 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 -file LICENSE, which contains the complete text of the licence. +You may not use this file except in compliance with +the License.  You may obtain a copy of the License at -There are special exceptions to the terms and conditions of the GPL -as it is applied to this software. View the full text of the exception in -file MODSECURITY_LICENSING_EXCEPTION in the directory of this software -distribution. +    http://www.apache.org/licenses/LICENSE-2.0 + +If any of the files related to licensing are missing or if you have any +other questions related to licensing please contact Trustwave Holdings, Inc. +directly using the email address security@modsecurity.org. DOCUMENTATION diff --git a/alp2/alp2.c b/alp2/alp2.c index 6046a0ac..fd2d6ba8 100755 --- a/alp2/alp2.c +++ b/alp2/alp2.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include #include diff --git a/alp2/alp2.h b/alp2/alp2.h index 40e381f6..332e3ca3 100644 --- a/alp2/alp2.h +++ b/alp2/alp2.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _ALP2_H_ #define _ALP2_H_ diff --git a/alp2/alp2_pp.c b/alp2/alp2_pp.c index b9299f22..d88d636c 100755 --- a/alp2/alp2_pp.c +++ b/alp2/alp2_pp.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include #include diff --git a/alp2/alp2_pp.h b/alp2/alp2_pp.h index 7bbc21ff..8ccdaeac 100644 --- a/alp2/alp2_pp.h +++ b/alp2/alp2_pp.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _ALP2_LL_H_ #define _ALP2_LL_H_ diff --git a/apache2/acmp.c b/apache2/acmp.c index 23502fb8..a00f1f64 100644 --- a/apache2/acmp.c +++ b/apache2/acmp.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ /* Aho-Corasick Matching */ diff --git a/apache2/acmp.h b/apache2/acmp.h index 13f4e367..bc5f5b2f 100644 --- a/apache2/acmp.h +++ b/apache2/acmp.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef ACMP_H_ #define ACMP_H_ diff --git a/apache2/apache2.h b/apache2/apache2.h index a8791e91..48918060 100644 --- a/apache2/apache2.h +++ b/apache2/apache2.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _APACHE2_H_ #define _APACHE2_H_ diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c index 934622ee..0153bc41 100644 --- a/apache2/apache2_config.c +++ b/apache2/apache2_config.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include diff --git a/apache2/apache2_io.c b/apache2/apache2_io.c index 2b788784..127036f4 100644 --- a/apache2/apache2_io.c +++ b/apache2/apache2_io.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include diff --git a/apache2/apache2_util.c b/apache2/apache2_util.c index 645a24fa..eb345b19 100644 --- a/apache2/apache2_util.c +++ b/apache2/apache2_util.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "modsecurity.h" #include "apache2.h" diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c index bb3246b4..d4025e2a 100644 --- a/apache2/mod_security2.c +++ b/apache2/mod_security2.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c index 5f40a197..fc21f697 100644 --- a/apache2/modsecurity.c +++ b/apache2/modsecurity.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h index d017920f..18795488 100644 --- a/apache2/modsecurity.h +++ b/apache2/modsecurity.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MODSECURITY_H_ #define _MODSECURITY_H_ diff --git a/apache2/msc_geo.c b/apache2/msc_geo.c index 000c6a87..f3e83e7e 100644 --- a/apache2/msc_geo.c +++ b/apache2/msc_geo.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "msc_geo.h" diff --git a/apache2/msc_geo.h b/apache2/msc_geo.h index 5d181b94..7b7dc466 100644 --- a/apache2/msc_geo.h +++ b/apache2/msc_geo.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_GEO_H_ #define _MSC_GEO_H_ diff --git a/apache2/msc_gsb.c b/apache2/msc_gsb.c index c9cec105..f57bd54f 100644 --- a/apache2/msc_gsb.c +++ b/apache2/msc_gsb.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "msc_gsb.h" diff --git a/apache2/msc_gsb.h b/apache2/msc_gsb.h index 6c1aeb13..83cbf72f 100644 --- a/apache2/msc_gsb.h +++ b/apache2/msc_gsb.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_GSB_H_ #define _MSC_GSB_H_ diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c index 5000c806..ffee2d1f 100644 --- a/apache2/msc_logging.c +++ b/apache2/msc_logging.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "modsecurity.h" #include diff --git a/apache2/msc_logging.h b/apache2/msc_logging.h index 3bd56605..f168941f 100644 --- a/apache2/msc_logging.h +++ b/apache2/msc_logging.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_LOGGING_H_ #define _MSC_LOGGING_H_ diff --git a/apache2/msc_lua.c b/apache2/msc_lua.c index 7d108952..494727db 100644 --- a/apache2/msc_lua.c +++ b/apache2/msc_lua.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #if defined(WITH_LUA) diff --git a/apache2/msc_lua.h b/apache2/msc_lua.h index f0a0486b..2272cb68 100644 --- a/apache2/msc_lua.h +++ b/apache2/msc_lua.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #if defined(WITH_LUA) diff --git a/apache2/msc_multipart.c b/apache2/msc_multipart.c index 26c8238c..c5deeca7 100644 --- a/apache2/msc_multipart.c +++ b/apache2/msc_multipart.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "modsecurity.h" #include diff --git a/apache2/msc_multipart.h b/apache2/msc_multipart.h index 3df23d13..7d956095 100644 --- a/apache2/msc_multipart.h +++ b/apache2/msc_multipart.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_MULTIPART_H_ #define _MSC_MULTIPART_H_ diff --git a/apache2/msc_parsers.c b/apache2/msc_parsers.c index 7aad1b53..dc43bef2 100644 --- a/apache2/msc_parsers.c +++ b/apache2/msc_parsers.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "msc_parsers.h" #include diff --git a/apache2/msc_parsers.h b/apache2/msc_parsers.h index 886accec..8df84fca 100644 --- a/apache2/msc_parsers.h +++ b/apache2/msc_parsers.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_PARSERS_H_ #define _MSC_PARSERS_H_ diff --git a/apache2/msc_pcre.c b/apache2/msc_pcre.c index 43869ab3..5b92b7fc 100644 --- a/apache2/msc_pcre.c +++ b/apache2/msc_pcre.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "msc_pcre.h" #include "apr_strings.h" diff --git a/apache2/msc_pcre.h b/apache2/msc_pcre.h index 703dff18..4891f61c 100644 --- a/apache2/msc_pcre.h +++ b/apache2/msc_pcre.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_PCRE_H_ #define _MSC_PCRE_H_ diff --git a/apache2/msc_release.c b/apache2/msc_release.c index 97160d8d..6d4c350d 100644 --- a/apache2/msc_release.c +++ b/apache2/msc_release.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "msc_release.h" diff --git a/apache2/msc_release.h b/apache2/msc_release.h index ea0b6236..0154ede6 100644 --- a/apache2/msc_release.h +++ b/apache2/msc_release.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_RELEASE_H_ #define _MSC_RELEASE_H_ diff --git a/apache2/msc_reqbody.c b/apache2/msc_reqbody.c index 1f13f82a..1086b278 100644 --- a/apache2/msc_reqbody.c +++ b/apache2/msc_reqbody.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "modsecurity.h" #include "re.h" diff --git a/apache2/msc_util.c b/apache2/msc_util.c index e716214f..11908627 100644 --- a/apache2/msc_util.c +++ b/apache2/msc_util.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "modsecurity.h" #include diff --git a/apache2/msc_util.h b/apache2/msc_util.h index ad04bcc0..1a1a2228 100644 --- a/apache2/msc_util.h +++ b/apache2/msc_util.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _UTIL_H_ #define _UTIL_H_ diff --git a/apache2/msc_xml.c b/apache2/msc_xml.c index 80eb724e..d9cb09cc 100644 --- a/apache2/msc_xml.c +++ b/apache2/msc_xml.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "msc_xml.h" diff --git a/apache2/msc_xml.h b/apache2/msc_xml.h index 511bbcb3..a3183212 100644 --- a/apache2/msc_xml.h +++ b/apache2/msc_xml.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_XML_H_ #define _MSC_XML_H_ diff --git a/apache2/persist_dbm.c b/apache2/persist_dbm.c index a446bf9b..fd511e41 100644 --- a/apache2/persist_dbm.c +++ b/apache2/persist_dbm.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "persist_dbm.h" #include "apr_sdbm.h" diff --git a/apache2/persist_dbm.h b/apache2/persist_dbm.h index 1b7a340f..2ad68e47 100644 --- a/apache2/persist_dbm.h +++ b/apache2/persist_dbm.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _PERSIST_DBM_H_ #define _PERSIST_DBM_H_ diff --git a/apache2/re.c b/apache2/re.c index 4bf4b914..de39d76f 100644 --- a/apache2/re.c +++ b/apache2/re.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include diff --git a/apache2/re.h b/apache2/re.h index aab13a32..7e9c8106 100644 --- a/apache2/re.h +++ b/apache2/re.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef _MSC_RE_H_ #define _MSC_RE_H_ diff --git a/apache2/re_actions.c b/apache2/re_actions.c index 152559ad..05103fb1 100644 --- a/apache2/re_actions.c +++ b/apache2/re_actions.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "re.h" #include diff --git a/apache2/re_operators.c b/apache2/re_operators.c index c9c58414..7eb72e2d 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "re.h" #include "msc_pcre.h" @@ -973,20 +968,134 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c /* pm */ +static char *parse_pm_content(const char *op_parm, unsigned short int op_len, msre_rule *rule, char **error_msg) { + char *parm = NULL; + char *content = NULL; + unsigned short int offset = 0; + char converted = 0; + int i, x; + unsigned char bin = 0, esc = 0, bin_offset = 0; + unsigned char bin_parm[3], c = 0; + char *processed = NULL; + + content = apr_pstrdup(rule->ruleset->mp, op_parm); + + if (content == NULL) { + *error_msg = apr_psprintf(rule->ruleset->mp, "Error allocating memory for pattern matching content."); + return NULL; + } + + while (offset < op_len && apr_isspace(content[offset])) { + offset++; + }; + + op_len = strlen(content); + + if (content[offset] == '\"' && content[op_len-1] == '\"') { + parm = apr_pstrdup(rule->ruleset->mp, content + offset + 1); + if (parm == NULL) { + *error_msg = apr_psprintf(rule->ruleset->mp, "Error allocating memory for pattern matching content."); + return NULL; + } + parm[op_len - offset - 2] = '\0'; + } else { + parm = apr_pstrdup(rule->ruleset->mp, content + offset); + if (parm == NULL) { + *error_msg = apr_psprintf(rule->ruleset->mp, "Error allocating memory for pattern matching content."); + return NULL; + } + } + + op_len = strlen(parm); + + if (op_len == 0) { + *error_msg = apr_psprintf(rule->ruleset->mp, "Content length is 0."); + return NULL; + } + + + for (i = 0, x = 0; i < op_len; i++) { + if (parm[i] == '|') { + if (bin) { + bin = 0; + } else { + bin = 1; + } + } else if(!esc && parm[i] == '\\') { + esc = 1; + } else { + if (bin) { + if (apr_isdigit(parm[i]) || + parm[i] == 'A' || parm[i] == 'a' || + parm[i] == 'B' || parm[i] == 'b' || + parm[i] == 'C' || parm[i] == 'c' || + parm[i] == 'D' || parm[i] == 'd' || + parm[i] == 'E' || parm[i] == 'e' || + parm[i] == 'F' || parm[i] == 'f') + { + bin_parm[bin_offset] = (char)parm[i]; + bin_offset++; + if (bin_offset == 2) { + c = strtol((char *)bin_parm, (char **) NULL, 16) & 0xFF; + bin_offset = 0; + parm[x] = c; + x++; + converted = 1; + } + } else if (parm[i] == ' ') { + } + } else if (esc) { + if (parm[i] == ':' || + parm[i] == ';' || + parm[i] == '\\' || + parm[i] == '\"') + { + parm[x] = parm[i]; + x++; + } else { + *error_msg = apr_psprintf(rule->ruleset->mp, "Unsupported escape sequence."); + return NULL; + } + esc = 0; + converted = 1; + } else { + parm[x] = parm[i]; + x++; + } + } + } + + if (converted) { + op_len = x; + } + + processed = apr_pstrmemdup(rule->ruleset->mp, parm, op_len); + + if (processed == NULL) { + *error_msg = apr_psprintf(rule->ruleset->mp, "Error allocating memory for pattern matching content."); + return NULL; + } + + return processed; +} + static int msre_op_pm_param_init(msre_rule *rule, char **error_msg) { ACMP *p; const char *phrase; const char *next; + unsigned short int op_len; if ((rule->op_param == NULL)||(strlen(rule->op_param) == 0)) { *error_msg = apr_psprintf(rule->ruleset->mp, "Missing parameter for operator 'pm'."); return 0; /* ERROR */ } + op_len = strlen(rule->op_param); + p = acmp_create(0, rule->ruleset->mp); if (p == NULL) return 0; - phrase = apr_pstrdup(rule->ruleset->mp, rule->op_param); + phrase = apr_pstrdup(rule->ruleset->mp, parse_pm_content(rule->op_param, op_len, rule, error_msg)); /* Loop through phrases */ /* ENH: Need to allow quoted phrases w/space */ @@ -1013,6 +1122,8 @@ static int msre_op_pmFromFile_param_init(msre_rule *rule, char **error_msg) { char *start; char *end; const char *rulefile_path; + char *processed = NULL; + unsigned short int op_len; apr_status_t rc; apr_file_t *fd; ACMP *p; @@ -1077,10 +1188,14 @@ static int msre_op_pmFromFile_param_init(msre_rule *rule, char **error_msg) { return 0; } + op_len = strlen(buf); + processed = apr_pstrdup(rule->ruleset->mp, parse_pm_content(buf, op_len, rule, error_msg)); + /* Trim Whitespace */ - start = buf; + start = processed; while ((apr_isspace(*start) != 0) && (*start != '\0')) start++; - end = buf + strlen(buf); + end = processed + strlen(processed); + //end = buf + strlen(buf); if (end > start) end--; while ((end > start) && (apr_isspace(*end) != 0)) end--; if (end > start) { @@ -1803,17 +1918,20 @@ static int msre_op_endsWith_execute(modsec_rec *msr, msre_rule *rule, msre_var * return 0; } -/* m */ +/* strmatch */ -static int msre_op_m_param_init(msre_rule *rule, char **error_msg) { +static int msre_op_strmatch_param_init(msre_rule *rule, char **error_msg) { const apr_strmatch_pattern *compiled_pattern; const char *pattern = rule->op_param; + unsigned short int op_len; if (error_msg == NULL) return -1; *error_msg = NULL; + op_len = strlen(pattern); + /* Compile pattern */ - compiled_pattern = apr_strmatch_precompile(rule->ruleset->mp, pattern, 1); + compiled_pattern = apr_strmatch_precompile(rule->ruleset->mp, parse_pm_content(pattern, op_len, rule, error_msg), 1); if (compiled_pattern == NULL) { *error_msg = apr_psprintf(rule->ruleset->mp, "Error compiling pattern: %s", pattern); return 0; @@ -1824,7 +1942,7 @@ static int msre_op_m_param_init(msre_rule *rule, char **error_msg) { return 1; /* OK */ } -static int msre_op_m_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, char **error_msg) { +static int msre_op_strmatch_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, char **error_msg) { apr_strmatch_pattern *compiled_pattern = (apr_strmatch_pattern *)rule->op_param_data; const char *target; unsigned int target_length; @@ -3590,11 +3708,11 @@ void msre_engine_register_default_operators(msre_engine *engine) { msre_op_endsWith_execute ); - /* m */ + /* strmatch */ msre_engine_op_register(engine, - "m", - msre_op_m_param_init, - msre_op_m_execute + "strmatch", + msre_op_strmatch_param_init, + msre_op_strmatch_execute ); /* validateDTD */ diff --git a/apache2/re_tfns.c b/apache2/re_tfns.c index fb7f15c8..2820dff3 100644 --- a/apache2/re_tfns.c +++ b/apache2/re_tfns.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include diff --git a/apache2/re_variables.c b/apache2/re_variables.c index 6e520996..8c6a61a1 100644 --- a/apache2/re_variables.c +++ b/apache2/re_variables.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "http_core.h" diff --git a/apache2/utf8tables.h b/apache2/utf8tables.h index e386a4f1..9b975868 100644 --- a/apache2/utf8tables.h +++ b/apache2/utf8tables.h @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #ifndef UTF8TABLES_H_ diff --git a/ext/mod_op_strstr.c b/ext/mod_op_strstr.c index c0524dc6..cd4f298c 100644 --- a/ext/mod_op_strstr.c +++ b/ext/mod_op_strstr.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "httpd.h" #include "http_core.h" diff --git a/ext/mod_reqbody_example.c b/ext/mod_reqbody_example.c index c9ad62b8..133e320f 100644 --- a/ext/mod_reqbody_example.c +++ b/ext/mod_reqbody_example.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ /* This is just an example on how to make an extension to allow custom * request body parsing. This just describes how to do this externally diff --git a/ext/mod_tfn_reverse.c b/ext/mod_tfn_reverse.c index 048c800b..17048b66 100644 --- a/ext/mod_tfn_reverse.c +++ b/ext/mod_tfn_reverse.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "httpd.h" #include "http_core.h" diff --git a/ext/mod_var_remote_addr_port.c b/ext/mod_var_remote_addr_port.c index 2a787c13..0fda2553 100644 --- a/ext/mod_var_remote_addr_port.c +++ b/ext/mod_var_remote_addr_port.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include "httpd.h" #include "http_core.h" diff --git a/mlogc/mlogc-batch-load.pl b/mlogc/mlogc-batch-load.pl new file mode 100755 index 00000000..a2db13bb --- /dev/null +++ b/mlogc/mlogc-batch-load.pl @@ -0,0 +1,147 @@ +#!/usr/bin/perl +# +# ModSecurity for Apache 2.x, http://www.modsecurity.org/ +# Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +# +# You may not use this file except in compliance with +# the License.  You may obtain a copy of the License at +# +#     http://www.apache.org/licenses/LICENSE-2.0 +# +# If any of the files related to licensing are missing or if you have any +# other questions related to licensing please contact Trustwave Holdings, Inc. +# directly using the email address security@modsecurity.org. + +use strict; +use File::Find qw(find); +use File::Spec::Functions qw(catfile); +use Sys::Hostname qw(hostname); +use Digest::MD5 qw(md5_hex); + +my $ROOTDIR = $ARGV[0] || ''; +my $MLOGC = $ARGV[1] || ''; +my $MLOGCCONF = $ARGV[2] || ''; +my @AUDIT = (); + +if ($ROOTDIR eq '' or ! -e $MLOGC or ! -e $MLOGCCONF) { + printf STDERR "\nUsage: $0 \n\n"; + exit 1; +} + +open(MLOGC, "|$MLOGC -f $MLOGCCONF") or die "ERROR: could not open '$MLOGC' - $!\n"; + +find( + { + wanted => sub { + my($fn,$dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size); + + (($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size) = stat($_)) && + -f _ && +#### MODSEC-204 /^\d{8}-\d+-\w{24}$/s + /^\d{8}-\d+-.{24}$/s + && (($fn = $File::Find::name) =~ s/^\Q$ROOTDIR\E//) + && push(@AUDIT, [$fn, $size]); + }, + follow => 1, + }, + $ROOTDIR +); + +for my $audit (@AUDIT) { + my $fn = $audit->[0]; + my $line = ""; + my $err = 0; + my $ln = 0; + my $sln = 0; + my $sect = ""; + my $data = ""; + my %data = ( + hostname => hostname(), + remote_addr => "-", + remote_user => "-", + local_user => "-", + logtime => "-", + request => "-", + response_status => "-", + bytes_sent => "-", + referer => "-", + user_agent => "-", + uniqueid => "-", + sessionid => "-", + audit_file => $fn, + extra => "0", + audit_size => $audit->[1], + md5 => "-", + ); + + ### Parse the audit file in an attempt to recreate the original log line + open (AUDIT, "<".catfile($ROOTDIR,$fn)) or $err = 1; + if ($err == 1) { + print STDERR "ERROR: could not open '$fn' - $!\n"; + next; + } + + while($line = ) { + $data .= $line; + chop $line; + $ln++; + $sln++; + if ($line =~ m%^--[0-9A-Fa-f]{8}-([A-Z])--$%) { + $sect = $1; + $sln = 0; + next; + }; + if ($sect eq 'A') { + if ($line =~ m%^(\[[-\d/: a-zA-Z]{27}\]) (\S+) (\S+) (\d+) (\S+) (\d+)%) { + $data{logtime} = $1; + $data{uniqueid} = $2; + $data{remote_addr} = $3; + } + next; + } + elsif ($sect eq 'B') { + if ($sln == 1) { + $data{request} = $line; + } + elsif ($line =~ m%^User=Agent: (.*)%i) { + $data{user_agent} = $1; + } + elsif ($line =~ m%^Referer: (.*)%i) { + $data{referer} = $1; + } + next; + } + elsif ($sect eq 'F') { + if ($sln == 1 and $line =~ m%^\S+ (\d{3})\D?.*%) { + $data{response_status} = $1; + } + elsif ($line =~ m%^Content-Length: (\d+)%i) { + $data{bytes_sent} = $1; + } + next; + } + } + $data{md5} = md5_hex($data); + + printf MLOGC ( + "%s %s %s %s %s \"%s\" %s %s \"%s\" \"%s\" %s \"%s\" %s %s %s md5:%s\n", + $data{hostname}, + $data{remote_addr}, + $data{remote_user}, + $data{local_user}, + $data{logtime}, + $data{request}, + $data{response_status}, + $data{bytes_sent}, + $data{referer}, + $data{user_agent}, + $data{uniqueid}, + $data{sessionid}, + $data{audit_file}, + $data{extra}, + $data{audit_size}, + $data{md5}, + ); + +} + diff --git a/mlogc/mlogc-batch-load.pl.in b/mlogc/mlogc-batch-load.pl.in index b1a3d8e5..74ce99b4 100755 --- a/mlogc/mlogc-batch-load.pl.in +++ b/mlogc/mlogc-batch-load.pl.in @@ -1,21 +1,16 @@ #!@PERL@ # # ModSecurity for Apache 2.x, http://www.modsecurity.org/ -# Copyright (c) 2004-2009 Trustwave Holdings, Inc. (http://www.trustwave.com/) +# Copyright (c) 2004-2011 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 -# distribution) which contains the complete text of the licence. +# You may not use this file except in compliance with +# the License.  You may obtain a copy of the License at # -# There are special exceptions to the terms and conditions of the GPL -# as it is applied to this software. View the full text of the exception in -# file MODSECURITY_LICENSING_EXCEPTION in the directory of this software -# distribution. +#     http://www.apache.org/licenses/LICENSE-2.0 # # If any of the files related to licensing are missing or if you have any # other questions related to licensing please contact Trustwave Holdings, Inc. -# directly using the email address support@trustwave.com. -# +# directly using the email address security@modsecurity.org. use strict; use File::Find qw(find); diff --git a/mlogc/mlogc.c b/mlogc/mlogc.c index b4a4f428..3e2502bf 100644 --- a/mlogc/mlogc.c +++ b/mlogc/mlogc.c @@ -1,21 +1,16 @@ /* - * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * 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 - * distribution) which contains the complete text of the licence. - * - * There are special exceptions to the terms and conditions of the GPL - * as it is applied to this software. View the full text of the exception in - * file MODSECURITY_LICENSING_EXCEPTION in the directory of this software - * distribution. - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address support@trustwave.com. - * - */ +* ModSecurity for Apache 2.x, http://www.modsecurity.org/ +* Copyright (c) 2004-2011 Trustwave Holdings, Inc. (http://www.trustwave.com/) +* +* You may not use this file except in compliance with +* the License.  You may obtain a copy of the License at +* +*     http://www.apache.org/licenses/LICENSE-2.0 +* +* If any of the files related to licensing are missing or if you have any +* other questions related to licensing please contact Trustwave Holdings, Inc. +* directly using the email address security@modsecurity.org. +*/ #include #include