Changeset 2583

Timestamp:

02/07/10 14:09:27 (6 weeks ago)

Author:

tomdooley

Message:

Enhancements and optimizations

Location:

branches/backup-restore/includes

Files:

• BackupPackage.php (modified) (2 diffs)
• BackupPackage_ispCP.php (modified) (1 diff)
• RestorePackage_ispCP.php (modified) (6 diffs)

branches/backup-restore/includes/BackupPackage.php

@@ -140 +140 @@
                 $filename = ARCHIVE_PATH.'/'.$this->domain_name.'.tar.gz';
                 // TODO: only htdocs?
-                $cmd = 'tar czvf '.$filename.' -C '.BACKUP_BASE_PATH.' tmp'.
-                                ' -C '.ISPCP_VIRTUAL_PATH.'/'.$this->domain_name.' htdocs';
+                $cmd = 'tar czf '.$filename.' -C '.BACKUP_BASE_PATH.' tmp'.
+                                ' -C '.ISPCP_VIRTUAL_PATH.' '.$this->domain_name.
+                                ' --exclude=logs --exclude=phptmp --exclude=backups';
+
                 // TODO: Error handling
                 $a = array();
@@ -166 +168 @@
                 if ($result) {
                         // collect all data
-                        $this->setConfigData('domain',   $this->getDomainConfig());
-                        $this->setConfigData('email',    $this->getEMailConfig());
-                        $this->setConfigData('ftp',      $this->getFTPConfig());
-                        $this->setConfigData('domain',   $this->getDomainAliasConfig());
-                        $this->setConfigData('webuser',  $this->getWebUserConfig());
-                        $this->setConfigData('webgroup', $this->getWebGroupConfig());
-                        $this->setConfigData('dns',      $this->getDNSConfig());
-                        $this->setConfigData('db',               $this->getDBConfig());
-                        $this->setConfigData('dbuser',   $this->getDBUserConfig());
+                        $this->setConfigData('domain',          $this->getDomainConfig());
+                        $this->setConfigData('subdomain',       $this->getSubDomainConfig());
+                        $this->setConfigData('email',           $this->getEMailConfig());
+                        $this->setConfigData('ftp',                     $this->getFTPConfig());
+                        $this->setConfigData('alias',           $this->getDomainAliasConfig());
+                        $this->setConfigData('webuser',         $this->getWebUserConfig());
+                        $this->setConfigData('webgroup',        $this->getWebGroupConfig());
+                        $this->setConfigData('dns',                     $this->getDNSConfig());
+                        $this->setConfigData('db',                      $this->getDBConfig());
+                        $this->setConfigData('dbuser',          $this->getDBUserConfig());
 
                         // First create configuration file. If successful, create database

branches/backup-restore/includes/BackupPackage_ispCP.php

@@ -203 +203 @@
                 while (!$rs->EOF) {
                         $row = $rs->FetchRow();
-                        $row['alias'] = $this->getSubdomainAliasConfig($row['alias_id']);
+                        $row['subdomain'] = $this->getSubdomainAliasConfig($row['alias_id']);
                         $result[] = $row;
                         $rs->MoveNext();

branches/backup-restore/includes/RestorePackage_ispCP.php

@@ -53 +53 @@
         protected $reseller_id = -1;
         /**
+         * New domain ID
+         */
+        protected $domain_id = 0;
+        /**
          * linux user id
          */
@@ -59 +63 @@
          * file name of gpg encrypted domain package
          */
+        protected $gpg_archive = '';
+        /**
+         * file name of tar.gz
+         */
         protected $archive = '';
+        /**
+         * array of configuration data (multi associative)
+         */
+        protected $configurationData = array();
+        /**
+         * database IDs (key = database name)
+         */
+        protected $database_ids = array();
+        /**
+         * new subdomain IDs (key = database name)
+         */
+        protected $subdomain_ids = array();
 
         /**
@@ -75 +95 @@
                 $this->ip = $option_ip;
                 $this->reseller = $option_reseller;
-                $this->archive = ARCHIVE_PATH.'/'.$this->domain_name.'.tar.gz.gpg';
+                $this->gpg_archive = ARCHIVE_PATH.'/'.$this->domain_name.'.tar.gz.gpg';
+                $this->archive = mb_substr($this->gpg_archive, 0, mb_strlen($this->gpg_archive)-4);
+                $this->target_path = ISPCP_VIRTUAL_PATH.'/'.$this->domain_name;
 
                 // untar and mysql can take a lot of time
                 set_time_limit(0);
+        }
+
+        /**
+         * Destructor, clean up tmp folder and .tar.gz on exit
+         */
+        public function __destruct()
+        {
+                if (file_exists($this->target_path.'/tmp')) {
+                        delTree($this->target_path.'/tmp');
+                }
+                if (file_exists($this->archive)) {
+                        unlink($this->archive);
+                }
         }
 
@@ -181 +216 @@
                 $result = false;
 
-                if (!file_exists($this->archive)) {
-                        $this->addErrorMessage('Domain backup package file not found: '.$this->archive);
+                if (!file_exists($this->gpg_archive)) {
+                        $this->addErrorMessage('Domain backup package file not found: '.$this->gpg_archive);
                 } else {
                         // IP detection
@@ -206 +241 @@
         }
 
+        protected function unpackDomainPackage()
+        {
+                $reuslt = false;
+
+                // unprotect via gpg -c --passphrase ... file
+                $cmd = 'gpg --passphrase '.$this->password.' '.$this->gpg_archive;
+                $a = array();
+                $this->shellExecute($cmd, $a);
+
+                if (file_exists($this->archive)) {
+
+                        if (!file_exists($this->target_path)) {
+                                mkdir($this->target_path, 0770, true);
+                        }
+
+                        $cmd = 'tar xzf -C '.$this->target_path.' '.$this->archive;
+                        $this->shellExecute($cmd, $a);
+
+                        if (file_exists($this->target_path.'/tmp/config.ser')) {
+                                $result = true;
+                        } else {
+                                $this->addErrorMessage('File not found: '.$this->target_path.'/tmp/config.ser');
+                        }
+
+                        $result = true;
+                } else {
+                        $this->addErrorMessage('File not found: '.$this->archive.' - incorrect password?');
+                }
+
+                return $result;
+        }
+
+        protected function getConfigData()
+        {
+                $result = false;
+
+                $config_file = $this->target_path.'/tmp/config.ser';
+
+                $fp = fopen($config_file, 'w');
+                if ($fp) {
+                        $s = fread($fp, filesize($config_file));
+                        $this->configurationData = unserialize($s);
+                        fclose($fp);
+
+                        if (is_array($this->configurationData) && count($this->configurationData) > 0) {
+                                $result = true;
+                        } else {
+                                $this->addErrorMessage('Broken file '.$config_file);
+                        }
+
+                } else {
+                        $this->addErrorMessage('Could not open file '.$config_file);
+                }
+
+                return $result;
+        }
+
+        /**
+         * Create all databases
+         */
+        protected function createDatabases()
+        {
+                foreach ($this->configurationData['db'] as $db) {
+                        $this->importMySQLDatabase($db['sqld_name']);
+
+                        // Insert database row into ispCP database
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `sql_database`".
+                                " (`domain_id`, `sqld_name`)".
+                                " VALUES".
+                                " (?, ?)"
+                        );
+                        $this->db->Execute($query, array($this->domain_id, $db['sqld_name']));
+                        $this->database_ids[$db['sqld_name']] = $this->db->Insert_ID();
+                }
+        }
+
+        /**
+         * Import single mysql database
+         * @param string $dbname
+         */
+        private function importMySQLDatabase($dbname)
+        {
+                $query = $this->db->Prepare("CREATE DATABASE " . quoteIdentifier($dbname));
+                $this->db->Execute($query);
+
+                $filename = $this->target_path.'/tmp/'.$dbname.'.sql';
+                $cmd = 'mysql --user '.Config::get('DB_USER').' --password='.Config::get('DB_PASS').
+                           ' '.$dbname.
+                           ' <'.$filename;
+                // TODO: Error handling
+                $a = array();
+                $this->shellExecute($cmd, $a);
+
+                return true;
+        }
+
+        /**
+         * Create MySQL database users
+         */
+        protected function createDatabaseUsers()
+        {
+                foreach ($this->configurationData['dbuser'] as $dbuser) {
+                        $this->createDatabaseUser($dbuser['database'], $dbuser['sqlu_name'], $dbuser['sqlu_pass']);
+
+                        // Insert database row into ispCP database
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `sql_user`".
+                                " (`sqld_id`, `sqlu_name`, `sqlu_pass`)".
+                                " VALUES".
+                                " (:sqld_id, :sqlu_name, :sqlu_pass)"
+                        );
+                        $this->db->Execute($query, array(
+                                'sqld_id'=>$this->database_ids[$dbuser['database']],
+                                'sqlu_name'=>$dbuser['sqlu_name'],
+                                'sqlu_pass'=>encrypt_db_password($dbuser['sqlu_pass'])
+                        ));
+                }
+        }
+
+        /**
+         * Create database user with all privileges to database
+         * @param string $db_name database name
+         * @param string $db_user database user name
+         * @param string $user_pass password of database user
+         */
+        private function createDatabaseUser($db_name, $db_user, $user_pass)
+        {
+                $query = $this->db->Prepare(
+                        "GRANT ALL PRIVILEGES ON ". quoteIdentifier($db_name) .
+                        ".* TO :dbuser IDENTIFIED BY :dbpass"
+                );
+                $this->db->Execute($query, array(
+                        'dbuser'=>$db_user.'@localhost',
+                        'dbpass'=>$user_pass
+                ));
+                $this->db->Execute($query, array(
+                        'dbuser'=>$db_user.'@%',
+                        'dbpass'=>$user_pass
+                ));
+        }
+
+        /**
+         * Create domain, sets $this->domain_user_id and $this->domain_id
+         * @return boolean true = creation successful
+         */
+        protected function createDomain()
+        {
+                $result = false;
+
+                // TODO: createDomain()
+                // TODO: set domain_id
+                $this->createDomainAliases();
+                $this->createSubDomains();
+
+                // TODO: wait until daemon is ready
+                // TODO: set domain_user_id
+
+                return $result;
+        }
+
+        protected function createDomainAliases()
+        {
+                // TODO: createDomainAliases
+        }
+
+        protected function createSubDomains()
+        {
+                // TODO: createSubDomains
+        }
+
+        protected function createEMailAccounts()
+        {
+                // TODO: createEMailAccounts
+        }
+
+        protected function createFTPAccounts()
+        {
+                // TODO: createFTPAccounts
+        }
+
+        protected function createWebUsers()
+        {
+                // TODO: createWebUsers
+        }
+
+        protected function createWebGroups()
+        {
+                // TODO: createWebGroups
+        }
+
         /**
          * Run the restore, main method
+         * TODO: don't forget sub_id in mail accounts!
          * @return boolean true = restore successful, false = see error messages
          */
@@ -215 +442 @@
 
                 if ($this->initRestore()) {
-                        // TODO: runRestore()
-                        // don't forget sub_id in mail accounts!
+                        if ($this->unpackDomainPackage()) {
+                                if ($this->getConfigData()) {
+
+                                        if ($this->createDomain()) {
+                                                $this->createDNSEntries();
+                                                $this->createDatabases();
+                                                $this->createDBUsers();
+                                                $this->createEMailAccounts();
+                                                $this->createWebUsers();
+                                                $this->createWebGroups();
+                                                $this->setDomainPermissions();
+
+                                                $e = $this->getErrorMessages();
+                                                $result = (count($e) == 0);
+                                        }
+                                }
+                        }
                 }