From cea1e5d3d0a7c45568a1539f9ecb6cf36c7f7f6c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 15 Aug 2012 05:43:27 -0400
Subject: [PATCH] Fixed: FS#2346 - doveadm request disabledoveadm column in mail_user table - Added missing sys_tpl table to ispconfig3.sql and moved the definition of the table to the upd_0035.sql file as new tables cant be added in existing update files. - added new ssl_key field to web_domain table. - cleaned up unused code from apache plugin.
---
server/plugins-available/apache2_plugin.inc.php | 526 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 333 insertions(+), 193 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 30eecfe..2967273 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2012, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -35,6 +35,7 @@
// private variables
var $action = '';
+ var $ssl_certificate_changed = false;
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
@@ -85,11 +86,15 @@
$app->plugins->registerEvent('web_folder_update',$this->plugin_name,'web_folder_update');
$app->plugins->registerEvent('web_folder_delete',$this->plugin_name,'web_folder_delete');
+ $app->plugins->registerEvent('ftp_user_delete',$this->plugin_name,'ftp_user_delete');
+
}
// Handle the creation of SSL certificates
function ssl($event_name,$data) {
global $app, $conf;
+
+ $app->uses('system');
// load the server configuration options
$app->uses('getconf');
@@ -100,7 +105,9 @@
//* Only vhosts can have a ssl cert
if($data["new"]["type"] != "vhost") return;
- if(!is_dir($data['new']['document_root'].'/ssl')) exec('mkdir -p '.$data['new']['document_root'].'/ssl');
+ // if(!is_dir($data['new']['document_root'].'/ssl')) exec('mkdir -p '.$data['new']['document_root'].'/ssl');
+ if(!is_dir($data['new']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
+
$ssl_dir = $data['new']['document_root'].'/ssl';
$domain = $data['new']['ssl_domain'];
$key_file = $ssl_dir.'/'.$domain.'.key.org';
@@ -111,11 +118,13 @@
//* Create a SSL Certificate
if($data['new']['ssl_action'] == 'create') {
+ $this->ssl_certificate_changed = true;
+
//* Rename files if they exist
- if(file_exists($key_file)) rename($key_file,$key_file.'.bak');
- if(file_exists($key_file2)) rename($key_file2,$key_file2.'.bak');
- if(file_exists($csr_file)) rename($csr_file,$csr_file.'.bak');
- if(file_exists($crt_file)) rename($crt_file,$crt_file.'.bak');
+ if(file_exists($key_file)) $app->system->rename($key_file,$key_file.'.bak');
+ if(file_exists($key_file2)) $app->system->rename($key_file2,$key_file2.'.bak');
+ if(file_exists($csr_file)) $app->system->rename($csr_file,$csr_file.'.bak');
+ if(file_exists($crt_file)) $app->system->rename($crt_file,$crt_file.'.bak');
$rand_file = $ssl_dir.'/random_file';
$rand_data = md5(uniqid(microtime(),1));
@@ -125,7 +134,7 @@
$rand_data .= md5(uniqid(microtime(),1));
$rand_data .= md5(uniqid(microtime(),1));
}
- file_put_contents($rand_file, $rand_data);
+ $app->system->file_put_contents($rand_file, $rand_data);
$ssl_password = substr(md5(uniqid(microtime(),1)), 0, 15);
@@ -152,7 +161,7 @@
challengePassword = A challenge password";
$ssl_cnf_file = $ssl_dir.'/openssl.conf';
- file_put_contents($ssl_cnf_file,$ssl_cnf);
+ $app->system->file_put_contents($ssl_cnf_file,$ssl_cnf);
$rand_file = escapeshellcmd($rand_file);
$key_file = escapeshellcmd($key_file);
@@ -162,7 +171,7 @@
$config_file = escapeshellcmd($ssl_cnf_file);
$crt_file = escapeshellcmd($crt_file);
- if(is_file($ssl_cnf_file)) {
+ if(is_file($ssl_cnf_file) && !is_link($ssl_cnf_file)) {
exec("openssl genrsa -des3 -rand $rand_file -passout pass:$ssl_password -out $key_file 2048");
exec("openssl req -new -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -out $csr_file -days $ssl_days -config $config_file");
@@ -181,11 +190,11 @@
}
- exec('chmod 400 '.$key_file2);
- @unlink($config_file);
- @unlink($rand_file);
- $ssl_request = $app->db->quote(file_get_contents($csr_file));
- $ssl_cert = $app->db->quote(file_get_contents($crt_file));
+ $app->system->chmod($key_file2,0400);
+ @$app->system->unlink($config_file);
+ @$app->system->unlink($rand_file);
+ $ssl_request = $app->db->quote($app->system->file_get_contents($csr_file));
+ $ssl_cert = $app->db->quote($app->system->file_get_contents($crt_file));
/* Update the DB of the (local) Server */
$app->db->query("UPDATE web_domain SET ssl_request = '$ssl_request', ssl_cert = '$ssl_cert' WHERE domain = '".$data['new']['domain']."'");
$app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
@@ -196,16 +205,30 @@
//* Save a SSL certificate to disk
if($data["new"]["ssl_action"] == 'save') {
+ $this->ssl_certificate_changed = true;
$ssl_dir = $data["new"]["document_root"]."/ssl";
$domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
+ $key_file = $ssl_dir.'/'.$domain.'.key.org';
+ $key_file2 = $ssl_dir.'/'.$domain.'.key';
$csr_file = $ssl_dir.'/'.$domain.".csr";
$crt_file = $ssl_dir.'/'.$domain.".crt";
$bundle_file = $ssl_dir.'/'.$domain.".bundle";
- if(trim($data["new"]["ssl_request"]) != '') file_put_contents($csr_file,$data["new"]["ssl_request"]);
- if(trim($data["new"]["ssl_cert"]) != '') file_put_contents($crt_file,$data["new"]["ssl_cert"]);
- if(trim($data["new"]["ssl_bundle"]) != '') file_put_contents($bundle_file,$data["new"]["ssl_bundle"]);
+
+ //* Backup files
+ if(file_exists($key_file)) $app->system->copy($key_file,$key_file.'~');
+ if(file_exists($key_file2)) $app->system->copy($key_file2,$key_file2.'~');
+ if(file_exists($csr_file)) $app->system->copy($csr_file,$csr_file.'~');
+ if(file_exists($crt_file)) $app->system->copy($crt_file,$crt_file.'~');
+ if(file_exists($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'~');
+
+ //* Write new ssl files
+ if(trim($data["new"]["ssl_request"]) != '') $app->system->file_put_contents($csr_file,$data["new"]["ssl_request"]);
+ if(trim($data["new"]["ssl_cert"]) != '') $app->system->file_put_contents($crt_file,$data["new"]["ssl_cert"]);
+ if(trim($data["new"]["ssl_bundle"]) != '') $app->system->file_put_contents($bundle_file,$data["new"]["ssl_bundle"]);
+
/* Update the DB of the (local) Server */
$app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
+
/* Update also the master-DB of the Server-Farm */
$app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
$app->log('Saving SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
@@ -218,14 +241,14 @@
$csr_file = $ssl_dir.'/'.$domain.'.csr';
$crt_file = $ssl_dir.'/'.$domain.'.crt';
$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
- if(file_exists($web_config['CA_path'].'/openssl.cnf'))
+ if(file_exists($web_config['CA_path'].'/openssl.cnf') && !is_link($web_config['CA_path'].'/openssl.cnf'))
{
exec("openssl ca -batch -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -revoke $crt_file");
$app->log("Revoking CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
};
- unlink($csr_file);
- unlink($crt_file);
- unlink($bundle_file);
+ $app->system->unlink($csr_file);
+ $app->system->unlink($crt_file);
+ $app->system->unlink($bundle_file);
/* Update the DB of the (local) Server */
$app->db->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '' WHERE domain = '".$data['new']['domain']."'");
$app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
@@ -364,6 +387,9 @@
}
}
}
+
+ //* Remove protection of old folders
+ $app->system->web_folder_protection($data['old']['document_root'],false);
//* Move the site data
$tmp_docroot = explode('/',$data['new']['document_root']);
@@ -376,13 +402,14 @@
//* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path
if(@is_dir($data['new']['document_root'])) {
- rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d'));
+ $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d'));
$app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d'),LOGLEVEL_DEBUG);
}
//* Create new base directory, if it does not exist yet
- if(!is_dir($new_dir)) exec('mkdir -p '.$new_dir);
- exec('mv '.$data['old']['document_root'].' '.$new_dir);
+ if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir);
+ //exec('mv '.$data['old']['document_root'].' '.$new_dir);
+ $app->system->rename($data['old']['document_root'],$new_dir);
$app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG);
// Handle the change in php_open_basedir
@@ -406,46 +433,45 @@
//print_r($data);
// Check if the directories are there and create them if necessary.
- if(!is_dir($data['new']['document_root'].'/web')) exec('mkdir -p '.$data['new']['document_root'].'/web');
- if(!is_dir($data['new']['document_root'].'/web/error') and $data['new']['errordocs']) exec('mkdir -p '.$data['new']['document_root'].'/web/error');
+ $app->system->web_folder_protection($data['new']['document_root'],false);
+
+ if(!is_dir($data['new']['document_root'].'/web')) $app->system->mkdirpath($data['new']['document_root'].'/web');
+ if(!is_dir($data['new']['document_root'].'/web/error') and $data['new']['errordocs']) $app->system->mkdirpath($data['new']['document_root'].'/web/error');
//if(!is_dir($data['new']['document_root'].'/log')) exec('mkdir -p '.$data['new']['document_root'].'/log');
- if(!is_dir($data['new']['document_root'].'/ssl')) exec('mkdir -p '.$data['new']['document_root'].'/ssl');
- if(!is_dir($data['new']['document_root'].'/cgi-bin')) exec('mkdir -p '.$data['new']['document_root'].'/cgi-bin');
- if(!is_dir($data['new']['document_root'].'/tmp')) exec('mkdir -p '.$data['new']['document_root'].'/tmp');
-
+ if(!is_dir($data['new']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
+ if(!is_dir($data['new']['document_root'].'/cgi-bin')) $app->system->mkdirpath($data['new']['document_root'].'/cgi-bin');
+ if(!is_dir($data['new']['document_root'].'/tmp')) $app->system->mkdirpath($data['new']['document_root'].'/tmp');
+ if(!is_dir($data['new']['document_root'].'/webdav')) $app->system->mkdirpath($data['new']['document_root'].'/webdav');
+
+ //* Create the new private directory
+ if(!is_dir($data['new']['document_root'].'/private')) {
+ $app->system->mkdirpath($data['new']['document_root'].'/private');
+ $app->system->chmod($data['new']['document_root'].'/private',0710);
+ $app->system->chown($data['new']['document_root'].'/private',$username);
+ $app->system->chgrp($data['new']['document_root'].'/private',$groupname);
+ }
+
+
// Remove the symlink for the site, if site is renamed
if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
if(is_dir('/var/log/ispconfig/httpd/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/httpd/'.$data['old']['domain']);
- if(is_link($data['old']['document_root'].'/log')) unlink($data['old']['document_root'].'/log');
- }
-
- // Create the symlink for the logfiles
- if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']);
- if(!is_link($data['new']['document_root'].'/log')) {
-// exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
- if ($web_config["website_symlinks_rel"] == 'y') {
- $this->create_relative_link("/var/log/ispconfig/httpd/".$data["new"]["domain"], $data["new"]["document_root"]."/log");
- } else {
- exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
- }
-
- $app->log('Creating symlink: ln -s /var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log',LOGLEVEL_DEBUG);
- }
- /*
- // Create the symlink for the logfiles
- // This does not work as vlogger cannot log trough symlinks.
- if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
- if(is_dir($data['old']['document_root'].'/log')) exec('rm -rf '.$data['old']['document_root'].'/log');
- if(is_link('/var/log/ispconfig/httpd/'.$data['old']['domain'])) unlink('/var/log/ispconfig/httpd/'.$data['old']['domain']);
+ if(is_link($data['old']['document_root'].'/log')) $app->system->unlink($data['old']['document_root'].'/log');
}
- // Create the symlink for the logfiles
- if(!is_dir($data['new']['document_root'].'/log')) exec('mkdir -p '.$data['new']['document_root'].'/log');
- if(!is_link('/var/log/ispconfig/httpd/'.$data['new']['domain'])) {
- exec('ln -s '.$data['new']['document_root'].'/log /var/log/ispconfig/httpd/'.$data['new']['domain']);
- $app->log('Creating symlink: ln -s '.$data['new']['document_root'].'/log /var/log/ispconfig/httpd/'.$data['new']['domain'],LOGLEVEL_DEBUG);
+ //* Create the log dir if nescessary and mount it
+ if(!is_dir($data['new']['document_root'].'/log') || is_link($data['new']['document_root'].'/log')) {
+ if(is_link($data['new']['document_root'].'/log')) unlink($data['new']['document_root'].'/log');
+ $app->system->mkdir($data['new']['document_root'].'/log');
+ $app->system->chown($data['new']['document_root'].'/log','root');
+ $app->system->chgrp($data['new']['document_root'].'/log','root');
+ $app->system->chmod($data['new']['document_root'].'/log',0755);
+ exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.$data['new']['domain']).' '.escapeshellarg($data['new']['document_root'].'/log'));
+ //* add mountpoint to fstab
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log none bind 0 0';
+ $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1);
}
- */
+
+ $app->system->web_folder_protection($data['new']['document_root'],true);
// Get the client ID
$client = $app->dbmaster->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = '.intval($data['new']['sys_groupid']));
@@ -480,7 +506,7 @@
if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
//* Remove symlink if target folder has been changed.
if($data['old']['document_root'] != '' && $data['old']['document_root'] != $data['new']['document_root'] && is_link($tmp_symlink)) {
- unlink($tmp_symlink);
+ $app->system->unlink($tmp_symlink);
}
// create the symlinks, if not exist
if(!is_link($tmp_symlink)) {
@@ -591,21 +617,29 @@
}
}
-
-
//* If the security level is set to high
if(($this->action == 'insert' && $data['new']['type'] == 'vhost') or ($web_config['set_folder_permissions_on_update'] == 'y' && $data['new']['type'] == 'vhost')) {
+
+ $app->system->web_folder_protection($data['new']['document_root'],false);
+
+ //* Check if we have the new private folder and create it if nescessary
+ if(!is_dir($data['new']['document_root'].'/private')) $app->system->mkdir($data['new']['document_root'].'/private');
+
if($web_config['security_level'] == 20) {
-
- $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*');
- $this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web'));
+
+ $app->system->chmod($data['new']['document_root'],0755);
+ $app->system->chmod($data['new']['document_root'].'/web',0710);
+ $app->system->chmod($data['new']['document_root'].'/webdav',0710);
+ $app->system->chmod($data['new']['document_root'].'/private',0710);
+ $app->system->chmod($data['new']['document_root'].'/ssl',0755);
// make tmp directory writable for Apache and the website users
- $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+ $app->system->chmod($data['new']['document_root'].'/tmp',0777);
- // Set Log symlink to 755 to make the logs accessible by the FTP user
- $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log");
+ // Set Log directory to 755 to make the logs accessible by the FTP user
+ if(realpath($data['new']['document_root'].'/log') == '/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log') {
+ $app->system->chmod($data['new']['document_root'].'/log',0755);
+ }
if($web_config['add_web_users_to_sshusers_group'] == 'y') {
$command = 'usermod';
@@ -630,58 +664,88 @@
$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
//* Chown all default directories
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/log'));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
- $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));
-
- /*
- * Workaround for jailkit: If jailkit is enabled for the site, the
- * website root has to be owned by the root user and we have to chmod it to 755 then
- */
-
- //* Check if there is a jailkit user for this site
- $tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'");
- if($tmp['number'] > 0) {
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
+ $app->system->chown($data['new']['document_root'],'root');
+ $app->system->chgrp($data['new']['document_root'],'root');
+ $app->system->chown($data['new']['document_root'].'/cgi-bin',$username);
+ $app->system->chgrp($data['new']['document_root'].'/cgi-bin',$groupname);
+ if(realpath($data['new']['document_root'].'/log') == '/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log') {
+ $app->system->chown($data['new']['document_root'].'/log','root',false);
+ $app->system->chgrp($data['new']['document_root'].'/log',$groupname,false);
}
- unset($tmp);
+ $app->system->chown($data['new']['document_root'].'/ssl','root');
+ $app->system->chgrp($data['new']['document_root'].'/ssl','root');
+ $app->system->chown($data['new']['document_root'].'/tmp',$username);
+ $app->system->chgrp($data['new']['document_root'].'/tmp',$groupname);
+ $app->system->chown($data['new']['document_root'].'/web',$username);
+ $app->system->chgrp($data['new']['document_root'].'/web',$groupname);
+ $app->system->chown($data['new']['document_root'].'/web/error',$username);
+ $app->system->chgrp($data['new']['document_root'].'/web/error',$groupname);
+ $app->system->chown($data['new']['document_root'].'/web/stats',$username);
+ $app->system->chgrp($data['new']['document_root'].'/web/stats',$groupname);
+ $app->system->chown($data['new']['document_root'].'/webdav',$username);
+ $app->system->chgrp($data['new']['document_root'].'/webdav',$groupname);
+ $app->system->chown($data['new']['document_root'].'/private',$username);
+ $app->system->chgrp($data['new']['document_root'].'/private',$groupname);
// If the security Level is set to medium
} else {
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/log'));
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/ssl'));
- $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/web'));
+ $app->system->chmod($data['new']['document_root'],0755);
+ $app->system->chmod($data['new']['document_root'].'/web',0755);
+ $app->system->chmod($data['new']['document_root'].'/webdav',0755);
+ $app->system->chmod($data['new']['document_root'].'/ssl',0755);
+ $app->system->chmod($data['new']['document_root'].'/cgi-bin',0755);
+ if(realpath($data['new']['document_root'].'/log') == '/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log') {
+ $app->system->chmod($data['new']['document_root'].'/log',0755);
+ }
// make temp directory writable for Apache and the website users
- $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
+ $app->system->chmod($data['new']['document_root'].'/tmp',0777);
- $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
- $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'].'/log'));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));
+ $app->system->chown($data['new']['document_root'],'root');
+ $app->system->chgrp($data['new']['document_root'],'root');
+ $app->system->chown($data['new']['document_root'].'/cgi-bin',$username);
+ $app->system->chgrp($data['new']['document_root'].'/cgi-bin',$groupname);
+ if(realpath($data['new']['document_root'].'/log') == '/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log') {
+ $app->system->chown($data['new']['document_root'].'/log','root',false);
+ $app->system->chgrp($data['new']['document_root'].'/log','root',false);
+ }
+ $app->system->chown($data['new']['document_root'].'/ssl','root');
+ $app->system->chgrp($data['new']['document_root'].'/ssl','root');
+ $app->system->chown($data['new']['document_root'].'/tmp',$username);
+ $app->system->chgrp($data['new']['document_root'].'/tmp',$groupname);
+ $app->system->chown($data['new']['document_root'].'/web',$username);
+ $app->system->chgrp($data['new']['document_root'].'/web',$groupname);
+ $app->system->chown($data['new']['document_root'].'/web/error',$username);
+ $app->system->chgrp($data['new']['document_root'].'/web/error',$groupname);
+ $app->system->chown($data['new']['document_root'].'/web/stats',$username);
+ $app->system->chgrp($data['new']['document_root'].'/web/stats',$groupname);
+ $app->system->chown($data['new']['document_root'].'/webdav',$username);
+ $app->system->chgrp($data['new']['document_root'].'/webdav',$groupname);
}
}
+
+ //* Protect web folders
+ $app->system->web_folder_protection($data['new']['document_root'],true);
- // Change the ownership of the error log to the owner of the website
- if(!@is_file($data['new']['document_root'].'/log/error.log')) exec('touch '.escapeshellcmd($data['new']['document_root']).'/log/error.log');
- $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/log/error.log');
+ // Change the ownership of the error log to the root user
+ if(!@is_file('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log')) exec('touch '.escapeshellcmd('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log'));
+ $app->system->chown('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log','root');
+ $app->system->chgrp('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log','root');
- //* Write the custom php.ini file, if custom_php_ini filed is not empty
+ //* Write the custom php.ini file, if custom_php_ini fieled is not empty
$custom_php_ini_dir = $web_config['website_basedir'].'/conf/'.$data['new']['system_user'];
- if(!is_dir($web_config['website_basedir'].'/conf')) mkdir($web_config['website_basedir'].'/conf');
+ if(!is_dir($web_config['website_basedir'].'/conf')) $app->system->mkdir($web_config['website_basedir'].'/conf');
+
+ //* add open_basedir restriction to custom php.ini content, required for suphp only
+ if(!stristr($data['new']['custom_php_ini'],'open_basedir') && $data['new']['php'] == 'suphp') {
+ $data['new']['custom_php_ini'] .= "\nopen_basedir = '".$data['new']['php_open_basedir']."'\n";
+ }
+ //* Create custom php.ini
if(trim($data['new']['custom_php_ini']) != '') {
$has_custom_php_ini = true;
- if(!is_dir($custom_php_ini_dir)) mkdir($custom_php_ini_dir);
+ if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
$php_ini_content = '';
if($data['new']['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
@@ -693,13 +757,13 @@
}
}
if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
- $php_ini_content .= file_get_contents($master_php_ini_path)."\n";
+ $php_ini_content .= $app->system->file_get_contents($master_php_ini_path)."\n";
}
$php_ini_content .= str_replace("\r",'',trim($data['new']['custom_php_ini']));
- file_put_contents($custom_php_ini_dir.'/php.ini',$php_ini_content);
+ $app->system->file_put_contents($custom_php_ini_dir.'/php.ini',$php_ini_content);
} else {
$has_custom_php_ini = false;
- if(is_file($custom_php_ini_dir.'/php.ini')) unlink($custom_php_ini_dir.'/php.ini');
+ if(is_file($custom_php_ini_dir.'/php.ini')) $app->system->unlink($custom_php_ini_dir.'/php.ini');
}
@@ -913,15 +977,17 @@
$fastcgi_starter_path = str_replace('[client_id]',$client_id,$fastcgi_starter_path);
if (!is_dir($fastcgi_starter_path)) {
- exec('mkdir -p '.escapeshellcmd($fastcgi_starter_path));
+ $app->system->mkdirpath($fastcgi_starter_path);
//exec('chown '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.escapeshellcmd($fastcgi_starter_path));
$app->log('Creating fastcgi starter script directory: '.$fastcgi_starter_path,LOGLEVEL_DEBUG);
}
- exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.escapeshellcmd($fastcgi_starter_path));
-
+ //exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.escapeshellcmd($fastcgi_starter_path));
+ $app->system->chown($fastcgi_starter_path,$data['new']['system_user']);
+ $app->system->chgrp($fastcgi_starter_path,$data['new']['system_group']);
+
$fcgi_tpl = new tpl();
$fcgi_tpl->newTemplate('php-fcgi-starter.master');
@@ -957,15 +1023,15 @@
$fcgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir));
$fcgi_starter_script = escapeshellcmd($fastcgi_starter_path.$fastcgi_config['fastcgi_starter_script']);
- file_put_contents($fcgi_starter_script,$fcgi_tpl->grab());
+ $app->system->file_put_contents($fcgi_starter_script,$fcgi_tpl->grab());
unset($fcgi_tpl);
$app->log('Creating fastcgi starter script: '.$fcgi_starter_script,LOGLEVEL_DEBUG);
-
- exec('chmod 755 '.$fcgi_starter_script);
- exec('chown '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$fcgi_starter_script);
-
+ $app->system->chmod($fcgi_starter_script,0755);
+ $app->system->chown($fcgi_starter_script,$data['new']['system_user']);
+ $app->system->chgrp($fcgi_starter_script,$data['new']['system_group']);
+
$tpl->setVar('fastcgi_alias',$fastcgi_config['fastcgi_alias']);
$tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
$tpl->setVar('fastcgi_starter_script',$fastcgi_config['fastcgi_starter_script']);
@@ -1046,8 +1112,10 @@
$cgi_starter_path = str_replace('[client_id]',$client_id,$cgi_starter_path);
if (!is_dir($cgi_starter_path)) {
- exec('mkdir -p '.escapeshellcmd($cgi_starter_path));
- exec('chown '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.escapeshellcmd($cgi_starter_path));
+ $app->system->mkdirpath($cgi_starter_path);
+ $app->system->chmod($cgi_starter_script,0755);
+ $app->system->chown($cgi_starter_script,$data['new']['system_user']);
+ $app->system->chgrp($cgi_starter_script,$data['new']['system_group']);
$app->log('Creating cgi starter script directory: '.$cgi_starter_path,LOGLEVEL_DEBUG);
}
@@ -1073,14 +1141,15 @@
}
$cgi_starter_script = escapeshellcmd($cgi_starter_path.$cgi_config['cgi_starter_script']);
- file_put_contents($cgi_starter_script,$cgi_tpl->grab());
+ $app->system->file_put_contents($cgi_starter_script,$cgi_tpl->grab());
unset($cgi_tpl);
$app->log('Creating cgi starter script: '.$cgi_starter_script,LOGLEVEL_DEBUG);
- exec('chmod 755 '.$cgi_starter_script);
- exec('chown '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$cgi_starter_script);
+ $app->system->chmod($cgi_starter_script,0755);
+ $app->system->chown($cgi_starter_script,$data['new']['system_user']);
+ $app->system->chgrp($cgi_starter_script,$data['new']['system_group']);
$tpl->setVar('cgi_starter_path',$cgi_starter_path);
$tpl->setVar('cgi_starter_script',$cgi_config['cgi_starter_script']);
@@ -1089,7 +1158,7 @@
$vhost_file = escapeshellcmd($web_config['vhost_conf_dir'].'/'.$data['new']['domain'].'.vhost');
//* Make a backup copy of vhost file
- if(file_exists($vhost_file)) copy($vhost_file,$vhost_file.'~');
+ if(file_exists($vhost_file)) $app->system->copy($vhost_file,$vhost_file.'~');
//* create empty vhost array
$vhosts = array();
@@ -1102,6 +1171,11 @@
}
//* Add vhost for ipv4 IP with SSL
+ $ssl_dir = $data['new']['document_root'].'/ssl';
+ $domain = $data['new']['ssl_domain'];
+ $key_file = $ssl_dir.'/'.$domain.'.key';
+ $crt_file = $ssl_dir.'/'.$domain.'.crt';
+
if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) {
if(count($rewrite_rules) > 0){
$vhosts[] = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 1, 'port' => '443', 'redirects' => $rewrite_rules);
@@ -1135,7 +1209,7 @@
$tpl->setLoop('vhosts',$vhosts);
//* Write vhost file
- file_put_contents($vhost_file,$tpl->grab());
+ $app->system->file_put_contents($vhost_file,$tpl->grab());
$app->log('Writing the vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
unset($tpl);
@@ -1147,18 +1221,18 @@
//* Set the symlink to enable the vhost
//* First we check if there is a old type of symlink and remove it
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/'.$data['new']['domain'].'.vhost');
- if(is_link($vhost_symlink)) unlink($vhost_symlink);
+ if(is_link($vhost_symlink)) $app->system->unlink($vhost_symlink);
//* Remove old or changed symlinks
if($data['new']['subdomain'] != $data['old']['subdomain'] or $data['new']['active'] == 'n') {
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/900-'.$data['new']['domain'].'.vhost');
if(is_link($vhost_symlink)) {
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/100-'.$data['new']['domain'].'.vhost');
if(is_link($vhost_symlink)) {
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
}
@@ -1178,38 +1252,40 @@
if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/900-'.$data['old']['domain'].'.vhost');
if(is_link($vhost_symlink)) {
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/100-'.$data['old']['domain'].'.vhost');
if(is_link($vhost_symlink)) {
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
if(is_link($vhost_symlink)) {
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
$vhost_file = escapeshellcmd($web_config['vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
- unlink($vhost_file);
+ $app->system->unlink($vhost_file);
$app->log('Removing file: '.$vhost_file,LOGLEVEL_DEBUG);
}
//* Create .htaccess and .htpasswd file for website statistics
if(!is_file($data['new']['document_root'].'/web/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) {
- if(!is_dir($data['new']['document_root'].'/web/stats')) mkdir($data['new']['document_root'].'/web/stats');
+ if(!is_dir($data['new']['document_root'].'/web/stats')) $app->system->mkdir($data['new']['document_root'].'/web/stats');
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/.htpasswd_stats\nrequire valid-user";
- file_put_contents($data['new']['document_root'].'/web/stats/.htaccess',$ht_file);
- chmod($data['new']['document_root'].'/web/stats/.htaccess',0755);
+ $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htaccess',$ht_file);
+ $app->system->chmod($data['new']['document_root'].'/web/stats/.htaccess',0755);
unset($ht_file);
}
if(!is_file($data['new']['document_root'].'/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
if(trim($data['new']['stats_password']) != '') {
$htp_file = 'admin:'.trim($data['new']['stats_password']);
- file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
- chmod($data['new']['document_root'].'/.htpasswd_stats',0755);
+ $app->system->web_folder_protection($data['new']['document_root'],false);
+ $app->system->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
+ $app->system->web_folder_protection($data['new']['document_root'],true);
+ $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0755);
unset($htp_file);
}
}
@@ -1236,14 +1312,41 @@
$app->log('Apache online status after restart is: '.$apache_online_status_after_restart,LOGLEVEL_DEBUG);
if($apache_online_status_before_restart && !$apache_online_status_after_restart) {
$app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
- copy($vhost_file,$vhost_file.'.err');
+ $app->system->copy($vhost_file,$vhost_file.'.err');
if(is_file($vhost_file.'~')) {
//* Copy back the last backup file
- copy($vhost_file.'~',$vhost_file);
+ $app->system->copy($vhost_file.'~',$vhost_file);
} else {
//* There is no backup file, so we create a empty vhost file with a warning message inside
- file_put_contents($vhost_file,"# Apache did not start after modifying this vhost file.\n# Please check file $vhost_file.err for syntax errors.");
+ $app->system->file_put_contents($vhost_file,"# Apache did not start after modifying this vhost file.\n# Please check file $vhost_file.err for syntax errors.");
}
+ if($this->ssl_certificate_changed === true) {
+
+ $ssl_dir = $data['new']['document_root'].'/ssl';
+ $domain = $data['new']['ssl_domain'];
+ $key_file = $ssl_dir.'/'.$domain.'.key.org';
+ $key_file2 = $ssl_dir.'/'.$domain.'.key';
+ $csr_file = $ssl_dir.'/'.$domain.'.csr';
+ $crt_file = $ssl_dir.'/'.$domain.'.crt';
+ $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
+
+ //* Backup the files that might have caused the error
+ if(is_file($key_file)) $app->system->copy($key_file,$key_file.'.err');
+ if(is_file($key_file2)) $app->system->copy($key_file2,$key_file2.'.err');
+ if(is_file($csr_file)) $app->system->copy($csr_file,$csr_file.'.err');
+ if(is_file($crt_file)) $app->system->copy($crt_file,$crt_file.'.err');
+ if(is_file($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'.err');
+
+ //* Restore the ~ backup files
+ if(is_file($key_file.'~')) $app->system->copy($key_file.'~',$key_file);
+ if(is_file($key_file2.'~')) $app->system->copy($key_file2.'~',$key_file2);
+ if(is_file($crt_file.'~')) $app->system->copy($crt_file.'~',$crt_file);
+ if(is_file($csr_file.'~')) $app->system->copy($csr_file.'~',$csr_file);
+ if(is_file($bundle_file.'~')) $app->system->copy($bundle_file.'~',$bundle_file);
+
+ $app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the SSL configuration. Saved non-working SSL files with .err extension.',LOGLEVEL_WARN);
+ }
+
$app->services->restartService('httpd','restart');
}
} else {
@@ -1256,9 +1359,26 @@
}
}
- // Remove the backup copy of the config file.
- if(@is_file($vhost_file.'~')) unlink($vhost_file.'~');
+ //* The vhost is written and apache has been restarted, so we
+ // can reset the ssl changed var to false and cleanup some files
+ $this->ssl_certificate_changed = false;
+ $ssl_dir = $data['new']['document_root'].'/ssl';
+ $domain = $data['new']['ssl_domain'];
+ $key_file = $ssl_dir.'/'.$domain.'.key.org';
+ $key_file2 = $ssl_dir.'/'.$domain.'.key';
+ $csr_file = $ssl_dir.'/'.$domain.'.csr';
+ $crt_file = $ssl_dir.'/'.$domain.'.crt';
+ $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
+
+ if(@is_file($key_file.'~')) $app->system->unlink($key_file.'~');
+ if(@is_file($key2_file.'~')) $app->system->unlink($key2_file.'~');
+ if(@is_file($crt_file.'~')) $app->system->unlink($crt_file.'~');
+ if(@is_file($csr_file.'~')) $app->system->unlink($csr_file.'~');
+ if(@is_file($bundle_file.'~')) $app->system->unlink($bundle_file.'~');
+
+ // Remove the backup copy of the config file.
+ if(@is_file($vhost_file.'~')) $app->system->unlink($vhost_file.'~');
//* Unset action to clean it for next processed vhost.
$this->action = '';
@@ -1270,7 +1390,10 @@
// load the server configuration options
$app->uses('getconf');
+ $app->uses('system');
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
+
+ $app->system->web_folder_protection($data['new']['document_root'],false);
//* Check if this is a chrooted setup
if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
@@ -1296,21 +1419,21 @@
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
if(is_link($vhost_symlink)){
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/900-'.$data['old']['domain'].'.vhost');
if(is_link($vhost_symlink)){
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
$vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/100-'.$data['old']['domain'].'.vhost');
if(is_link($vhost_symlink)){
- unlink($vhost_symlink);
+ $app->system->unlink($vhost_symlink);
$app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
}
- unlink($vhost_file);
+ $app->system->unlink($vhost_file);
$app->log('Removing vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
$docroot = escapeshellcmd($data['old']['document_root']);
@@ -1356,7 +1479,7 @@
if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
// create the symlinks, if not exist
if(is_link($tmp_symlink)) {
- unlink($tmp_symlink);
+ $app->system->unlink($tmp_symlink);
$app->log('Removing symlink: '.$tmp_symlink,LOGLEVEL_DEBUG);
}
}
@@ -1429,7 +1552,7 @@
}
$vhost_file = escapeshellcmd($web_config['vhost_conf_dir'].'/ispconfig.conf');
- file_put_contents($vhost_file,$tpl->grab());
+ $app->system->file_put_contents($vhost_file,$tpl->grab());
$app->log('Writing the conf file: '.$vhost_file,LOGLEVEL_DEBUG);
unset($tpl);
@@ -1469,17 +1592,17 @@
//* Create the folder path, if it does not exist
if(!is_dir($folder_path)) {
- exec('mkdir -p '.$folder_path);
- chown($folder_path,$website['system_user']);
- chgrp($folder_path,$website['system_group']);
+ $app->system->mkdirpath($folder_path);
+ $app->system->chown($folder_path,$website['system_user']);
+ $app->system->chgrp($folder_path,$website['system_group']);
}
//* Create empty .htpasswd file, if it does not exist
if(!is_file($folder_path.'.htpasswd')) {
touch($folder_path.'.htpasswd');
- chmod($folder_path.'.htpasswd',0755);
- chown($folder_path.'.htpasswd',$website['system_user']);
- chgrp($folder_path.'.htpasswd',$website['system_group']);
+ $app->system->chmod($folder_path.'.htpasswd',0755);
+ $app->system->chown($folder_path.'.htpasswd',$website['system_user']);
+ $app->system->chgrp($folder_path.'.htpasswd',$website['system_group']);
$app->log('Created file '.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
@@ -1516,10 +1639,10 @@
//* Create the .htaccess file
//if(!is_file($folder_path.'.htaccess')) {
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user";
- file_put_contents($folder_path.'.htaccess',$ht_file);
- chmod($folder_path.'.htaccess',0755);
- chown($folder_path.'.htaccess',$website['system_user']);
- chgrp($folder_path.'.htaccess',$website['system_group']);
+ $app->system->file_put_contents($folder_path.'.htaccess',$ht_file);
+ $app->system->chmod($folder_path.'.htaccess',0755);
+ $app->system->chown($folder_path.'.htaccess',$website['system_user']);
+ $app->system->chgrp($folder_path.'.htaccess',$website['system_group']);
$app->log('Created file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
//}
@@ -1553,13 +1676,13 @@
//* Remove .htpasswd file
if(is_file($folder_path.'.htpasswd')) {
- unlink($folder_path.'.htpasswd');
+ $app->system->unlink($folder_path.'.htpasswd');
$app->log('Removed file '.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
//* Remove .htaccess file
if(is_file($folder_path.'.htaccess')) {
- unlink($folder_path.'.htaccess');
+ $app->system->unlink($folder_path.'.htaccess');
$app->log('Removed file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
}
@@ -1607,20 +1730,20 @@
}
//* Create the folder path, if it does not exist
- if(!is_dir($new_folder_path)) exec('mkdir -p '.$new_folder_path);
+ if(!is_dir($new_folder_path)) $app->system->mkdirpath($new_folder_path);
if($data['old']['path'] != $data['new']['path']) {
//* move .htpasswd file
if(is_file($old_folder_path.'.htpasswd')) {
- rename($old_folder_path.'.htpasswd',$new_folder_path.'.htpasswd');
+ $app->system->rename($old_folder_path.'.htpasswd',$new_folder_path.'.htpasswd');
$app->log('Moved file '.$old_folder_path.'.htpasswd to '.$new_folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
//* delete old .htaccess file
if(is_file($old_folder_path.'.htaccess')) {
- unlink($old_folder_path.'.htaccess');
+ $app->system->unlink($old_folder_path.'.htaccess');
$app->log('Deleted file '.$old_folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
@@ -1629,21 +1752,31 @@
//* Create the .htaccess file
if($data['new']['active'] == 'y') {
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user";
- file_put_contents($new_folder_path.'.htaccess',$ht_file);
- chmod($new_folder_path.'.htpasswd',0755);
- chown($folder_path.'.htpasswd',$website['system_user']);
- chgrp($folder_path.'.htpasswd',$website['system_group']);
+ $app->system->file_put_contents($new_folder_path.'.htaccess',$ht_file);
+ $app->system->chmod($new_folder_path.'.htpasswd',0755);
+ $app->system->chown($folder_path.'.htpasswd',$website['system_user']);
+ $app->system->chgrp($folder_path.'.htpasswd',$website['system_group']);
$app->log('Created file '.$new_folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
//* Remove .htaccess file
if($data['new']['active'] == 'n' && is_file($new_folder_path.'.htaccess')) {
- unlink($new_folder_path.'.htaccess');
+ $app->system->unlink($new_folder_path.'.htaccess');
$app->log('Removed file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
}
+
+ public function ftp_user_delete($event_name,$data) {
+ global $app, $conf;
+
+ $ftpquota_file = $data['old']['dir'].'/.ftpquota';
+ if(file_exists($ftpquota_file)) $app->system->unlink($ftpquota_file);
+
+ }
+
+
/**
* This function is called when a Webdav-User is inserted, updated or deleted.
@@ -1698,21 +1831,27 @@
*/
if(!is_dir($webdav_user_dir)) {
$app->log('Webdav User directory '.$webdav_user_dir.' does not exist. Creating it now.',LOGLEVEL_DEBUG);
- exec('mkdir -p '.escapeshellcmd($webdav_user_dir));
+ $app->system->mkdirpath($webdav_user_dir);
}
/*
* The webdav - Root needs the group/user as owner and the apache as read and write
*/
- $this->_exec('chown ' . $user . ':' . $group . ' ' . escapeshellcmd($documentRoot . '/webdav/'));
- $this->_exec('chmod 770 ' . escapeshellcmd($documentRoot . '/webdav/'));
+ //$this->_exec('chown ' . $user . ':' . $group . ' ' . escapeshellcmd($documentRoot . '/webdav/'));
+ //$this->_exec('chmod 770 ' . escapeshellcmd($documentRoot . '/webdav/'));
+ $app->system->chown($documentRoot . '/webdav',$user);
+ $app->system->chgrp($documentRoot . '/webdav',$group);
+ $app->system->chmod($documentRoot . '/webdav',0770);
/*
* The webdav folder (not the webdav-root!) needs the same (not in ONE step, because the
* pwd-files are owned by root)
*/
- $this->_exec('chown ' . $user . ':' . $group . ' ' . escapeshellcmd($webdav_user_dir.' -R'));
- $this->_exec('chmod 770 ' . escapeshellcmd($webdav_user_dir.' -R'));
+ //$this->_exec('chown ' . $user . ':' . $group . ' ' . escapeshellcmd($webdav_user_dir.' -R'));
+ //$this->_exec('chmod 770 ' . escapeshellcmd($webdav_user_dir.' -R'));
+ $app->system->chown($webdav_user_dir,$user);
+ $app->system->chgrp($webdav_user_dir,$group);
+ $app->system->chmod($webdav_user_dir,0770);
/*
* if the user is active, we have to write/update the password - file
@@ -1788,7 +1927,7 @@
*/
private function _writeHtDigestFile($filename, $username, $authname, $pwdhash ) {
$changed = false;
- if(is_file($filename)) {
+ if(is_file($filename) && !is_link($filename)) {
$in = fopen($filename, 'r');
$output = '';
/*
@@ -1824,9 +1963,9 @@
* Now lets write the new file
*/
if(trim($output) == '') {
- unlink($filename);
+ $app->system->unlink($filename);
} else {
- file_put_contents($filename, $output);
+ $app->system->file_put_contents($filename, $output);
}
}
@@ -1839,6 +1978,7 @@
* @param string $webdavRoot The root of the webdav-folder
*/
private function _patchVhostWebdav($fileName, $webdavRoot) {
+ global $app;
$in = fopen($fileName, 'r');
$output = '';
$inWebdavSection = false;
@@ -1864,7 +2004,7 @@
$files = @scandir($webdavRoot);
if(is_array($files)) {
foreach($files as $file) {
- if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest') {
+ if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest' && preg_match("[a-zA-Z0-9\-_\.]",$file)) {
/*
* found a htdigest - file, so add it to webdav
*/
@@ -1910,7 +2050,7 @@
/*
* Now lets write the new file
*/
- file_put_contents($fileName, $output);
+ $app->system->file_put_contents($fileName, $output);
}
@@ -1923,7 +2063,7 @@
if(!is_dir($data['new']['document_root']."/web/stats/")) mkdir($data['new']['document_root']."/web/stats");
if(!@is_file($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf') || ($data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain'])) {
if ( @is_file($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf') ) {
- unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
+ $app->system->unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
}
$content = '';
@@ -1932,12 +2072,12 @@
$content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
$content .= "HostAliases=\"www.".$data['new']['domain']." localhost 127.0.0.1\"\n";
- file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',$content);
+ $app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',$content);
$app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',LOGLEVEL_DEBUG);
}
- if(is_file($data['new']['document_root']."/web/stats/index.html")) unlink($data['new']['document_root']."/web/stats/index.html");
- copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/web/stats/index.php");
+ if(is_file($data['new']['document_root']."/web/stats/index.html")) $app->system->unlink($data['new']['document_root']."/web/stats/index.html");
+ $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/web/stats/index.php");
}
//* Delete the awstats configuration file
@@ -1947,7 +2087,7 @@
$awstats_conf_dir = $web_config['awstats_conf_dir'];
if ( @is_file($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf') ) {
- unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
+ $app->system->unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
$app->log('Removed AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf',LOGLEVEL_DEBUG);
}
}
@@ -1980,7 +2120,7 @@
if($data['new']['php'] != 'php-fpm'){
if(@is_file($pool_dir.$pool_name.'.conf')){
- unlink($pool_dir.$pool_name.'.conf');
+ $app->system->unlink($pool_dir.$pool_name.'.conf');
//$reload = true;
}
if($data['old']['php'] == 'php-fpm'){
@@ -2001,7 +2141,7 @@
if($data['new']['php_fpm_use_socket'] == 'y'){
$use_tcp = 0;
$use_socket = 1;
- if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
+ if(!is_dir($socket_dir)) $app->system->mkdirpath($socket_dir);
} else {
$use_tcp = 1;
$use_socket = 0;
@@ -2048,12 +2188,12 @@
$value = escapeshellcmd(trim($value));
$key = escapeshellcmd(trim($key));
switch (strtolower($value)) {
- case 'on':
- case 'off':
- case '1':
case '0':
// PHP-FPM might complain about invalid boolean value if you use 0
$value = 'off';
+ case '1':
+ case 'on':
+ case 'off':
case 'true':
case 'false':
case 'yes':
@@ -2070,7 +2210,7 @@
$tpl->setLoop('custom_php_ini_settings', $final_php_ini_settings);
- file_put_contents($pool_dir.$pool_name.'.conf',$tpl->grab());
+ $app->system->file_put_contents($pool_dir.$pool_name.'.conf',$tpl->grab());
$app->log('Writing the PHP-FPM config file: '.$pool_dir.$pool_name.'.conf',LOGLEVEL_DEBUG);
unset($tpl);
@@ -2079,7 +2219,7 @@
if(substr($default_pool_dir,-1) != '/') $default_pool_dir .= '/';
if($default_pool_dir != $pool_dir){
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
- unlink($default_pool_dir.$pool_name.'.conf');
+ $app->system->unlink($default_pool_dir.$pool_name.'.conf');
$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf',LOGLEVEL_DEBUG);
$app->services->restartService('php-fpm','reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
}
@@ -2090,7 +2230,7 @@
if(substr($php_version['php_fpm_pool_dir'],-1) != '/') $php_version['php_fpm_pool_dir'] .= '/';
if($php_version['php_fpm_pool_dir'] != $pool_dir){
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
- unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
+ $app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf',LOGLEVEL_DEBUG);
$app->services->restartService('php-fpm','reload:'.$php_version['php_fpm_init_script']);
}
@@ -2132,7 +2272,7 @@
$pool_name = 'web'.$data['old']['domain_id'];
if ( @is_file($pool_dir.$pool_name.'.conf') ) {
- unlink($pool_dir.$pool_name.'.conf');
+ $app->system->unlink($pool_dir.$pool_name.'.conf');
$app->log('Removed PHP-FPM config file: '.$pool_dir.$pool_name.'.conf',LOGLEVEL_DEBUG);
//$app->services->restartService('php-fpm','reload');
@@ -2143,7 +2283,7 @@
if(substr($default_pool_dir,-1) != '/') $default_pool_dir .= '/';
if($default_pool_dir != $pool_dir){
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
- unlink($default_pool_dir.$pool_name.'.conf');
+ $app->system->unlink($default_pool_dir.$pool_name.'.conf');
$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf',LOGLEVEL_DEBUG);
$app->services->restartService('php-fpm','reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
}
@@ -2154,7 +2294,7 @@
if(substr($php_version['php_fpm_pool_dir'],-1) != '/') $php_version['php_fpm_pool_dir'] .= '/';
if($php_version['php_fpm_pool_dir'] != $pool_dir){
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
- unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
+ $app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf',LOGLEVEL_DEBUG);
$app->services->restartService('php-fpm','reload:'.$php_version['php_fpm_init_script']);
}
@@ -2216,9 +2356,9 @@
$from = realpath($f);
// realpath requires the traced file to exist - so, lets touch it first, then remove
- @unlink($t); touch($t);
+ @$app->system->unlink($t); touch($t);
$to = realpath($t);
- @unlink($t);
+ @$app->system->unlink($t);
// Remove from the left side matching path elements from $from and $to
// and get path elements counts
@@ -2239,4 +2379,4 @@
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1