"; //var_dump($mods_group); - + //mod_security settings if (is_array($config['installedpackages']['apachemodsecuritysettings'])){ $mods_settings=$config['installedpackages']['apachemodsecuritysettings']['config'][0]; } + //configure virtual hosts $namevirtualhosts=array(); $namevirtualhosts[0]=$global_listen; @@ -376,7 +534,7 @@ EOF; $port=($virtualhost['port'] ? $virtualhost['port'] : $default_port[$virtualhost['proto']]); if (!in_array("{$ip}:{$port}",$namevirtualhosts)) $namevirtualhosts[]="{$ip}:{$port}"; - + $vh_config.="# {$virtualhost['description']}\n"; $vh_config.="\n"; $vh_config.=" ServerName ". preg_replace ("/\r\n(\S+)/","\n ServerAlias $1",base64_decode($virtualhost['primarysitehostname'])) ."\n"; @@ -441,6 +599,7 @@ EOF; } } } + $vh_config.= apache_textarea_decode($backend['custom'])."\n\n"; $vh_config.=" \n\n"; } $vh_config.="\n"; @@ -469,7 +628,6 @@ EOF; } } - if ($mods_settings!="") $SecGuardianLog="SecGuardianLog \"|".RULES_DIRECTORY."/util/httpd-guardian\""; @@ -525,7 +683,7 @@ EOF; // Read already configured addresses if (is_array($settings['row'])){ foreach($settings['row'] as $row) { - if ($row['ipaddress'] && $row['ipport']) + if ($row['interface'] && $row['ipport']) $configuredaliases[] = $row; } } @@ -544,8 +702,8 @@ EOF; // Automatically add this to configuration $aplisten=split(":",$namevirtualhost); $config['installedpackages']['apachesettings']['config'][0]['row'][] = array('ipaddress' => $aplisten[0], 'ipport' => $aplisten[1]); - } } + } // Process Status Page $mod_status = ""; if ($settings['statuspage'] == "on") { @@ -554,12 +712,12 @@ EOF; SetHandler server-status Order Deny,Allow Deny from all - + EOF; $mod_status .= "Allow from ".($settings['netaccessstatus'] ? $settings['netaccessstatus'] : "All")."\n"; $mod_status .= "\n"; } - + // update configuration with actual ip bindings write_config($pkg['addedit_string']); diff --git a/config/apache_mod_security-dev/apache_mod_security.template b/config/apache_mod_security-dev/apache_mod_security.template index f6ad6e3e..d004a9ae 100644 --- a/config/apache_mod_security-dev/apache_mod_security.template +++ b/config/apache_mod_security-dev/apache_mod_security.template @@ -1,6 +1,6 @@ 2 - + on Name @@ -87,7 +87,7 @@ Description description - + @@ -109,7 +109,7 @@ input 45 - + Base Rules baserules @@ -202,8 +202,8 @@ modsecurity_crs_10_setup.conf file.
Leave empty to load setup defaults.]]> textarea base64 - 15 - 90 + 15 + 90 Custom mod_security ErrorDocument @@ -217,8 +217,8 @@ Custom mod_security ErrorDocument. textarea base64 - 10 - 90 + 10 + 90 Custom mod_security rules @@ -232,12 +232,12 @@ Paste any custom mod_security rules that you would like to use textarea base64 - 10 - 90 + 10 + 90 apache_mod_security_resync(); /usr/local/pkg/apache_mod_security.inc - \ No newline at end of file + diff --git a/config/apache_mod_security-dev/apache_mod_security_manipulation.xml b/config/apache_mod_security-dev/apache_mod_security_manipulation.xml index ab681c66..7477e540 100644 --- a/config/apache_mod_security-dev/apache_mod_security_manipulation.xml +++ b/config/apache_mod_security-dev/apache_mod_security_manipulation.xml @@ -142,4 +142,4 @@ apache_mod_security_resync(); /usr/local/pkg/apache_mod_security.inc - \ No newline at end of file + diff --git a/config/apache_mod_security-dev/apache_mod_security_sync.xml b/config/apache_mod_security-dev/apache_mod_security_sync.xml index 0d8d8c8f..3e1c0a9c 100755 --- a/config/apache_mod_security-dev/apache_mod_security_sync.xml +++ b/config/apache_mod_security-dev/apache_mod_security_sync.xml @@ -68,8 +68,30 @@ Automatically sync apache configuration changes synconchanges - Automatically sync apache changes to the hosts defined below. - checkbox + Select a sync method for Apache + ModSecurity. + select + + auto + + + + + + + + Sync timeout + synctimeout + Select sync max wait time + select + + 250 + + + + + + + Remote Server diff --git a/config/apache_mod_security-dev/apache_mod_security_view_logs.php b/config/apache_mod_security-dev/apache_mod_security_view_logs.php index 1956a217..669c71f4 100755 --- a/config/apache_mod_security-dev/apache_mod_security_view_logs.php +++ b/config/apache_mod_security-dev/apache_mod_security_view_logs.php @@ -68,7 +68,7 @@ include("head.inc"); 2 - Virutal Hosts + Virtual Hosts /pkg.php?xml=apache_virtualhost.xml 2 @@ -93,7 +93,7 @@ Server hostname hostname - + input @@ -102,17 +102,19 @@ Default Bind to IP Address globalbindtoipaddr - - NOTE: Leave blank to bind to *]]> + - input + interfaces_selection + + + Default Bind to port globalbindtoport - NOTE: Leave blank to bind to 80]]> + NOTE: Leave blank to bind to 80]]> input 5 @@ -281,9 +283,9 @@ Status Page statuspage - + - select + select @@ -293,7 +295,7 @@ Network Access Status Page netaccessstatus - + input diff --git a/config/apache_mod_security-dev/apache_view_logs.php b/config/apache_mod_security-dev/apache_view_logs.php index 77c14176..494f37cd 100644 --- a/config/apache_mod_security-dev/apache_view_logs.php +++ b/config/apache_mod_security-dev/apache_view_logs.php @@ -42,7 +42,7 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version")); if(strstr($pfSversion, "1.2")) $one_two = true; -$pgtitle = "Status: Apache Vhosts Logs"; +$pgtitle = "Status: Apache VirtualHost Logs"; include("head.inc"); ?> @@ -171,8 +171,8 @@ function showLog(content,url,logtype) -

