Commit 6ad46ab9 authored by tbrehm's avatar tbrehm

Fixed: FS#1744 - Missing table by new setup

Removed unused database tables: 

DROP TABLE `mail_greylist`;
DROP TABLE `firewall_filter`;
DROP TABLE `firewall_forward`;
DROP TABLE `proxy_reverse`;

- Added tables for web folder protection.
parent 0ae8da5c
CREATE TABLE `help_faq` (
`hf_id` int(11) NOT NULL AUTO_INCREMENT,
`hf_section` int(11) DEFAULT NULL,
`hf_order` int(11) DEFAULT '0',
`hf_question` text,
`hf_answer` text,
`sys_userid` int(11) DEFAULT NULL,
`sys_groupid` int(11) DEFAULT NULL,
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
PRIMARY KEY (`hf_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
CREATE TABLE `help_faq_sections` (
`hfs_id` int(11) NOT NULL AUTO_INCREMENT,
`hfs_name` varchar(255) DEFAULT NULL,
`hfs_order` int(11) DEFAULT '0',
`sys_userid` int(11) DEFAULT NULL,
`sys_groupid` int(11) DEFAULT NULL,
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
PRIMARY KEY (`hfs_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
CREATE TABLE IF NOT EXISTS `web_folder` (
`web_folder_id` bigint(20) NOT NULL AUTO_INCREMENT,
`sys_userid` int(11) NOT NULL DEFAULT '0',
`sys_groupid` int(11) NOT NULL DEFAULT '0',
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) NOT NULL DEFAULT '0',
`parent_domain_id` int(11) NOT NULL DEFAULT '0',
`path` varchar(255) DEFAULT NULL,
`active` varchar(255) NOT NULL DEFAULT 'y',
PRIMARY KEY (`web_folder_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
CREATE TABLE IF NOT EXISTS `web_folder_user` (
`web_folder_user_id` bigint(20) NOT NULL AUTO_INCREMENT,
`sys_userid` int(11) NOT NULL DEFAULT '0',
`sys_groupid` int(11) NOT NULL DEFAULT '0',
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`web_folder_id` int(11) NOT NULL DEFAULT '0',
`username` varchar(255) DEFAULT NULL,
`password` varchar(255) DEFAULT NULL,
`active` varchar(255) NOT NULL DEFAULT 'y',
PRIMARY KEY (`web_folder_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
DROP TABLE `mail_greylist`;
DROP TABLE `firewall_filter`;
DROP TABLE `firewall_forward`;
DROP TABLE `proxy_reverse`;
......@@ -374,66 +374,6 @@ CREATE TABLE `firewall` (
-- --------------------------------------------------------
--
-- Table structure for table `firewall_filter`
--
CREATE TABLE `firewall_filter` (
`firewall_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`domain_id` int(11) NOT NULL,
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
`server_id` int(11) unsigned NOT NULL default '0',
`rule_name` varchar(100) default NULL,
`rule_id` int(11) default 1,
`src_ip` varchar(20) NOT NULL,
`src_netmask` varchar(20) NOT NULL,
`dst_ip` varchar(20) NOT NULL,
`dst_netmask` varchar(20) NOT NULL,
`src_from_port` varchar(10) NOT NULL,
`src_to_port` varchar(10) NOT NULL,
`dst_to_port` varchar(10) NOT NULL,
`dst_from_port` varchar(10) NOT NULL,
`protocol` varchar(10) default 'tcp',
`inbound_policy` enum('allow','deny','reject','limit') default 'allow',
`outbound_policy` enum('allow','deny','reject','limit') default 'allow',
`active` enum('n','y') NOT NULL default 'y',
`client_id` int(11) NOT NULL,
PRIMARY KEY (`firewall_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
-- Table structure for table `firewall_forward`
--
CREATE TABLE `firewall_forward` (
`firewall_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`domain_id` int(11) NOT NULL,
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
`server_id` int(11) unsigned NOT NULL default '0',
`application_name` varchar(100) default NULL,
`dst_ip` varchar(20) NOT NULL,
`src_from_port` varchar(10) NOT NULL,
`src_to_port` varchar(10) NOT NULL,
`dst_to_port` varchar(10) NOT NULL,
`dst_from_port` varchar(10) NOT NULL,
`protocol` int(3) default 0,
`active` enum('n','y') NOT NULL default 'y',
`client_id` int(11) NOT NULL,
PRIMARY KEY (`firewall_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
-- Table structure for table `ftp_user`
--
......@@ -640,23 +580,6 @@ CREATE TABLE `mail_get` (
-- --------------------------------------------------------
--
-- Table structure for table `mail_greylist`
--
CREATE TABLE `mail_greylist` (
`greylist_id` int(11) unsigned NOT NULL auto_increment,
`relay_ip` varchar(39) default NULL,
`from_domain` varchar(255) default NULL,
`block_expires` datetime NOT NULL default '0000-00-00 00:00:00',
`record_expires` datetime NOT NULL default '0000-00-00 00:00:00',
`origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO',
`create_time` datetime NOT NULL default '0000-00-00 00:00:00',
PRIMARY KEY (`greylist_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
-- Tabellenstruktur für Tabelle `mail_mailinglist`
--
......@@ -992,26 +915,6 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
-- --------------------------------------------------------
--
-- Table structure for table `proxy_reverse`
--
CREATE TABLE `proxy_reverse` (
`rewrite_id` int(11) NOT NULL AUTO_INCREMENT,
`sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
`sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) unsigned NOT NULL DEFAULT '0',
`rewrite_url_src` varchar(100) NOT NULL,
`rewrite_url_dst` varchar(100) NOT NULL,
`active` enum('n','y') NOT NULL DEFAULT 'y',
PRIMARY KEY (`rewrite_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
-- Table structure for table `remote_session`
--
......@@ -1613,6 +1516,55 @@ CREATE TABLE `web_domain` (
-- --------------------------------------------------------
--
-- Table structure for table `web_folder`
--
CREATE TABLE IF NOT EXISTS `web_folder` (
`web_folder_id` bigint(20) NOT NULL AUTO_INCREMENT,
`sys_userid` int(11) NOT NULL DEFAULT '0',
`sys_groupid` int(11) NOT NULL DEFAULT '0',
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) NOT NULL DEFAULT '0',
`parent_domain_id` int(11) NOT NULL DEFAULT '0',
`path` varchar(255) DEFAULT NULL,
`active` varchar(255) NOT NULL DEFAULT 'y',
PRIMARY KEY (`web_folder_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
--
-- Dumping data for table `web_folder`
--
-- --------------------------------------------------------
--
-- Table structure for table `web_folder_user`
--
CREATE TABLE IF NOT EXISTS `web_folder_user` (
`web_folder_user_id` bigint(20) NOT NULL AUTO_INCREMENT,
`sys_userid` int(11) NOT NULL DEFAULT '0',
`sys_groupid` int(11) NOT NULL DEFAULT '0',
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`web_folder_id` int(11) NOT NULL DEFAULT '0',
`username` varchar(255) DEFAULT NULL,
`password` varchar(255) DEFAULT NULL,
`active` varchar(255) NOT NULL DEFAULT 'y',
PRIMARY KEY (`web_folder_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
--
-- Dumping data for table `web_folder_user`
--
-- --------------------------------------------------------
--
-- Table structure for table `web_traffic`
--
......
<?php
/*
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* 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.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
*/
class ufw_firewall_plugin {
var $plugin_name = 'ufw_firewall_plugin';
var $class_name = 'ufw_firewall_plugin';
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall() {
global $conf;
if ($conf['ufw']['installed'] == true && $conf['services']['firewall'] == true) {
return true;
} else {
return false;
}
}
/*
This function is called when the plugin is loaded
*/
function onLoad() {
global $app;
/*
Register for the events
*/
$app->plugins->registerEvent('firewall_insert',$this->plugin_name,'insert_basic');
$app->plugins->registerEvent('firewall_update',$this->plugin_name,'update_basic');
$app->plugins->registerEvent('firewall_delete',$this->plugin_name,'update_basic');
$app->plugins->registerEvent('firewall_forward_insert',$this->plugin_name,'insert_forward');
$app->plugins->registerEvent('firewall_forward_update',$this->plugin_name,'update_forward');
$app->plugins->registerEvent('firewall_forward_delete',$this->plugin_name,'update_forward');
$app->plugins->registerEvent('firewall_filter_insert',$this->plugin_name,'insert_filter');
$app->plugins->registerEvent('firewall_filter_update',$this->plugin_name,'update_filter');
$app->plugins->registerEvent('firewall_filter_delete',$this->plugin_name,'delete_filter');
$app->plugins->registerEvent('server_insert',$this->plugin_name,'updateSettings');
$app->plugins->registerEvent('server_update',$this->plugin_name,'updateSettings');
}
function insert_basic($event_name,$data) {
global $app, $conf;
$this->update_basic($event_name,$data);
}
function update_basic($event_name,$data) {
global $app, $conf;
$tcp_ports = '';
$udp_ports = '';
$delete_rule = ($data["new"]["active"] == "n" ? "delete " : "");
/*
$ports = explode(',',$data["new"]["tcp_port"]);
if(is_array($ports)) {
foreach($ports as $p) {
if(strstr($p,':')) {
$p_parts = explode(':',$p);
$p_clean = intval($p_parts[0]).':'.intval($p_parts[1]);
} else {
$p_clean = intval($p);
}
//system("ufw $delete_rule allow " . $p_clean . "/tcp");
}
}*/
system("ufw $delete_rule allow out" . $data["new"]["tcp_port"] . "/tcp");
system("ufw $delete_rule allow in" . $data["new"]["tcp_port"] . "/tcp");
system("ufw $delete_rule allow out" . $data["new"]["udp_port"] . "/udp");
system("ufw $delete_rule allow in" . $data["new"]["udp_port"] . "/udp");
//$tcp_ports = trim($tcp_ports);
/*
$ports = explode(',',$data["new"]["udp_port"]);
if(is_array($ports)) {
foreach($ports as $p) {
if(strstr($p,':')) {
$p_parts = explode(':',$p);
$p_clean = intval($p_parts[0]).':'.intval($p_parts[1]);
} else {
$p_clean = intval($p);
}
}
}
system("ufw $delete_rule allow " . $p_clean . "/udp");
*/
if($data["new"]["active"] == 'y') {
exec('/etc/init.d/ufw force-reload');
$app->log('Restarting the firewall',LOGLEVEL_DEBUG);
} else {
exec('/etc/init.d/ufw force-reload');
$app->log('Flushing the firewall',LOGLEVEL_DEBUG);
}
}
function insert_filter($event_name,$data) {
global $app, $conf;
$this->update_filter($event_name,$data);
}
function getCidr($mask) {
$long = ip2long($mask);
$base = ip2long('255.255.255.255');
return 32-log(($long ^ $base)+1,2);
}
function update_filter($event_name,$data) {
global $app, $conf;
$app->uses("getconf");
$server_config = $app->getconf->get_server_config($conf["server_id"], 'ufw');
$network = $server_config["ufw_network"];
$records = $app->db->queryAllRecords(
"SELECT
protocol,
IF
(src_from_port=src_to_port, src_from_port, CONCAT(src_from_port, ':',src_to_port))
AS
src_port,
IF
(dst_from_port=dst_to_port, dst_from_port, CONCAT(dst_from_port, ':',dst_to_port))
AS
dst_port,
IF
(src_ip='0.0.0.0','any',src_ip)
AS
src_ip,
IF
(dst_ip='0.0.0.0','any',dst_ip)
AS
dst_ip,
src_netmask,
dst_netmask,
inbound_policy,
outbound_policy,
rule_id,
active
FROM
firewall_filter
ORDER BY
rule_id
ASC");
$commands = array();
foreach ($records as $record) {
$src_netmask = $this->getCidr($record["src_netmask"]);
$dst_netmask = $this->getCidr($record["dst_netmask"]);
$src_port = ($record["src_port"] == "0:65535" ? "" : " port " .$record["src_port"]);
$dst_port = ($record["dst_port"] == "0:65535" ? "" : " port " . $record["dst_port"]);
$src_ip = ($record["src_ip"] == "any" ? "any" : $record["src_ip"] . "/" . $src_netmask);
$dst_ip = ($record["dst_ip"] == "any" ? "any" : $record["dst_ip"] . "/" . $dst_netmask);
//$protocol = $record["protocol"];
$delete = ($record["active"] == "n" ? true : false);
//$protocols = array_split($record["protocol"]);
//$inbound = ($record["inbound"] == 0 ? "deny " : "allow");
//$outbound = ($record["outbound"] == 0 ? "deny out" : "allow out");
//foreach ($protocols as $protocol) {
$ufw = new UFW();
//$ufw->setDelete($record["active"] == "n");
$ufw->setRuleID($record["rule_id"]);
$ufw->setSrcIP($src_ip);
$ufw->setDstIP($dst_ip);
$ufw->setSrcPort($src_port);
$ufw->setDstPort($dst_port);
$ufw->setInboundPolicy($record["inbound_policy"]);
$ufw->setOutboundPolicy($record["outbound_policy"]);
$ufw->setProtocol($record["protocol"]);
$ufw->setNetwork($network);
if ($delete) {
$ufw->delete();
} else {
$ufw->insert();
}
//}
/*
if ($record["active"] == 'n') {
$inbound = ($record["inbound"] == 0 ? "deny " : "allow");
$outbound = ($record["outbound"] == 0 ? "deny out" : "allow out");
array_push($commands, "ufw deny proto udp from $src_ip $src_port to $dst_ip $dst_port");
if ($protocol == "tcp/udp") {
array_push($commands, "ufw delete $inbound proto udp from $src_ip $src_port to $dst_ip $dst_port");
array_push($commands, "ufw delete $outbound proto udp from $src_ip $src_port to $dst_ip $dst_port");
array_push($commands, "ufw delete $inbound proto tcp from $src_ip $src_port to $dst_ip $dst_port");
array_push($commands, "ufw delete $outbound proto tcp from $src_ip $src_port to $dst_ip $dst_port");
} else {
array_push($commands, "ufw delete $inbound proto $protocol from $src_ip $src_port to $dst_ip $dst_port");
array_push($commands, "ufw delete $outbound proto $protocol from $src_ip $src_port to $dst_ip $dst_port");
}
} elseif ($record["inbound"] == 0) {
if ($protocol == "tcp/udp") {
array_push($commands, "ufw deny proto udp from $src_ip $src_port to $dst_ip $dst_port");
array_push($commands, "ufw deny proto tcp from $src_ip $src_port to $dst_ip $dst_port");
} else {
array_push($commands, "ufw deny proto $protocol from $src_ip $src_port to $dst_ip $dst_port");
}
} elseif ($record["outbound"] == 0) {
if ($protocol == "tcp/udp") {
array_push($commands, "ufw deny out proto udp from $network to any $dst_port");
array_push($commands, "ufw deny out proto tcp from $network to any $dst_port");
} else {
array_push($commands, "ufw deny out proto $protocol from $network to any $dst_port");
}
}*/
}
/*
$records = $app->db->queryAllRecords(
"SELECT
protocol,
IF
(src_from_port=src_to_port, src_from_port, CONCAT(src_from_port, ':',src_to_port))
AS
src_port,
IF
(dst_from_port=dst_to_port, dst_from_port, CONCAT(dst_from_port, ':',dst_to_port))
AS
dst_port,
IF
(src_ip='0.0.0.0','any',src_ip)
AS
src_ip,
IF
(dst_ip='0.0.0.0','any',dst_ip)
AS
dst_ip,
src_netmask,
dst_netmask,
inbound,
outbound,
active
FROM
firewall_filter
WHERE
inbound=1
OR
outbound=1
AND
active='y'");
foreach ($records as $record) {
$src_netmask = $this->getCidr($record["src_netmask"]);
$dst_netmask = $this->getCidr($record["dst_netmask"]);
$src_port = ($record["src_port"] == "0:65535" ? "" : " port " .$record["src_port"]);
$dst_port = ($record["dst_port"] == "0:65535" ? "" : " port " . $record["dst_port"]);
$src_ip = ($record["src_ip"] == "any" ? "any" : $record["src_ip"] . "/" . $src_netmask);
$dst_ip = ($record["dst_ip"] == "any" ? "any" : $record["dst_ip"] . "/" . $dst_netmask);
$protocol = $record["protocol"];
$outbound = ($record["outbound"] == 1 ? "out" : "");
if ($record["inbound"] == 1) {
if ($protocol == "tcp/udp") {
array_push($commands, "ufw allow proto udp from $src_ip $src_port to $dst_ip $dst_port");
array_push($commands, "ufw allow proto tcp from $src_ip $src_port to $dst_ip $dst_port");
} else {
array_push($commands, "ufw allow proto $protocol from $src_ip $src_port to $dst_ip $dst_port");
}
} elseif ($record["outbound"] == 1) {
if ($protocol == "tcp/udp") {
array_push($commands, "ufw allow out proto udp from $network to any $dst_port");
array_push($commands, "ufw allow out proto tcp from $network to any $dst_port");
} else {
array_push($commands, "ufw allow out proto $protocol from $network to any $dst_port");
}
}
}
foreach ($commands as $command) {
system($command);
}
*/
}
function insert_forward($event_name,$data) {
global $app, $conf;
$this->update_filter($event_name,$data);
}
function update_forward($event_name,$data) {
global $app, $conf;
}
//update server config
function backupConfigs()
{
copy('/etc/default/ufw','/etc/default/ufw~');
copy('/etc/ufw/ufw.conf','/etc/ufw/ufw.conf~');
copy('/etc/ufw/before.rules','/etc/ufw/before.rules~');
}
function updateSettings($event_name,$data) {
global $app, $conf;
// get the config
$app->uses("getconf");
$server_config = $app->getconf->get_server_config($conf["server_id"], 'ufw');
if(is_dir('/etc/ufw') && is_file('/etc/default/ufw')) {