From 005d1128b254cc026072d155047ad64e2e238f0d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 15 Sep 2015 22:31:24 +0200 Subject: apache_mod_security - pfSense 2.1.x and 2.2.x and other fixes apache_mod_security.xml - Fix install and uninstall - Move the fetch junk to additional_files_needed - Add input validation - Code style and indentation fixes - Improve descriptions and other cosmetics --- config/apache_mod_security/apache_mod_security.xml | 204 ++++++++++++--------- 1 file changed, 121 insertions(+), 83 deletions(-) (limited to 'config') diff --git a/config/apache_mod_security/apache_mod_security.xml b/config/apache_mod_security/apache_mod_security.xml index 0b973689..ee8c7fbb 100644 --- a/config/apache_mod_security/apache_mod_security.xml +++ b/config/apache_mod_security/apache_mod_security.xml @@ -1,76 +1,111 @@ - - + + - - + - + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ +/* ====================================================================================== */ + ]]> + apache_mod_security - 1.0 + 0.1.8 Services: Mod_Security+Apache+Proxy: Site Proxies + /usr/local/pkg/apache_mod_security.inc Mod_Security+Apache+Proxy
Services
apache_mod_security.xml + + apache_mod_security + apache_mod_security.sh + httpd + HTTP Daemon with mod_security + /usr/local/pkg/ - 0644 https://packages.pfsense.org/packages/config/apache_mod_security/apache_mod_security.inc /usr/local/pkg/ - 0644 https://packages.pfsense.org/packages/config/apache_mod_security/apache_mod_security_settings.xml /usr/local/www/ - 0644 https://packages.pfsense.org/packages/config/apache_mod_security/apache_mod_security_view_logs.php + + /usr/local/apachemodsecurity/rules + https://packages.pfsense.org/packages/config/apache_mod_security/rules/10_asl_rules.conf + + + /usr/local/apachemodsecurity/rules + https://packages.pfsense.org/packages/config/apache_mod_security/rules/a_exclude.conf + + + /usr/local/apachemodsecurity/rules + https://packages.pfsense.org/packages/config/apache_mod_security/rules/blacklist.conf + + + /usr/local/apachemodsecurity/rules + https://packages.pfsense.org/packages/config/apache_mod_security/rules/default.conf + + + /usr/local/apachemodsecurity/rules + https://packages.pfsense.org/packages/config/apache_mod_security/rules/recons.conf + + + /usr/local/apachemodsecurity/rules + https://packages.pfsense.org/packages/config/apache_mod_security/rules/rootkits.conf + + + /usr/local/apachemodsecurity/rules + https://packages.pfsense.org/packages/config/apache_mod_security/rules/useragents.conf + Proxy Server Settings - /pkg_edit.php?xml=apache_mod_security_settings.xml&id=0 + /pkg_edit.php?xml=apache_mod_security_settings.xml Site Proxies /pkg.php?xml=apache_mod_security.xml - + Logs @@ -79,7 +114,7 @@ - Site name + Site Name sitename @@ -89,21 +124,21 @@ - Site name + Site Name sitename input - Site Webmaster E-Mail address + Site Webmaster E-Mail Address siteemail input @@ -113,10 +148,10 @@ siteurl 1 - select + select - - + + @@ -138,8 +173,8 @@ certificatefile - (required if Protocol is https) + Name of certificate file under /usr/local/apache22/etc/
+ (Required if 'Protocol' is HTTPS.) ]]> 40 @@ -150,8 +185,8 @@ certificatekeyfile - (required if Protocol is https) + Name of certificate key file under /usr/local/apache22/etc/
+ (Required if 'Protocol' is HTTPS.) ]]> 40 @@ -162,30 +197,30 @@ certificatechainfile - (not required) - ]]> + Name of certificate chain file under /usr/local/apache22/etc/
+ (Not required.) + ]]> 40 input - Preserve Proxy hostname + Preserve Proxy Hostname preserveproxyhostname checkbox - Primary site hostname + Primary Site Hostname primarysitehostname - Leave blank and define the IP Address / port above for IP site proxy (i.e. not named site proxy) + Enter the primary hostname (FQDN) for this website (e.g. www.example.com).
+ Leave blank and define the IP Address / Port above for IP site proxy (i.e. not named site proxy). ]]> 40 @@ -194,37 +229,40 @@ additionalparameters - rowhelper - + rowhelper + - Web server backend URLs - webserveripaddr - Add each web server IP address here. - input - 40 + Web Server Backend URLs + webserveripaddr + Add each web server IP address here. + input + 40 - Additional Site Hostnames (not required) - additionalsitehostnames - Add each webserver hostname address here. - input - 40 + Additional Site Hostnames (Optional) + additionalsitehostnames + Add each webserver hostname address here. + input + 40 - + - - apache_mod_security - apache_mod_security.sh - httpd - HTTP Daemon with mod_security - + + apache_mod_security_install(); + apache_mod_security_upgrade_config(); + + + apache_mod_security_deinstall(); + apache_mod_security_resync(); - /usr/local/pkg/apache_mod_security.inc - \ No newline at end of file + + apache_mod_security_validate_input($_POST, $input_errors); + + -- cgit v1.2.3