From cb7d8a4e99f7231db87c548d29e50a40f76e8e47 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jun 03 2013 16:39:16 +0000 Subject: import mod_security-2.7.3-2.el7.src.rpm --- diff --git a/.mod_security.metadata b/.mod_security.metadata new file mode 100644 index 0000000..93b3e9f --- /dev/null +++ b/.mod_security.metadata @@ -0,0 +1 @@ +38b352e85a9d12b26a1da9433051b41e9f196936 SOURCES/modsecurity-apache_2.7.3.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/10-mod_security.conf b/SOURCES/10-mod_security.conf new file mode 100644 index 0000000..dfe0955 --- /dev/null +++ b/SOURCES/10-mod_security.conf @@ -0,0 +1,5 @@ +LoadModule security2_module modules/mod_security2.so + + + LoadModule unique_id_module modules/mod_unique_id.so + diff --git a/SOURCES/mod_security-2.7.3-fix-mem-leak-and-cve-2013-2765.patch b/SOURCES/mod_security-2.7.3-fix-mem-leak-and-cve-2013-2765.patch new file mode 100644 index 0000000..3913668 --- /dev/null +++ b/SOURCES/mod_security-2.7.3-fix-mem-leak-and-cve-2013-2765.patch @@ -0,0 +1,23 @@ +diff -ru modsecurity-apache_2.7.3.orig/apache2/msc_reqbody.c modsecurity-apache_2.7.3/apache2/msc_reqbody.c +--- modsecurity-apache_2.7.3.orig/apache2/msc_reqbody.c 2013-03-24 08:12:29.000000000 +0100 ++++ modsecurity-apache_2.7.3/apache2/msc_reqbody.c 2013-05-28 14:48:39.063673996 +0100 +@@ -170,6 +170,7 @@ + + /* Would storing this chunk mean going over the limit? */ + if ((msr->msc_reqbody_spilltodisk) ++ && (msr->txcfg->reqbody_buffering != REQUEST_BODY_FORCEBUF_ON) + && (msr->msc_reqbody_length + length > (apr_size_t)msr->txcfg->reqbody_inmemory_limit)) + { + msc_data_chunk **chunks; +diff -ru modsecurity-apache_2.7.3.orig/apache2/re_operators.c modsecurity-apache_2.7.3/apache2/re_operators.c +--- modsecurity-apache_2.7.3.orig/apache2/re_operators.c 2013-03-24 08:12:29.000000000 +0100 ++++ modsecurity-apache_2.7.3/apache2/re_operators.c 2013-05-28 14:49:30.448696404 +0100 +@@ -369,7 +369,7 @@ + /* rsub */ + + static char *param_remove_escape(msre_rule *rule, char *str, int len) { +- char *parm = apr_palloc(rule->ruleset->mp, len); ++ char *parm = apr_pcalloc(rule->ruleset->mp, len); + char *ret = parm; + + for(;*str!='\0';str++) { diff --git a/SOURCES/mod_security.conf b/SOURCES/mod_security.conf new file mode 100644 index 0000000..809549e --- /dev/null +++ b/SOURCES/mod_security.conf @@ -0,0 +1,54 @@ + + # ModSecurity Core Rules Set configuration + Include modsecurity.d/*.conf + Include modsecurity.d/activated_rules/*.conf + + # Default recommended configuration + SecRuleEngine On + SecRequestBodyAccess On + SecRule REQUEST_HEADERS:Content-Type "text/xml" \ + "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML" + SecRequestBodyLimit 13107200 + SecRequestBodyNoFilesLimit 131072 + SecRequestBodyInMemoryLimit 131072 + SecRequestBodyLimitAction Reject + SecRule REQBODY_ERROR "!@eq 0" \ + "id:'200001', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2" + SecRule MULTIPART_STRICT_ERROR "!@eq 0" \ + "id:'200002',phase:2,t:none,log,deny,status:44,msg:'Multipart request body \ + failed strict validation: \ + PE %{REQBODY_PROCESSOR_ERROR}, \ + BQ %{MULTIPART_BOUNDARY_QUOTED}, \ + BW %{MULTIPART_BOUNDARY_WHITESPACE}, \ + DB %{MULTIPART_DATA_BEFORE}, \ + DA %{MULTIPART_DATA_AFTER}, \ + HF %{MULTIPART_HEADER_FOLDING}, \ + LF %{MULTIPART_LF_LINE}, \ + SM %{MULTIPART_MISSING_SEMICOLON}, \ + IQ %{MULTIPART_INVALID_QUOTING}, \ + IP %{MULTIPART_INVALID_PART}, \ + IH %{MULTIPART_INVALID_HEADER_FOLDING}, \ + FL %{MULTIPART_FILE_LIMIT_EXCEEDED}'" + + SecRule MULTIPART_UNMATCHED_BOUNDARY "!@eq 0" \ + "id:'200003',phase:2,t:none,log,deny,status:44,msg:'Multipart parser detected a possible unmatched boundary.'" + + SecPcreMatchLimit 1000 + SecPcreMatchLimitRecursion 1000 + + SecRule TX:/^MSC_/ "!@streq 0" \ + "id:'200004',phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'" + + SecResponseBodyAccess Off + SecDebugLog /var/log/httpd/modsec_debug.log + SecDebugLogLevel 0 + SecAuditEngine RelevantOnly + SecAuditLogRelevantStatus "^(?:5|4(?!04))" + SecAuditLogParts ABIJDEFHZ + SecAuditLogType Serial + SecAuditLog /var/log/httpd/modsec_audit.log + SecArgumentSeparator & + SecCookieFormat 0 + SecTmpDir /var/lib/mod_security + SecDataDir /var/lib/mod_security + diff --git a/SPECS/mod_security.spec b/SPECS/mod_security.spec new file mode 100644 index 0000000..55679f7 --- /dev/null +++ b/SPECS/mod_security.spec @@ -0,0 +1,310 @@ +%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} +%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}} +# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 +%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} +%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} +%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} + +%global with_mlogc 0%{?fedora} || 0%{?rhel} <= 6 + +Summary: Security module for the Apache HTTP Server +Name: mod_security +Version: 2.7.3 +Release: 2%{?dist} +License: ASL 2.0 +URL: http://www.modsecurity.org/ +Group: System Environment/Daemons +Source: http://www.modsecurity.org/tarball/%{version}/modsecurity-apache_%{version}.tar.gz +Source1: mod_security.conf +Source2: 10-mod_security.conf +Patch0: mod_security-2.7.3-fix-mem-leak-and-cve-2013-2765.patch +Requires: httpd httpd-mmn = %{_httpd_mmn} +BuildRequires: httpd-devel libxml2-devel pcre-devel curl-devel lua-devel + +%description +ModSecurity is an open source intrusion detection and prevention engine +for web applications. It operates embedded into the web server, acting +as a powerful umbrella - shielding web applications from attacks. + +%if %with_mlogc +%package -n mlogc +Summary: ModSecurity Audit Log Collector +Group: System Environment/Daemons +Requires: mod_security + +%description -n mlogc +This package contains the ModSecurity Audit Log Collector. +%endif + +%prep +%setup -q -n modsecurity-apache_%{version} +%patch0 -p1 + +%build +%configure --enable-pcre-match-limit=1000000 \ + --enable-pcre-match-limit-recursion=1000000 \ + --with-apxs=%{_httpd_apxs} +# remove rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make %{_smp_mflags} + +%install +rm -rf %{buildroot} + +install -d %{buildroot}%{_sbindir} +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_httpd_moddir} +install -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/ +install -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/activated_rules + +install -m0755 apache2/.libs/mod_security2.so %{buildroot}%{_httpd_moddir}/mod_security2.so + +%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" +# 2.4-style +install -Dp -m0644 %{SOURCE2} %{buildroot}%{_httpd_modconfdir}/10-mod_security.conf +install -Dp -m0644 %{SOURCE1} %{buildroot}%{_httpd_confdir}/mod_security.conf +sed -i 's/Include/IncludeOptional/' %{buildroot}%{_httpd_confdir}/mod_security.conf +%else +# 2.2-style +install -d -m0755 %{buildroot}%{_httpd_confdir} +cat %{SOURCE2} %{SOURCE1} > %{buildroot}%{_httpd_confdir}/mod_security.conf +%endif +install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} + +# mlogc +%if %with_mlogc +install -d %{buildroot}%{_localstatedir}/log/mlogc +install -d %{buildroot}%{_localstatedir}/log/mlogc/data +install -m0755 mlogc/mlogc %{buildroot}%{_bindir}/mlogc +install -m0755 mlogc/mlogc-batch-load.pl %{buildroot}%{_bindir}/mlogc-batch-load +install -m0644 mlogc/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf +%endif + +%clean +rm -rf %{buildroot} + +%files +%defattr (-,root,root) +%doc CHANGES LICENSE README.TXT NOTICE +%{_httpd_moddir}/mod_security2.so +%config(noreplace) %{_httpd_confdir}/*.conf +%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" +%config(noreplace) %{_httpd_modconfdir}/*.conf +%endif +%dir %{_sysconfdir}/httpd/modsecurity.d +%dir %{_sysconfdir}/httpd/modsecurity.d/activated_rules +%attr(770,apache,root) %dir %{_localstatedir}/lib/%{name} + +%if %with_mlogc +%files -n mlogc +%defattr (-,root,root) +%doc mlogc/INSTALL +%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/mlogc.conf +%attr(0755,root,root) %dir %{_localstatedir}/log/mlogc +%attr(0770,root,apache) %dir %{_localstatedir}/log/mlogc/data +%attr(0755,root,root) %{_bindir}/mlogc +%attr(0755,root,root) %{_bindir}/mlogc-batch-load +%endif + +%changelog +* Tue May 28 2013 Athmane Madjoudj 2.7.3-2 +- Fix NULL pointer dereference (DoS, crash) (CVE-2013-2765) (RHBZ #967615) +- Fix a possible memory leak. + +* Sat Mar 30 2013 Athmane Madjoudj 2.7.3-1 +- Update to 2.7.3 + +* Fri Jan 25 2013 Athmane Madjoudj 2.7.2-1 +- Update to 2.7.2 +- Update source url in the spec. + +* Thu Nov 22 2012 Athmane Madjoudj 2.7.1-5 +- Use conditional for loading mod_unique_id (rhbz #879264) +- Fix syntax errors on httpd 2.4.x by using IncludeOptional (rhbz #879264, comment #2) + +* Mon Nov 19 2012 Peter Vrabec 2.7.1-4 +- mlogc subpackage is not provided on RHEL7 + +* Thu Nov 15 2012 Athmane Madjoudj 2.7.1-3 +- Add some missing directives RHBZ #569360 +- Fix multipart/invalid part ruleset bypass issue (CVE-2012-4528) + (RHBZ #867424, #867773, #867774) + +* Thu Nov 15 2012 Athmane Madjoudj 2.7.1-2 +- Fix mod_security.conf + +* Thu Nov 15 2012 Athmane Madjoudj 2.7.1-1 +- Update to 2.7.1 +- Remove libxml2 build patch (upstreamed) +- Update spec since upstream moved to github + +* Thu Oct 18 2012 Athmane Madjoudj 2.7.0-2 +- Add a patch to fix failed build against libxml2 >= 2.9.0 + +* Wed Oct 17 2012 Athmane Madjoudj 2.7.0-1 +- Update to 2.7.0 + +* Fri Sep 28 2012 Athmane Madjoudj 2.6.8-1 +- Update to 2.6.8 + +* Wed Sep 12 2012 Athmane Madjoudj 2.6.7-2 +- Re-add mlogc sub-package for epel (#856525) + +* Sat Aug 25 2012 Athmane Madjoudj 2.6.7-1 +- Update to 2.6.7 + +* Sat Aug 25 2012 Athmane Madjoudj 2.6.7-1 +- Update to 2.6.7 + +* Fri Jul 20 2012 Fedora Release Engineering - 2.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jun 22 2012 Peter Vrabec - 2.6.6-2 +- mlogc subpackage is not provided on RHEL + +* Thu Jun 21 2012 Peter Vrabec - 2.6.6-1 +- upgrade + +* Mon May 7 2012 Joe Orton - 2.6.5-3 +- packaging fixes + +* Fri Apr 27 2012 Peter Vrabec 2.6.5-2 +- fix license tag + +* Thu Apr 05 2012 Peter Vrabec 2.6.5-1 +- upgrade & move rules into new package mod_security_crs + +* Fri Feb 10 2012 Petr Pisar - 2.5.13-3 +- Rebuild against PCRE 8.30 +- Do not install non-existing files + +* Fri Jan 13 2012 Fedora Release Engineering - 2.5.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed May 3 2011 Michael Fleming - 2.5.13-1 +- Newer upstream version + +* Wed Jun 30 2010 Michael Fleming - 2.5.12-3 +- Fix log dirs and files ordering per bz#569360 + +* Thu Apr 29 2010 Michael Fleming - 2.5.12-2 +- Fix SecDatadir and minimal config per bz #569360 + +* Sat Feb 13 2010 Michael Fleming - 2.5.12-1 +- Update to latest upstream release +- SECURITY: Fix potential rules bypass and denial of service (bz#563576) + +* Fri Nov 6 2009 Michael Fleming - 2.5.10-2 +- Fix rules and Apache configuration (bz#533124) + +* Thu Oct 8 2009 Michael Fleming - 2.5.10-1 +- Upgrade to 2.5.10 (with Core Rules v2) + +* Sat Jul 25 2009 Fedora Release Engineering - 2.5.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Mar 12 2009 Michael Fleming 2.5.9-1 +- Update to upstream release 2.5.9 +- Fixes potential DoS' in multipart request and PDF XSS handling + +* Wed Feb 25 2009 Fedora Release Engineering - 2.5.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 29 2008 Michael Fleming 2.5.7-1 +- Update to upstream 2.5.7 +- Reinstate mlogc + +* Sat Aug 2 2008 Michael Fleming 2.5.6-1 +- Update to upstream 2.5.6 +- Remove references to mlogc, it no longer ships in the main tarball. +- Link correctly vs. libxml2 and lua (bz# 445839) +- Remove bogus LoadFile directives as they're no longer needed. + +* Sun Apr 13 2008 Michael Fleming 2.1.7-1 +- Update to upstream 2.1.7 + +* Sat Feb 23 2008 Michael Fleming 2.1.6-1 +- Update to upstream 2.1.6 (Extra features including SecUploadFileMode) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.1.5-3 +- Autorebuild for GCC 4.3 + +* Sat Jan 27 2008 Michael Fleming 2.1.5-2 +- Update to 2.1.5 (bz#425986) +- "blocking" -> "optional_rules" per tarball ;-) + + +* Thu Sep 13 2007 Michael Fleming 2.1.3-1 +- Update to 2.1.3 +- Update License tag per guidelines. + +* Mon Sep 3 2007 Joe Orton 2.1.1-3 +- rebuild for fixed 32-bit APR (#254241) + +* Wed Aug 29 2007 Fedora Release Engineering - 2.1.1-2 +- Rebuild for selinux ppc32 issue. + +* Tue Jun 19 2007 Michael Fleming 2.1.1-1 +- New upstream release +- Drop ASCIIZ rule (fixed upstream) +- Re-enable protocol violation/anomalies rules now that REQUEST_FILENAME + is fixed upstream. + +* Sun Apr 1 2007 Michael Fleming 2.1.0-3 +- Automagically configure correct library path for libxml2 library. +- Add LoadModule for mod_unique_id as the logging wants this at runtime + +* Mon Mar 26 2007 Michael Fleming 2.1.0-2 +- Fix DSO permissions (bz#233733) + +* Tue Mar 13 2007 Michael Fleming 2.1.0-1 +- New major release - 2.1.0 +- Fix CVE-2007-1359 with a local rule courtesy of Ivan Ristic +- Addition of core ruleset +- (Build)Requires libxml2 and pcre added. + +* Sun Sep 3 2006 Michael Fleming 1.9.4-2 +- Rebuild +- Fix minor longstanding braino in included sample configuration (bz #203972) + +* Mon May 15 2006 Michael Fleming 1.9.4-1 +- New upstream release + +* Tue Apr 11 2006 Michael Fleming 1.9.3-1 +- New upstream release +- Trivial spec tweaks + +* Wed Mar 1 2006 Michael Fleming 1.9.2-3 +- Bump for FC5 + +* Fri Feb 10 2006 Michael Fleming 1.9.2-2 +- Bump for newer gcc/glibc + +* Wed Jan 18 2006 Michael Fleming 1.9.2-1 +- New upstream release + +* Fri Dec 16 2005 Michael Fleming 1.9.1-2 +- Bump for new httpd + +* Thu Dec 1 2005 Michael Fleming 1.9.1-1 +- New release 1.9.1 + +* Wed Nov 9 2005 Michael Fleming 1.9-1 +- New stable upstream release 1.9 + +* Sat Jul 9 2005 Michael Fleming 1.8.7-4 +- Add Requires: httpd-mmn to get the appropriate "module magic" version + (thanks Ville Skytta) +- Disabled an overly-agressive rule or two.. + +* Sat Jul 9 2005 Michael Fleming 1.8.7-3 +- Correct Buildroot +- Some sensible and safe rules for common apps in mod_security.conf + +* Thu May 19 2005 Michael Fleming 1.8.7-2 +- Don't strip the module (so we can get a useful debuginfo package) + +* Thu May 19 2005 Michael Fleming 1.8.7-1 +- Initial spin for Extras