kazhnuz/koblog
1
0
Fork 0
Code Issues 34 Pull requests 1 Projects 4 Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:bludit/bludit

Browse source
This commit is contained in:
dignajar 2020-07-01 20:09:34 +02:00
commit 8528b08a42
2 changed files with 50 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bl-kernel/abstract/plugin.class.php
View file

@ -66,6 +66,7 @@ class Plugin {
if ($this->installed()) { if ($this->installed()) {
$Tmp = new dbJSON($this->filenameDb); $Tmp = new dbJSON($this->filenameDb);
$this->db = $Tmp->db; $this->db = $Tmp->db;
$this->prepare();
} }
} }
@ -270,10 +271,16 @@ class Plugin {
public function init() public function init()
{ {
// This method is used on children classes. // This method is used on children classes
// The user can define his own field of the database // The user can define his own field of the database
} }
public function prepare()
{
// This method is used on children classes
// The user can prepare the plugin, when it is installed
}
public function post() public function post()
{ {
$args = $_POST; $args = $_POST;

48
bl-plugins/backup/plugin.php
View file

@ -211,6 +211,12 @@ class pluginBackup extends Plugin {
if (Filesystem::zip($backupDir, $backupDir.'.zip')) { if (Filesystem::zip($backupDir, $backupDir.'.zip')) {
Filesystem::deleteRecursive($backupDir); Filesystem::deleteRecursive($backupDir);
} }
// Add validation file
$zip = new ZipArchive();
$zip->open($backupDir.'.zip');
$zip->addFromString('.BLUDIT_BACKUP', md5_file($backupDir.'.zip'));
$zip->close();
} }
if (file_exists($backupDir.'.zip')) { if (file_exists($backupDir.'.zip')) {
@ -220,6 +226,40 @@ class pluginBackup extends Plugin {
return $this->response(400, $L->get("The Backup file could not be created.")); return $this->response(400, $L->get("The Backup file could not be created."));
} }
public function validateBackup($filename)
{
$tmp = PATH_TMP.'backup-'.time().'.zip';
copy($filename, $tmp);
// Check Archive
$zip = new ZipArchive();
if($zip->open($tmp) !== true) {
unlink($tmp);
return false;
}
// Check Basic Folders
if ($zip->addEmptyDir("databases") || $zip->addEmptyDir("pages") || $zip->addEmptyDir("uploads")) {
$zip->close();
unlink($tmp);
return false;
}
// Check Checksum
if (($checksum = $zip->getFromName(".BLUDIT_BACKUP")) === false) {
$zip->close();
unlink($tmp);
return false;
}
$zip->deleteName(".BLUDIT_BACKUP");
$zip->close();
$check = $checksum === md5_file($tmp);
// Return
unlink($tmp);
return $check;
}
public function restoreBackup($filename) public function restoreBackup($filename)
{ {
global $L; global $L;
@ -285,14 +325,10 @@ class pluginBackup extends Plugin {
return $this->response(400, $L->get("The passed file could not be validated.")); return $this->response(400, $L->get("The passed file could not be validated."));
} }
// Validate ZIP File // Validate Backup ZIP
$zip = new ZipArchive(); if (!$this->validateBackup($backup["tmp_name"])) {
$zip->open($backup["tmp_name"]);
if($zip->addEmptyDir("databases") || $zip->addEmptyDir("pages") || $zip->addEmptyDir("uploads")) {
$zip->close();
return $this->response(415, $L->get("The passed file is not a valid backup archive.")); return $this->response(415, $L->get("The passed file is not a valid backup archive."));
} }
$zip->close();
// File Name // File Name
$name = $backup["name"]; $name = $backup["name"];