From 5ca959fa688255a8de61f89fe2751eb4d24a6912 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 22 Mar 2016 09:22:07 -0400
Subject: [PATCH] fixed typo

---
 server/plugins-available/backup_plugin.inc.php |  347 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 251 insertions(+), 96 deletions(-)

diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 5da8fc0..3e4fad6 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -29,134 +29,289 @@
 */
 
 class backup_plugin {
-	
+
 	var $plugin_name = 'backup_plugin';
 	var $class_name  = 'backup_plugin';
-	
+
 	//* This function is called during ispconfig installation to determine
 	//  if a symlink shall be created for this plugin.
 	public function onInstall() {
 		global $conf;
-		
+
 		return true;
-		
+
 	}
-	
-		
+
+
 	/*
 	 	This function is called when the plugin is loaded
 	*/
-	
+
 	public function onLoad() {
 		global $app;
-		
+
 		//* Register for actions
-		$app->plugins->registerAction('backup_download',$this->plugin_name,'backup_action');
-		$app->plugins->registerAction('backup_restore',$this->plugin_name,'backup_action');
-		
+		$app->plugins->registerAction('backup_download', $this->plugin_name, 'backup_action');
+		$app->plugins->registerAction('backup_restore', $this->plugin_name, 'backup_action');
+		$app->plugins->registerAction('backup_delete', $this->plugin_name, 'backup_action');
+		//$app->plugins->registerAction('backup_download_mail', $this->plugin_name, 'backup_action_mail');
+		$app->plugins->registerAction('backup_restore_mail', $this->plugin_name, 'backup_action_mail');
+		$app->plugins->registerAction('backup_delete_mail', $this->plugin_name, 'backup_action_mail');
 	}
-	
+
 	//* Do a backup action
-	public function backup_action($action_name,$data) {
-		global $app,$conf;
-		
+	public function backup_action($action_name, $data) {
+		global $app, $conf;
+
 		$backup_id = intval($data);
-		$backup = $app->dbmaster->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = $backup_id");
-		
+		$backup = $app->dbmaster->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = ?", $backup_id);
+
 		if(is_array($backup)) {
-		
-			$app->uses('ini_parser,file,getconf');
-			
-			$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$backup['parent_domain_id']);
+
+			$app->uses('ini_parser,file,getconf,system');
+
+			$web = $app->dbmaster->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
 			$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
-			$backup_dir = $server_config['backup_dir'].'/web'.$web['domain_id'];
+			$backup_dir = trim($server_config['backup_dir']);
+			if($backup_dir == '') return;
+			$backup_dir .= '/web'.$web['domain_id'];
 			
-			//* Make backup available for download
-			if($action_name == 'backup_download') {
-				//* Copy the backup file to the backup folder of the website
-				if(file_exists($backup_dir.'/'.$backup['filename']) && !stristr($backup_dir.'/'.$backup['filename'],'..') && !stristr($backup_dir.'/'.$backup['filename'],'etc')) {
-					copy($backup_dir.'/'.$backup['filename'],$web['document_root'].'/backup/'.$backup['filename']);
-					chgrp($web['document_root'].'/backup/'.$backup['filename'],$web['system_group']);
-					$app->log('cp '.$backup_dir.'/'.$backup['filename'].' '.$web['document_root'].'/backup/'.$backup['filename'],LOGLEVEL_DEBUG);
-				}
-			}
+			$backup_dir_is_ready = true;
+            //* mount backup directory, if necessary
+            if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($server_config['backup_dir']) ) $backup_dir_is_ready = false;
 
-			//* Restore a MongoDB backup
-			if($action_name == 'backup_restore' && $backup['backup_type'] == 'mongodb') {
-				if(file_exists($backup_dir.'/'.$backup['filename'])) {
-					//$parts = explode('_',$backup['filename']);
-					//$db_name = $parts[1];
-					preg_match('@^db_(.+)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.tar\.gz$@', $backup['filename'], $matches);
-					$db_name = $matches[1];
-
-					// extract tar.gz archive
-					$dump_directory = str_replace(".tar.gz", "", $backup['filename']);
-					$extracted = "/usr/local/ispconfig/server/temp";
-					exec("tar -xzvf ".escapeshellarg($backup_dir.'/'.$backup['filename'])." --directory=".escapeshellarg($extracted));
-					$restore_directory = $extracted."/".$dump_directory."/".$db_name;
-
-					// mongorestore -h 127.0.0.1 -u root -p 123456 --authenticationDatabase admin -d c1debug --drop ./toRestore
-					$command = "mongorestore -h 127.0.0.1 --port 27017 -u root -p 123456 --authenticationDatabase admin -d ".$db_name." --drop ".escapeshellarg($restore_directory);
-					exec($command);
-					exec("rm -rf ".escapeshellarg($extracted."/".$dump_directory));
+			if($backup_dir_is_ready){
+				//* Make backup available for download
+				if($action_name == 'backup_download') {
+					//* Copy the backup file to the backup folder of the website
+					if(file_exists($backup_dir.'/'.$backup['filename']) && file_exists($web['document_root'].'/backup/') && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
+						copy($backup_dir.'/'.$backup['filename'], $web['document_root'].'/backup/'.$backup['filename']);
+						chgrp($web['document_root'].'/backup/'.$backup['filename'], $web['system_group']);
+						$app->log('cp '.$backup_dir.'/'.$backup['filename'].' '.$web['document_root'].'/backup/'.$backup['filename'], LOGLEVEL_DEBUG);
+					}
 				}
 
-				unset($clientdb_host);
-				unset($clientdb_user);
-				unset($clientdb_password);
-				$app->log('Restored MongoDB backup '.$backup_dir.'/'.$backup['filename'],LOGLEVEL_DEBUG);
-			}
+				//* Restore a MongoDB backup
+				if($action_name == 'backup_restore' && $backup['backup_type'] == 'mongodb') {
+					if(file_exists($backup_dir.'/'.$backup['filename'])) {
+						//$parts = explode('_',$backup['filename']);
+						//$db_name = $parts[1];
+						preg_match('@^db_(.+)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.tar\.gz$@', $backup['filename'], $matches);
+						$db_name = $matches[1];
 
-			//* Restore a mysql backup
-			if($action_name == 'backup_restore' && $backup['backup_type'] == 'mysql') {
-				//* Load sql dump into db
-				include('lib/mysql_clientdb.conf');
+						// extract tar.gz archive
+						$dump_directory = str_replace(".tar.gz", "", $backup['filename']);
+						$extracted = "/usr/local/ispconfig/server/temp";
+						exec("tar -xzvf ".escapeshellarg($backup_dir.'/'.$backup['filename'])." --directory=".escapeshellarg($extracted));
+						$restore_directory = $extracted."/".$dump_directory."/".$db_name;
+
+						// mongorestore -h 127.0.0.1 -u root -p 123456 --authenticationDatabase admin -d c1debug --drop ./toRestore
+						$command = "mongorestore -h 127.0.0.1 --port 27017 -u root -p 123456 --authenticationDatabase admin -d ".$db_name." --drop ".escapeshellarg($restore_directory);
+						exec($command);
+						exec("rm -rf ".escapeshellarg($extracted."/".$dump_directory));
+					}
+
+					unset($clientdb_host);
+					unset($clientdb_user);
+					unset($clientdb_password);
+					$app->log('Restored MongoDB backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
+				}
+
+				//* Restore a mysql backup
+				if($action_name == 'backup_restore' && $backup['backup_type'] == 'mysql') {
+					//* Load sql dump into db
+					include 'lib/mysql_clientdb.conf';
+
+					if(file_exists($backup_dir.'/'.$backup['filename'])) {
+						//$parts = explode('_',$backup['filename']);
+						//$db_name = $parts[1];
+						preg_match('@^db_(.+)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql\.gz$@', $backup['filename'], $matches);
+						$db_name = $matches[1];
+						$command = "gunzip --stdout ".escapeshellarg($backup_dir.'/'.$backup['filename'])." | mysql -h '".escapeshellarg($clientdb_host)."' -u '".escapeshellarg($clientdb_user)."' -p'".escapeshellarg($clientdb_password)."' '".$db_name."'";
+						exec($command);
+					}
+					unset($clientdb_host);
+					unset($clientdb_user);
+					unset($clientdb_password);
+					$app->log('Restored MySQL backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
+				}
+
+				//* Restore a web backup
+				if($action_name == 'backup_restore' && $backup['backup_type'] == 'web') {
+					$app->system->web_folder_protection($web['document_root'], false);
+					if($backup['backup_mode'] == 'userzip') {
+						if(file_exists($backup_dir.'/'.$backup['filename']) && $web['document_root'] != '' && $web['document_root'] != '/' && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
+							if(file_exists($web['document_root'].'/backup/'.$backup['filename'])) rename($web['document_root'].'/backup/'.$backup['filename'], $web['document_root'].'/backup/'.$backup['filename'].'.bak');
+							copy($backup_dir.'/'.$backup['filename'], $web['document_root'].'/backup/'.$backup['filename']);
+							chgrp($web['document_root'].'/backup/'.$backup['filename'], $web['system_group']);
+							//chown($web['document_root'].'/backup/'.$backup['filename'],$web['system_user']);
+							$command = 'sudo -u '.escapeshellarg($web['system_user']).' unzip -qq -o  '.escapeshellarg($web['document_root'].'/backup/'.$backup['filename']).' -d '.escapeshellarg($web['document_root']).' 2> /dev/null';
+							exec($command);
+							unlink($web['document_root'].'/backup/'.$backup['filename']);
+							if(file_exists($web['document_root'].'/backup/'.$backup['filename'].'.bak')) rename($web['document_root'].'/backup/'.$backup['filename'].'.bak', $web['document_root'].'/backup/'.$backup['filename']);
+							$app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
+						}
+					}
+					if($backup['backup_mode'] == 'rootgz') {
+						if(file_exists($backup_dir.'/'.$backup['filename']) && $web['document_root'] != '' && $web['document_root'] != '/' && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
+							$command = 'tar xzf '.escapeshellarg($backup_dir.'/'.$backup['filename']).' --directory '.escapeshellarg($web['document_root']);
+							exec($command);
+							$app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
+						}
+					}
+					$app->system->web_folder_protection($web['document_root'], true);
+				}
 				
-				if(file_exists($backup_dir.'/'.$backup['filename'])) {
-					//$parts = explode('_',$backup['filename']);
-					//$db_name = $parts[1];
-					preg_match('@^db_(.+)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql\.gz$@', $backup['filename'], $matches);
-					$db_name = $matches[1];
-					$command = "gunzip --stdout ".escapeshellarg($backup_dir.'/'.$backup['filename'])." | mysql -h '".escapeshellcmd($clientdb_host)."' -u '".escapeshellcmd($clientdb_user)."' -p'".escapeshellcmd($clientdb_password)."' '".$db_name."'";
-					exec($command);
-				}
-				unset($clientdb_host);
-				unset($clientdb_user);
-				unset($clientdb_password);
-				$app->log('Restored MySQL backup '.$backup_dir.'/'.$backup['filename'],LOGLEVEL_DEBUG);
-			}
-			
-			//* Restore a web backup
-			if($action_name == 'backup_restore' && $backup['backup_type'] == 'web') {
-				if($backup['backup_mode'] == 'userzip') {
-					if(file_exists($backup_dir.'/'.$backup['filename']) && $web['document_root'] != '' && $web['document_root'] != '/' && !stristr($backup_dir.'/'.$backup['filename'],'..') && !stristr($backup_dir.'/'.$backup['filename'],'etc')) {
-						if(file_exists($web['document_root'].'/backup/'.$backup['filename'])) rename($web['document_root'].'/backup/'.$backup['filename'],$web['document_root'].'/backup/'.$backup['filename'].'.bak');
-						copy($backup_dir.'/'.$backup['filename'],$web['document_root'].'/backup/'.$backup['filename']);
-						chgrp($web['document_root'].'/backup/'.$backup['filename'],$web['system_group']);
-						//chown($web['document_root'].'/backup/'.$backup['filename'],$web['system_user']);
-						$command = 'sudo -u '.escapeshellarg($web['system_user']).' unzip -qq -o  '.escapeshellarg($web['document_root'].'/backup/'.$backup['filename']).' -d '.escapeshellarg($web['document_root']).' 2> /dev/null';
-						exec($command);
-						unlink($web['document_root'].'/backup/'.$backup['filename']);
-						if(file_exists($web['document_root'].'/backup/'.$backup['filename'].'.bak')) rename($web['document_root'].'/backup/'.$backup['filename'].'.bak',$web['document_root'].'/backup/'.$backup['filename']);
-						$app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'],LOGLEVEL_DEBUG);
+				if($action_name == 'backup_delete') {
+					if(file_exists($backup_dir.'/'.$backup['filename']) && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
+						unlink($backup_dir.'/'.$backup['filename']);
+						
+						$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
+						$app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
+						if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
+						$app->log('unlink '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
 					}
 				}
-				if($backup['backup_mode'] == 'rootgz') {
-					if(file_exists($backup_dir.'/'.$backup['filename']) && $web['document_root'] != '' && $web['document_root'] != '/' && !stristr($backup_dir.'/'.$backup['filename'],'..') && !stristr($backup_dir.'/'.$backup['filename'],'etc')) {
-						$command = 'tar xzf '.escapeshellarg($backup_dir.'/'.$backup['filename']).' --directory '.escapeshellarg($web['document_root']);
-						exec($command);
-						$app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'],LOGLEVEL_DEBUG);
-					}
-				}
+
+				if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
+			} else {
+				$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
 			}
-			
 		} else {
-			$app->log('No backup with ID '.$backup_id.' found.',LOGLEVEL_DEBUG);
+			$app->log('No backup with ID '.$backup_id.' found.', LOGLEVEL_DEBUG);
 		}
-		
+
 		return 'ok';
 	}
 
+	//* Restore a mail backup - florian@schaal-24.de
+	public function backup_action_mail($action_name, $data) {
+		global $app, $conf;
+	
+		$backup_id = intval($data);
+		$mail_backup = $app->dbmaster->queryOneRecord("SELECT * FROM mail_backup WHERE backup_id = ?", $backup_id);
+	
+		if (is_array($mail_backup)) {
+			$app->uses('ini_parser,file,getconf');
+	
+			$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+			$backup_dir = $server_config['backup_dir'];
+			$backup_dir_is_ready = true;
+	
+			//* mount backup directory, if necessary
+			if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $backup_dir_is_ready = false;
+	
+			if($backup_dir_is_ready){
+				$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+				$domain_rec = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain_id = ?", $mail_backup['parent_domain_id']);
+			
+				$backup_dir = $server_config['backup_dir'].'/mail'.$domain_rec['domain_id'];
+				$mail_backup_file = $backup_dir.'/'.$mail_backup['filename'];
+			
+				$sql = "SELECT * FROM mail_user WHERE server_id = ? AND mailuser_id = ?";
+				$record = $app->db->queryOneRecord($sql, $conf['server_id'], $mail_backup['mailuser_id']);
+			
+				//* strip mailbox from maildir
+				$domain_dir=explode('/',$record['maildir']);
+				$_temp=array_pop($domain_dir);unset($_temp);
+				$domain_dir=implode('/',$domain_dir);
+			
+				if(!is_dir($domain_dir)) {
+					mkdir($domain_dir, 0700); //* never create the full path
+					chown($domain_dir, $mail_config['mailuser_name']);
+					chgrp($domain_dir, $mail_config['mailuser_group']);
+				}
+				if (!is_dir($record['maildir'])) {
+					mkdir($record['maildir'], 0700); //* never create the full path
+					chown($record['maildir'], $mail_config['mailuser_name']);
+					chgrp($record['maildir'], $mail_config['mailuser_group']);
+				}
+			
+				if ($action_name == 'backup_restore_mail') {
+					if(file_exists($mail_backup_file) && $record['homedir'] != '' && $record['homedir'] != '/' && !stristr($mail_backup_file,'..') && !stristr($mail_backup_file,'etc') && $mail_config['homedir_path'] == $record['homedir'] && is_dir($domain_dir) && is_dir($record['maildir'])) {
+						if ($record['maildir_format'] == 'mdbox') {
+							$retval = -1;
+							// First unzip backupfile to local backup-folder
+							if($mail_backup['backup_mode'] == 'userzip') {
+								copy($mail_backup_file, $record['maildir'].'/'.$mail_backup['filename']);
+								chgrp($record['maildir'].'/'.$mail_backup['filename'], $mail_config['mailuser_group']);
+								$command = 'sudo -u '.$mail_config['mailuser_name'].' unzip -qq -o  '.escapeshellarg($record['maildir'].'/'.$mail_backup['filename']).' -d '.escapeshellarg($record['maildir']).' 2> /dev/null';
+								exec($command,$tmp_output, $retval);
+								unlink($record['maildir'].'/'.$mail_backup['filename']);
+							}
+							if($mail_backup['backup_mode'] == 'rootgz') {
+								$command='tar xfz '.escapeshellarg($mail_backup_file).' --directory '.escapeshellarg($record['maildir']);
+								exec($command,$tmp_output, $retval);
+							}
+							
+							if($retval == 0) {
+								// Now import backup-mailbox into special backup-folder
+								$backupname = "backup-".date("Y-m-d", $mail_backup['tstamp']);
+								exec("doveadm mailbox create -u \"".$record["email"]."\" $backupname");
+								exec("doveadm import -u \"".$record["email"]."\" mdbox:".$record['maildir']."/backup $backupname all", $tmp_output, $retval);
+								exec("for f in `doveadm mailbox list -u \"".$record["email"]."\" $backupname*`; do doveadm mailbox subscribe -u \"".$record["email"]."\" \$f; done", $tmp_output, $retval);
+								exec('rm -rf '.$record['maildir'].'/backup');
+							}
+							
+							if($retval == 0){
+								$app->log('Restored Mail backup '.$mail_backup_file,LOGLEVEL_DEBUG);
+							} else {
+								// cleanup
+								if (file_exists($record['maildir'].'/'.$mail_backup['filename'])) unlink($record['maildir'].'/'.$mail_backup['filename']);
+								if (file_exists($record['maildir']."/backup")) exec('rm -rf '.$record['maildir']."/backup");
+								
+								$app->log('Unable to restore Mail backup '.$mail_backup_file.' '.$tmp_output,LOGLEVEL_ERROR);
+							}
+						}
+						else {
+							if($mail_backup['backup_mode'] == 'userzip') {
+								copy($mail_backup_file, $domain_dir.'/'.$mail_backup['filename']);
+								chgrp($domain_dir.'/'.$mail_backup['filename'], $mail_config['mailuser_group']);
+								$command = 'sudo -u '.$mail_config['mailuser_name'].' unzip -qq -o  '.escapeshellarg($domain_dir.'/'.$mail_backup['filename']).' -d '.escapeshellarg($domain_dir).' 2> /dev/null';
+								exec($command,$tmp_output, $retval);
+								unlink($domain_dir.'/'.$mail_backup['filename']);
+								if($retval == 0){
+									$app->log('Restored Mail backup '.$mail_backup_file,LOGLEVEL_DEBUG);
+								} else {
+									$app->log('Unable to restore Mail backup '.$mail_backup_file.' '.$tmp_output,LOGLEVEL_ERROR);
+								}
+							}
+							if($mail_backup['backup_mode'] == 'rootgz') {
+								$command='tar xfz '.escapeshellarg($mail_backup_file).' --directory '.escapeshellarg($domain_dir);
+								exec($command,$tmp_output, $retval);
+								if($retval == 0){
+									$app->log('Restored Mail backup '.$mail_backup_file,LOGLEVEL_DEBUG);
+								} else {
+									$app->log('Unable to restore Mail backup '.$mail_backup_file.' '.$tmp_output,LOGLEVEL_ERROR);
+								}
+							}
+						}
+					}
+				}
+				
+				if($action_name == 'backup_delete_mail') {
+					if(file_exists($mail_backup_file) && !stristr($mail_backup_file, '..') && !stristr($mail_backup_file, 'etc')) {
+						unlink($mail_backup_file);
+						$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
+						$app->db->query($sql, $conf['server_id'], $mail_backup['parent_domain_id'], $mail_backup['filename']);
+						if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
+						$app->log('unlink '.$backup_dir.'/'.$mail_backup['filename'], LOGLEVEL_DEBUG);
+					}
+				}
+				
+				if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
+			} else {
+				$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
+			}
+		} else {
+			$app->log('No backup with ID '.$backup_id.' found.', LOGLEVEL_DEBUG);
+		}
+
+		return 'ok';
+	}
+			
+				
 } // end class
 
-?>
+?>			
+

--
Gitblit v1.9.1