ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

Indentation +255 added lines, -255 removed lines

@@ -106,11 +106,11 @@ 
 	private $backup_storage_dir;
 	private $parent_api;
 
-    /**
-     * Xcloner_Restore constructor.
-     * @param string $parent_api
-     * @throws Exception
-     */
+	/**
+	 * Xcloner_Restore constructor.
+	 * @param string $parent_api
+	 * @throws Exception
+	 */
 	public function __construct($parent_api = "")
 	{
 		register_shutdown_function(array($this, 'exception_handler'));
@@ -150,9 +150,9 @@ 
 
 	}
 
-    /**
-     * Exception handler method
-     */
+	/**
+	 * Exception handler method
+	 */
 	public function exception_handler() {
 		
 		$error = error_get_last();
@@ -164,20 +164,20 @@ 
 	
 	}
 
-    /**
-     * @param $type
-     * @return mixed|string
-     */
+	/**
+	 * @param $type
+	 * @return mixed|string
+	 */
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 	
 	public function get_logger_filename()
@@ -187,12 +187,12 @@ 
 		return $filename;
 	}
 
-    /**
-     * Init method
-     *
-     * @return mixed|void
-     * @throws Exception
-     */
+	/**
+	 * Init method
+	 *
+	 * @return mixed|void
+	 * @throws Exception
+	 */
 	public function init()
 	{
 		if(isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
@@ -216,12 +216,12 @@ 
 		return $this->check_system();
 	}
 
-    /**
-     * Write file method
-     *
-     * @return bool|int
-     * @throws Exception
-     */
+	/**
+	 * Write file method
+	 *
+	 * @return bool|int
+	 * @throws Exception
+	 */
 	public function write_file_action()
 	{
 		if(isset($_POST['file']))
@@ -248,10 +248,10 @@ 
 					throw new Exception("Unable to write data to file $target_file");
 
 				try {
-                    unlink($_FILES['blob']['tmp_name']);
-                }catch(Exception $e){
+					unlink($_FILES['blob']['tmp_name']);
+				}catch(Exception $e){
 
-                }
+				}
 
 			}elseif(isset($_POST['blob'])){
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
@@ -271,16 +271,16 @@ 
 		
 	}
 
-    /**
-     * Connect to mysql server method
-     *
-     * @param $remote_mysql_host
-     * @param $remote_mysql_user
-     * @param $remote_mysql_pass
-     * @param $remote_mysql_db
-     * @return mysqli
-     * @throws Exception
-     */
+	/**
+	 * Connect to mysql server method
+	 *
+	 * @param $remote_mysql_host
+	 * @param $remote_mysql_user
+	 * @param $remote_mysql_pass
+	 * @param $remote_mysql_db
+	 * @return mysqli
+	 * @throws Exception
+	 */
 	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db )
 	{
 		$this->logger->info(sprintf('Connecting to mysql database %s with %s@%s', $remote_mysql_db, $remote_mysql_user, $remote_mysql_host));
@@ -302,11 +302,11 @@ 
 		return $mysqli;	
 	}
 
