lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

always show unsafe files

Browse source
This commit is contained in:
spencerrlongg 2025-04-08 18:06:18 -05:00
parent 12a8c54331
commit dd078785ac
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Console/Commands/RestoreFromBackup.php
View file

@ -200,7 +200,6 @@ class RestoreFromBackup extends Command
*/ */
public function handle() public function handle()
{ {
$unsafe_files = [];
$dir = getcwd(); $dir = getcwd();
if( $dir != base_path() ) { // usually only the case when running via webserver, not via command-line if( $dir != base_path() ) { // usually only the case when running via webserver, not via command-line
Log::debug("Current working directory is: $dir, changing directory to: ".base_path()); Log::debug("Current working directory is: $dir, changing directory to: ".base_path());
@ -290,6 +289,7 @@ class RestoreFromBackup extends Command
$interesting_files = []; $interesting_files = [];
$boring_files = []; $boring_files = [];
$unsafe_files = [];
for ($i = 0; $i < $za->numFiles; $i++) { for ($i = 0; $i < $za->numFiles; $i++) {
$stat_results = $za->statIndex($i); $stat_results = $za->statIndex($i);
@ -375,11 +375,7 @@ class RestoreFromBackup extends Command
if ($this->option('sanitize-guess-prefix')) { if ($this->option('sanitize-guess-prefix')) {
$prefix = SQLStreamer::guess_prefix($sql_contents); $prefix = SQLStreamer::guess_prefix($sql_contents);
$this->line($prefix); $this->line($prefix);
if (count($unsafe_files) > 0) {
foreach ($unsafe_files as $unsafe_file) {
$this->warn('Potentially unsafe file '.$unsafe_file.' is being skipped');
}
}
return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitize your SQL."); return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitize your SQL.");
} }
@ -513,6 +509,11 @@ class RestoreFromBackup extends Command
} else { } else {
$this->info(count($interesting_files).' files were succesfully transferred'); $this->info(count($interesting_files).' files were succesfully transferred');
} }
if (count($unsafe_files) > 0) {
foreach ($unsafe_files as $unsafe_file) {
$this->warn('Potentially unsafe file '.$unsafe_file.' was skipped');
}
}
foreach ($boring_files as $boring_file) { foreach ($boring_files as $boring_file) {
$this->warn($boring_file.' was skipped.'); $this->warn($boring_file.' was skipped.');
} }