- +

diff --git a/config/apache_mod_security-dev/apache_virtualhost.xml b/config/apache_mod_security-dev/apache_virtualhost.xml index b3653bdf..53478721 100644 --- a/config/apache_mod_security-dev/apache_virtualhost.xml +++ b/config/apache_mod_security-dev/apache_virtualhost.xml @@ -4,40 +4,41 @@ + All rights reserved. +*/ +/* ========================================================================== */ +/* + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code MUST retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code MUST retain the above copyright notice, + this list of conditions and the following disclaimer. - 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. + 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. - */ - /* ========================================================================== */ - ]]> + 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. +*/ +/* ========================================================================== */ +]]> apachevirtualhost 1.0 @@ -143,7 +144,7 @@ 2 - Virutal Hosts + Virtual Hosts /pkg.php?xml=apache_virtualhost.xml 2 @@ -201,17 +202,14 @@ Select protocols that this virtual host will accept connections select - - + + Server Name(s) primarysitehostname - - - Leave blank and define the IP Address / port above for IP site proxy (i.e. not named site proxy)]]> - + Leave blank and define the IP Address / port above for IP site proxy (i.e. not named site proxy)]]> 40 2 textarea @@ -238,27 +236,21 @@ Site Webmaster E-Mail address siteemail 50 - - - + input Site description description 50 - - - + input HTTPS SSL certificate ssl_cert Choose the SSL Server Certificate here. - select_source + select_source descr refid @@ -283,62 +275,62 @@ locations - rowhelper - + rowhelper + on - + - - compress - Compress data to save bandwidth? + + compress + Compress data to save bandwidth? select - - + + - - sitepath - leave blank to use /]]> - input - 12 + + sitepath + leave blank to use /]]> + input + 12 - balancer - Server balancer / pool + balancer + Server balancer / pool name name none select_source - 5 + 5 - LbMethod]]> - lbmethod - Server balance method - select - - - - + LB Method]]> + lbmethod + Server balance method + select + + + + - Backend path - backendpath - Leave blank to use /]]> - input - 12 + Backend Path + backendpath + Leave blank to use /]]> + input + 12 modsecgroup - Choose Modsecurity group to use on this virtual host. - select_source + Choose ModSecurity group to use on this virtual host. + select_source name name @@ -348,20 +340,29 @@ modsecmanipulation Choose Modsecurity group to use on this virtual host. - select_source + select_source name name none - Balancer options]]> - options - ex: ttl=60 stickysession='JSESSIONID']]> - input - 11 + Balancer options]]> + options + ex: ttl=60 stickysession='JSESSIONID']]> + input + 11 - + + Location Custom Settings + custom + + textarea + 65 + 10 + base64 + + Logging @@ -370,25 +371,19 @@ Preserve Proxy hostname preserveproxyhostname - - - + checkbox Log file logfile - - - + select - - - - - + + + + + Custom Options @@ -397,7 +392,7 @@ Custom Options custom - Paste extra apache config for this virtualhost. This is usefull for rewrite rules for example. + Pass extra Apache config for this VirtualHost. This is useful for Rewrite rules for example. textarea 90 10 @@ -415,4 +410,4 @@ apache_mod_security_resync(); /usr/local/pkg/apache_mod_security.inc - \ No newline at end of file + -- cgit v1.2.3