-    /**
-     * Restore mysql backup file
-     *
-     * @throws Exception
-     */
+	/**
+	 * Restore mysql backup file
+	 *
+	 * @throws Exception
+	 */
 	public function restore_mysql_backup_action()
 	{
 		$mysqldump_file 	= filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
@@ -437,14 +437,14 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Url replace method inside database backup file
-     *
-     * @param $search
-     * @param $replace
-     * @param $query
-     * @return mixed|string|string[]|null
-     */
+	/**
+	 * Url replace method inside database backup file
+	 *
+	 * @param $search
+	 * @param $replace
+	 * @param $query
+	 * @return mixed|string|string[]|null
+	 */
 	private function url_replace($search, $replace, $query)
 	{
 		$this->logger->info(sprintf("Doing url replace on query with length %s", strlen($query)), array("QUERY_REPLACE"));
@@ -467,11 +467,11 @@ 
 		return $query;
 	}
 
-    /**
-     * List backup files method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * List backup files method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function list_backup_files_action()
 	{
 		$backup_parts = array();
@@ -537,11 +537,11 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Finish backup restore method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Finish backup restore method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function restore_finish_action()
 	{
 		$remote_path 		= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
@@ -582,12 +582,12 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Delete backup temporary folder
-     *
-     * @param $remote_path
-     * @return bool
-     */
+	/**
+	 * Delete backup temporary folder
+	 *
+	 * @param $remote_path
+	 * @return bool
+	 */
 	private function delete_backup_temporary_folder($remote_path)
 	{
 		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
@@ -615,11 +615,11 @@ 
 	
 	}
 
-    /**
-     * Delete restore script method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Delete restore script method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	private function delete_self()
 	{
 		if($this->filesystem->has("vendor.phar"))
@@ -652,14 +652,14 @@ 
 		
 	}
 
-    /**
-     * Update Wordpress url in wp-config.php method
-     * @param $wp_path
-     * @param $url
-     * @param $mysqli
-     * @return bool
-     * @throws Exception
-     */
+	/**
+	 * Update Wordpress url in wp-config.php method
+	 * @param $wp_path
+	 * @param $url
+	 * @param $mysqli
+	 * @return bool
+	 * @throws Exception
+	 */
 	private function update_wp_url($wp_path, $url, $mysqli)
 	{
 		$wp_config = $wp_path.DS."wp-config.php";
@@ -687,17 +687,17 @@ 
 		return true;
 	}
 
-    /**
-     * Update local wp-config.php file method
-     *
-     * @param $remote_path
-     * @param $remote_mysql_host
-     * @param $remote_mysql_user
-     * @param $remote_mysql_pass
-     * @param $remote_mysql_db
-     * @return string
-     * @throws Exception
-     */
+	/**
+	 * Update local wp-config.php file method
+	 *
+	 * @param $remote_path
+	 * @param $remote_mysql_host
+	 * @param $remote_mysql_user
+	 * @param $remote_mysql_pass
+	 * @param $remote_mysql_db
+	 * @return string
+	 * @throws Exception
+	 */
 	private function update_wp_config($remote_path, $remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db)
 	{
 		$wp_config = $remote_path.DS."wp-config.php";
@@ -729,10 +729,10 @@ 
 		
 	}
 
-    /**
-     * List mysqldump database backup files
-     *
-     */
+	/**
+	 * List mysqldump database backup files
+	 *
+	 */
 	public function list_mysqldump_backups_action()
 	{
 		$source_backup_file = filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
@@ -782,12 +782,12 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Get backup hash method
-     *
-     * @param $backup_file
-     * @return bool
-     */
+	/**
+	 * Get backup hash method
+	 *
+	 * @param $backup_file
+	 * @return bool
+	 */
 	private function get_hash_from_backup($backup_file)
 	{
 		if(!$backup_file)
@@ -801,11 +801,11 @@ 
 		return false;
 	}
 
-    /**
-     * List backup archives found on local system
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * List backup archives found on local system
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function list_backup_archives_action()
 	{
 		$local_backup_file = filter_input(INPUT_POST, 'local_backup_file', FILTER_SANITIZE_STRING);
@@ -864,12 +864,12 @@ 
 		
 	}
 
-    /**
-     * Restore backup archive to local path
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     * @throws \splitbrain\PHPArchive\ArchiveIOException
-     */
+	/**
+	 * Restore backup archive to local path
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 * @throws \splitbrain\PHPArchive\ArchiveIOException
+	 */
 	public function restore_backup_to_path_action()
 	{
 		$source_backup_file 	= filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
@@ -944,9 +944,9 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Get current directory method
-     */
+	/**
+	 * Get current directory method
+	 */
 	public function get_current_directory_action()
 	{	
 		global $wpdb;
@@ -980,11 +980,11 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Check current filesystem
-     *
-     * @throws Exception
-     */
+	/**
+	 * Check current filesystem
+	 *
+	 * @throws Exception
+	 */
 	public function check_system()
 	{
 		//check if i can write
@@ -1006,35 +1006,35 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Return bytes from human readable value
-     *
-     * @param $val
-     * @return int
-     *
-     */
-    private function return_bytes($val) {
-        $numeric_val = (int)trim($val);
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
-            // The 'G' modifier is available since PHP 5.1.0
-            case 'g':
-                $numeric_val *= 1024;
-            case 'm':
-                $numeric_val *= 1024;
-            case 'k':
-                $numeric_val *= 1024;
-        }
-
-        return $numeric_val;
-    }
-
-    /**
-     * Check if backup archive os multipart
-     *
-     * @param $backup_name
-     * @return bool
-     */
+	/**
+	 * Return bytes from human readable value
+	 *
+	 * @param $val
+	 * @return int
+	 *
+	 */
+	private function return_bytes($val) {
+		$numeric_val = (int)trim($val);
+		$last = strtolower($val[strlen($val)-1]);
+		switch($last) {
+			// The 'G' modifier is available since PHP 5.1.0
+			case 'g':
+				$numeric_val *= 1024;
+			case 'm':
+				$numeric_val *= 1024;
+			case 'k':
+				$numeric_val *= 1024;
+		}
+
+		return $numeric_val;
+	}
+
+	/**
+	 * Check if backup archive os multipart
+	 *
+	 * @param $backup_name
+	 * @return bool
+	 */
 	public function is_multipart($backup_name)
 	{
 		if(stristr($backup_name, "-multipart"))
@@ -1043,13 +1043,13 @@ 
 		return false;	
 	}
 
-    /**
-     * Get backup archive size
-     *
-     * @param $backup_name
-     * @return bool|false|int
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Get backup archive size
+	 *
+	 * @param $backup_name
+	 * @return bool|false|int
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->filesystem->getSize($backup_name);
@@ -1063,12 +1063,12 @@ 
 		return $backup_size;
 	}
 
-    /**
-     * Get multipart backup files list
-     * @param $backup_name
-     * @return array
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Get multipart backup files list
+	 * @param $backup_name
+	 * @return array
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function get_multipart_files($backup_name)
 	{
 		$files = array();
@@ -1089,58 +1089,58 @@ 
 		return $files;
 	}
 
-    /**
-     * Sort_by method
-     *
-     * @param $array
-     * @param $field
-     * @param string $direction
-     * @return bool
-     */
-    private function sort_by( &$array, $field, $direction = 'asc')
-    {
-        $direction = strtolower($direction);
-
-        usort($array,
-            function($a, $b) use($field, $direction){
-
-                $a = $a[$field];
-                $b = $b[$field];
-
-                if ($a == $b)
-                {
-                    return 0;
-                }
-
-                if($direction == 'desc') {
-                    if($a > $b) {
-                        return -1;
-                    }
-                    else{
-                        return 1;
-                    }
-                }else {
-                    if($a < $b) {
-                        return -1;
-                    }
-                    else{
-                        return 1;
-                    }
-                }
-
-                //return ($a.($direction == 'desc' ? '>' : '<').$b) ? -1 : 1;
-            }
-        );
-
-        return true;
-    }
-
-    /**
-     * Send response method
-     *
-     * @param int $status
-     * @param $response
-     */
+	/**
+	 * Sort_by method
+	 *
+	 * @param $array
+	 * @param $field
+	 * @param string $direction
+	 * @return bool
+	 */
+	private function sort_by( &$array, $field, $direction = 'asc')
+	{
+		$direction = strtolower($direction);
+
+		usort($array,
+			function($a, $b) use($field, $direction){
+
+				$a = $a[$field];
+				$b = $b[$field];
+
+				if ($a == $b)
+				{
+					return 0;
+				}
+
+				if($direction == 'desc') {
+					if($a > $b) {
+						return -1;
+					}
+					else{
+						return 1;
+					}
+				}else {
+					if($a < $b) {
+						return -1;
+					}
+					else{
+						return 1;
+					}
+				}
+
+				//return ($a.($direction == 'desc' ? '>' : '<').$b) ? -1 : 1;
+			}
+		);
+
+		return true;
+	}
+
+	/**
+	 * Send response method
+	 *
+	 * @param int $status
+	 * @param $response
+	 */
 	public static function send_response($status = 200, $response)
 	{
 		header("Access-Control-Allow-Origin: *");
@@ -1163,12 +1163,12 @@ 
 		exit;
 	}
 
-    /**
-     * Serialize fix methods below for mysql query lines
-     *
-     * @param $query
-     * @return string|string[]|null
-     */
+	/**
+	 * Serialize fix methods below for mysql query lines
+	 *
+	 * @param $query
+	 * @return string|string[]|null
+	 */
 	 
 	function do_serialized_fix($query)
 	{
@@ -1181,51 +1181,51 @@ 
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
-	              //return $this->unescape_quotes($data);
+				  //return $this->unescape_quotes($data);
 	              
-	              return $data;
-	            }, $query);
+				  return $data;
+				}, $query);
 	}
 
