This commit is contained in:
James Cole 2023-03-11 15:04:16 +01:00
parent a97a0d461d
commit 3d424972cc
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80

View File

@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands; namespace FireflyIII\Console\Commands;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Database\QueryException;
use League\Flysystem\FilesystemException; use League\Flysystem\FilesystemException;
use Log; use Log;
use Storage; use Storage;
@ -55,9 +56,7 @@ class VerifySecurityAlerts extends Command
*/ */
public function handle(): int public function handle(): int
{ {
// remove old advisory $this->removeOldAdvisory();
app('fireflyconfig')->delete('upgrade_security_message');
app('fireflyconfig')->delete('upgrade_security_level');
// check for security advisories. // check for security advisories.
$version = config('firefly.version'); $version = config('firefly.version');
@ -76,8 +75,7 @@ class VerifySecurityAlerts extends Command
if ($version === $array['version'] && true === $array['advisory']) { if ($version === $array['version'] && true === $array['advisory']) {
Log::debug(sprintf('Version %s has an alert!', $array['version'])); Log::debug(sprintf('Version %s has an alert!', $array['version']));
// add advisory to configuration. // add advisory to configuration.
app('fireflyconfig')->set('upgrade_security_message', $array['message']); $this->saveSecurityAdvisory($array);
app('fireflyconfig')->set('upgrade_security_level', $array['level']);
// depends on level // depends on level
if ('info' === $array['level']) { if ('info' === $array['level']) {
@ -110,4 +108,31 @@ class VerifySecurityAlerts extends Command
return 0; return 0;
} }
/**
* @return void
*/
private function removeOldAdvisory(): void
{
try {
app('fireflyconfig')->delete('upgrade_security_message');
app('fireflyconfig')->delete('upgrade_security_level');
} catch (QueryException $e) {
Log::debug(sprintf('Could not delete old security advisory, but thats OK: %s', $e->getMessage()));
}
}
/**
* @param array $array
* @return void
*/
private function saveSecurityAdvisory(array $array): void
{
try {
app('fireflyconfig')->set('upgrade_security_message', $array['message']);
app('fireflyconfig')->set('upgrade_security_level', $array['level']);
} catch (QueryException $e) {
Log::debug(sprintf('Could not save new security advisory, but thats OK: %s', $e->getMessage()));
}
}
} }