beenull/PhyrePanel-mirror
1
0
Fork 0
mirror of https://github.com/PhyreApps/PhyrePanel.git synced 2024-11-21 23:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
Bozhidar 2024-05-01 02:04:24 +03:00
parent e8ff2c3bc4
commit 7a3f581b7b
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
web/app/Models/Backup.php
View file

@ -4,6 +4,7 @@ namespace App\Models;
use App\Filament\Enums\BackupStatus;
use App\Helpers;
use App\ShellApi;
use Dotenv\Dotenv;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@ -46,9 +47,9 @@ class Backup extends Model
});
static::deleting(function ($model) {
if (is_dir($model->path)) {
shell_exec('rm -rf ' . $model->path);
}
ShellApi::safeDelete($model->path,[
Storage::path('backups')
]);
if (Storage::disk('backups')->exists($model->filepath)) {
Storage::disk('backups')->delete($model->filepath);
}
@ -129,7 +130,7 @@ class Backup extends Model
];
}
shell_exec('rm -rf '.$this->path);
ShellApi::safeRmRf($this->path);
$this->size = filesize(Storage::disk('backups')->path($this->filepath));
$this->status = 'completed';

18
web/app/ShellApi.php
View file

@ -2,12 +2,24 @@
namespace App;
use Illuminate\Support\Str;
class ShellApi
{
public function safeRmRf($pathOrFile, $whiteListedPaths = [])
public static function safeDelete($pathOrFile, $whiteListedPaths = [])
{
if (in_array($pathOrFile, $whiteListedPaths)) {
return false;
if (empty($whiteListedPaths)) {
throw new \Exception('Whitelist paths cannot be empty');
}
$errorsBag = [];
foreach ($whiteListedPaths as $whiteListedPath) {
if (!Str::of($pathOrFile)->startsWith($whiteListedPath)) {
$errorsBag[] = 'Cannot delete this path';
}
}
if (!empty($errorsBag)) {
throw new \Exception('Cannot delete this path');
}
$exec = shell_exec('rm -rf ' . $pathOrFile);