-    /**
-     * Unescape quotes method
-     *
-     * @param $value
-     * @return mixed
-     */
+	/**
+	 * Unescape quotes method
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
 	private function unescape_quotes($value) {
 		return str_replace('\"', '"', $value);
 	}
 
-    /**
-     * Unescape mysql method
-     *
-     * @param $value
-     * @return mixed
-     */
+	/**
+	 * Unescape mysql method
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
 	private function unescape_mysql($value) {
 		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z",  "\'", '\"'),
 						   array("\\",   "\0",  "\n",  "\r",  "\x1a", "'", '"'), 
 						   $value);
 	}
 
-    /**
-     * Check if string is in serialized format
-     *
-     * @param $s
-     * @return bool
-     */
+	/**
+	 * Check if string is in serialized format
+	 *
+	 * @param $s
+	 * @return bool
+	 */
 	private function has_serialized($s)
 	{
 		if(
-		    stristr($s, '{' ) !== false &&
-		    stristr($s, '}' ) !== false &&
-		    stristr($s, ';' ) !== false &&
-		    stristr($s, ':' ) !== false
-		    ){
-		    return true;
+			stristr($s, '{' ) !== false &&
+			stristr($s, '}' ) !== false &&
+			stristr($s, ';' ) !== false &&
+			stristr($s, ':' ) !== false
+			){
+			return true;
 		}else{
-		    return false;
+			return false;
 		}
 
 	}

includes/class-xcloner-encryption.php

Indentation +359 added lines, -359 removed lines

@@ -10,370 +10,370 @@
 
 class Xcloner_Encryption
 {
-    const FILE_ENCRYPTION_BLOCKS = 1024*1024;
-    const FILE_ENCRYPTION_SUFFIX = ".encrypted";
-    const FILE_DECRYPTION_SUFFIX = ".decrypted";
-
-    private $xcloner_settings;
-    private $logger;
-    private $verification = false;
-
-    public function __construct(Xcloner $xcloner_container)
-    {
-        $this->xcloner_container = $xcloner_container;
-        if(method_exists($xcloner_container, 'get_xcloner_settings')) {
-            $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        }else{
-            $this->xcloner_settings = "";
-        }
-
-        if(method_exists($xcloner_container, 'get_xcloner_logger')) {
-            $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
-        }else{
-            $this->logger = "";
-        }
-    }
-
-    /**
-     * Returns the backup encryption key
-     *
-     * @return SECURE_AUTH_SALT|null
-     */
-    public function get_backup_encryption_key()
-    {
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_encryption_key();
-        }
-
-        return "";
-
-    }
-
-    /**
-     * Check if provided filename has encrypted suffix
-     *
-     * @param $filename
-     * @return bool
-     */
-    public function is_encrypted_file($filename) {
-        $fp = fopen($this->get_xcloner_path() .$filename, 'r');
-        $encryption_length = fread($fp, 16);
-        fclose($fp);
-        if(is_numeric($encryption_length)) {
-            return true;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Returns the filename with encrypted suffix
-     *
-     * @param $filename
-     * @return string
-     */
-    public function get_encrypted_target_backup_file_name( $filename ) {
-
-        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
-    }
-
-    /**
-     * Returns the filename without encrypted suffix
-     *
-     * @param $filename
-     * @return string
-     */
-    public function get_decrypted_target_backup_file_name( $filename ) {
-
-        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
-    }
-
-    /**
-     * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
-     *
-     * @param string $source Path to file that should be encrypted
-     * @param string $dest   File name where the encryped file should be written to.
-     * @param string $key    The key used for the encryption
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
-     * @param bool $verification   Weather we should we try to verify the decryption.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-    */
-    public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
-    {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
-            $key = self::get_backup_encryption_key();
-        }
-        $key_digest = openssl_digest ($key, "md5", true);
-
-        $keep_local = 1;
-        if(!$dest) {
-            $dest = $this->get_encrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if(!$iv || !$start) {
-            //$iv = openssl_random_pseudo_bytes(16);
-            $iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
-        }
-
-        if( !$start ) {
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
-        }else{
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
-        }
-
-        if ( $fpOut ) {
-
-            // Put the initialization vector to the beginning of the file
-            if(!$start) {
-                fwrite($fpOut, $iv);
-            }
-
-            if (file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
-
-                fseek($fpIn, (int)$start);
-
-                if (!feof($fpIn)) {
-
-                    $plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
-                    $ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-                    //$iv = openssl_random_pseudo_bytes(16);
-
-                    fwrite($fpOut, $ciphertext);
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut );
-
-                    if(!feof($fpIn)) {
-                        fclose($fpIn);
-                        //echo "\n NEW:".$key.md5($iv);
-                        //self::encryptFile($source, $dest, $key, $start, $iv);
-                        if($recursive ){
-                            $this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
-                        }else {
-
-                            if(($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                        }
-                    }
-
-                }
-            } else {
-                if(is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for encryption.');
-                }
-                throw new \Exception("Unable to read source file for encryption.");
-            }
-        } else {
-            if(is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for encryption.');
-            }
-            throw new \Exception("Unable to write destination file for encryption.");
-        }
-
-        if($verification) {
-            $this->verify_encrypted_file($dest);
-        }
-
-        //we replace the original backup with the encrypted one
-        if( !$keep_local && copy($this->get_xcloner_path() .$dest,
-             $this->get_xcloner_path() .$source) ) {
-            unlink($this->get_xcloner_path() .$dest);
-        }
-
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    public function verify_encrypted_file($file) {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Verifying encrypted file %s', $file));
-        }
-
-        $this->verification = true;
-        $this->decrypt_file($file);
-        $this->verification = false;
-    }
-
-    /**
-     * Dencrypt the passed file and saves the result in a new file, removing the
-     * last 4 characters from file name.
-     *
-     * @param string $source Path to file that should be decrypted
-     * @param string $dest   File name where the decryped file should be written to.
-     * @param string $key    The key used for the decryption (must be the same as for encryption)
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-     */
-    public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
-    {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
-            $key = self::get_backup_encryption_key();
-        }
-
-        $key_digest = openssl_digest ($key, "md5", true);
-
-        $keep_local = 1;
-        if(!$dest) {
-            $dest = $this->get_decrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if( !$start ) {
-            if($this->verification){
-                $fpOut = fopen("php://stdout", 'w');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
-            }
-        }else{
-            if($this->verification){
-                $fpOut = fopen("php://stdout", 'a');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
-            }
-        }
-
-        if ( $fpOut ) {
-            if ( file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
-
-                $encryption_length = (int)fread($fpIn, 16);
-                if(!$encryption_length) {
-                    $encryption_length = self::FILE_ENCRYPTION_BLOCKS;
-                }
-
-                fseek($fpIn, (int)$start);
-
-                // Get the initialzation vector from the beginning of the file
-                if(!$iv) {
-                    $iv = fread($fpIn, 16);
-                }
-
-                if (!feof($fpIn)) {
-
-                    // we have to read one block more for decrypting than for encrypting
-                    $ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
-                    $plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    if(!$plaintext){
-                        unlink($this->get_xcloner_path() . $dest);
-                        if(is_object($this->logger)) {
-                            $this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
-                        }
-                        throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
-                    }
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-
-                    if( !$this->verification) {
-                        fwrite($fpOut, $plaintext);
-                    }
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut );
-
-                    if(!feof($fpIn)) {
-                        fclose($fpIn);
-                        if($this->verification || $recursive) {
-                            $ciphertext = "";
-                            $plaintext = "";
-                            $this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
-                        }else {
-                            if(($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "encryption_length" => $encryption_length,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                    }
-                    }
-
-                }
-            } else {
-                if(is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for decryption');
-                }
-                throw new \Exception("Unable to read source file for decryption");
-            }
-        } else {
-            if(is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for decryption');
-            }
-            throw new \Exception("Unable to write destination file for decryption");
-        }
-
-        //we replace the original backup with the encrypted one
-        if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
-            $this->get_xcloner_path()  .$source) ) {
-            unlink($this->get_xcloner_path()  .$dest);
-        }
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    public function get_xcloner_path(){
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_store_path() . DS;
-        }
-
-        return null;
-    }
+	const FILE_ENCRYPTION_BLOCKS = 1024*1024;
+	const FILE_ENCRYPTION_SUFFIX = ".encrypted";
+	const FILE_DECRYPTION_SUFFIX = ".decrypted";
+
+	private $xcloner_settings;
+	private $logger;
+	private $verification = false;
+
+	public function __construct(Xcloner $xcloner_container)
+	{
+		$this->xcloner_container = $xcloner_container;
+		if(method_exists($xcloner_container, 'get_xcloner_settings')) {
+			$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+		}else{
+			$this->xcloner_settings = "";
+		}
+
+		if(method_exists($xcloner_container, 'get_xcloner_logger')) {
+			$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
+		}else{
+			$this->logger = "";
+		}
+	}
+
+	/**
+	 * Returns the backup encryption key
+	 *
+	 * @return SECURE_AUTH_SALT|null
+	 */
+	public function get_backup_encryption_key()
+	{
+		if(is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_encryption_key();
+		}
+
+		return "";
+
+	}
+
+	/**
+	 * Check if provided filename has encrypted suffix
+	 *
+	 * @param $filename
+	 * @return bool
+	 */
+	public function is_encrypted_file($filename) {
+		$fp = fopen($this->get_xcloner_path() .$filename, 'r');
+		$encryption_length = fread($fp, 16);
+		fclose($fp);
+		if(is_numeric($encryption_length)) {
+			return true;
+		}
+
+		return false;
+
+	}
+
+	/**
+	 * Returns the filename with encrypted suffix
+	 *
+	 * @param $filename
+	 * @return string
+	 */
+	public function get_encrypted_target_backup_file_name( $filename ) {
+
+		return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Returns the filename without encrypted suffix
+	 *
+	 * @param $filename
+	 * @return string
+	 */
+	public function get_decrypted_target_backup_file_name( $filename ) {
+
+		return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
+	 *
+	 * @param string $source Path to file that should be encrypted
+	 * @param string $dest   File name where the encryped file should be written to.
+	 * @param string $key    The key used for the encryption
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param string $iv   The IV key to use.
+	 * @param bool $verification   Weather we should we try to verify the decryption.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
+	{
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if(!$key){
+			$key = self::get_backup_encryption_key();
+		}
+		$key_digest = openssl_digest ($key, "md5", true);
+
+		$keep_local = 1;
+		if(!$dest) {
+			$dest = $this->get_encrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if(!$iv || !$start) {
+			//$iv = openssl_random_pseudo_bytes(16);
+			$iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
+		}
+
+		if( !$start ) {
+			$fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
+		}else{
+			$fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
+		}
+
+		if ( $fpOut ) {
+
+			// Put the initialization vector to the beginning of the file
+			if(!$start) {
+				fwrite($fpOut, $iv);
+			}
+
+			if (file_exists($this->get_xcloner_path() .$source) &&
+				$fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+
+				fseek($fpIn, (int)$start);
+
+				if (!feof($fpIn)) {
+
+					$plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
+					$ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+					//$iv = openssl_random_pseudo_bytes(16);
+
+					fwrite($fpOut, $ciphertext);
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut );
+
+					if(!feof($fpIn)) {
+						fclose($fpIn);
+						//echo "\n NEW:".$key.md5($iv);
+						//self::encryptFile($source, $dest, $key, $start, $iv);
+						if($recursive ){
+							$this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
+						}else {
+
+							if(($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+						}
+					}
+
+				}
+			} else {
+				if(is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for encryption.');
+				}
+				throw new \Exception("Unable to read source file for encryption.");
+			}
+		} else {
+			if(is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for encryption.');
+			}
+			throw new \Exception("Unable to write destination file for encryption.");
+		}
+
+		if($verification) {
+			$this->verify_encrypted_file($dest);
+		}
+
+		//we replace the original backup with the encrypted one
+		if( !$keep_local && copy($this->get_xcloner_path() .$dest,
+			 $this->get_xcloner_path() .$source) ) {
+			unlink($this->get_xcloner_path() .$dest);
+		}
+
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	public function verify_encrypted_file($file) {
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Verifying encrypted file %s', $file));
+		}
+
+		$this->verification = true;
+		$this->decrypt_file($file);
+		$this->verification = false;
+	}
+
+	/**
+	 * Dencrypt the passed file and saves the result in a new file, removing the
+	 * last 4 characters from file name.
+	 *
+	 * @param string $source Path to file that should be decrypted
+	 * @param string $dest   File name where the decryped file should be written to.
+	 * @param string $key    The key used for the decryption (must be the same as for encryption)
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param string $iv   The IV key to use.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
+	{
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if(!$key){
+			$key = self::get_backup_encryption_key();
+		}
+
+		$key_digest = openssl_digest ($key, "md5", true);
+
+		$keep_local = 1;
+		if(!$dest) {
+			$dest = $this->get_decrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if( !$start ) {
+			if($this->verification){
+				$fpOut = fopen("php://stdout", 'w');
+			}else {
+				$fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
+			}
+		}else{
+			if($this->verification){
+				$fpOut = fopen("php://stdout", 'a');
+			}else {
+				$fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
+			}
+		}
+
+		if ( $fpOut ) {
+			if ( file_exists($this->get_xcloner_path() .$source) &&
+				$fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+
+				$encryption_length = (int)fread($fpIn, 16);
+				if(!$encryption_length) {
+					$encryption_length = self::FILE_ENCRYPTION_BLOCKS;
+				}
+
+				fseek($fpIn, (int)$start);
+
+				// Get the initialzation vector from the beginning of the file
+				if(!$iv) {
+					$iv = fread($fpIn, 16);
+				}
+
+				if (!feof($fpIn)) {
+
+					// we have to read one block more for decrypting than for encrypting
+					$ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
+					$plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					if(!$plaintext){
+						unlink($this->get_xcloner_path() . $dest);
+						if(is_object($this->logger)) {
+							$this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
+						}
+						throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
+					}
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+
+					if( !$this->verification) {
+						fwrite($fpOut, $plaintext);
+					}
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut );
+
+					if(!feof($fpIn)) {
+						fclose($fpIn);
+						if($this->verification || $recursive) {
+							$ciphertext = "";
+							$plaintext = "";
+							$this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
+						}else {
+							if(($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"encryption_length" => $encryption_length,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+					}
+					}
+
+				}
+			} else {
+				if(is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for decryption');
+				}
+				throw new \Exception("Unable to read source file for decryption");
+			}
+		} else {
+			if(is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for decryption');
+			}
+			throw new \Exception("Unable to write destination file for decryption");
+		}
+
+		//we replace the original backup with the encrypted one
+		if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
+			$this->get_xcloner_path()  .$source) ) {
+			unlink($this->get_xcloner_path()  .$dest);
+		}
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	public function get_xcloner_path(){
+		if(is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_store_path() . DS;
+		}
+
+		return null;
+	}
 
 }
 
 
 try {
 
-    if(isset($argv[1])) {
-
-        class Xcloner {
-            public function __construct()
-            {
-            }
-        }
-        $xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
-
-        if ($argv[1] == "-e") {
-            $xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
-        } elseif ($argv[1] == "-d") {
-            $xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
-        }
-    }
+	if(isset($argv[1])) {
+
+		class Xcloner {
+			public function __construct()
+			{
+			}
+		}
+		$xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
+
+		if ($argv[1] == "-e") {
+			$xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
+		} elseif ($argv[1] == "-d") {
+			$xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
+		}
+	}
 }catch(\Exception $e) {
-    echo "CAUGHT: " . $e->getMessage();
+	echo "CAUGHT: " . $e->getMessage();
 }