Show user info about mandatory updates.

This commit is contained in:
James Cole
2021-06-08 19:19:56 +02:00
parent 81669bfcc1
commit 9873365369
7 changed files with 114 additions and 5 deletions

View File

@@ -0,0 +1,89 @@
<?php
namespace FireflyIII\Console\Commands;
use Illuminate\Console\Command;
use Storage;
/**
* Class VerifySecurityAlerts
*/
class VerifySecurityAlerts extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly-iii:verify-security-alerts';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Verify security alerts';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle(): int
{
// remove old advisory
app('fireflyconfig')->delete('upgrade_security_message');
app('fireflyconfig')->delete('upgrade_security_level');
// check for security advisories.
$version = config('firefly.version');
$disk = Storage::disk('resources');
if (!$disk->has('alerts.json')) {
return 0;
}
$content = $disk->get('alerts.json');
$json = json_decode($content, true, 10);
/** @var array $array */
foreach ($json as $array) {
// overrule array:
if ($version === $array['version'] && true === $array['advisory']) {
// add advisory to configuration.
app('fireflyconfig')->set('upgrade_security_message', $array['message']);
app('fireflyconfig')->set('upgrade_security_level', $array['level']);
// depends on level
if ('info' === $array['level']) {
$this->info($array['message']);
return 0;
}
if ('warning' === $array['level']) {
$this->warn('------------------------ :o');
$this->warn($array['message']);
$this->warn('------------------------ :o');
return 0;
}
if ('danger' === $array['level']) {
$this->error('------------------------ :-(');
$this->error($array['message']);
$this->error('------------------------ :-(');
return 0;
}
return 0;
}
}
return 0;
}
}

View File

@@ -109,7 +109,7 @@ class Range
// send error to view if could not set money format
if (false === $moneyResult) {
Log::error('Could not set locale. The following array doesnt work: ', $localeArray);
app('view')->share('invalidMonetaryLocale', true);
app('view')->share('invalidMonetaryLocale', true);
}
// save some formats:
@@ -133,5 +133,14 @@ class Range
{
$pref = app('preferences')->get('list-length', config('firefly.list_length', 10))->data;
app('view')->share('listLength', $pref);
// share security message:
if (
app('fireflyconfig')->has('upgrade_security_message')
&& app('fireflyconfig')->has('upgrade_security_level')
) {
app('view')->share('upgrade_security_message', app('fireflyconfig')->get('upgrade_security_message')->data);
app('view')->share('upgrade_security_level', app('fireflyconfig')->get('upgrade_security_level')->data);
}
}
}

View File

@@ -46,7 +46,7 @@ class FireflyConfig
Cache::forget($fullName);
}
try {
Configuration::where('name', $name)->delete();
Configuration::where('name', $name)->forceDelete();
} catch (Exception $e) { // @phpstan-ignore-line
// @ignoreException
}
@@ -138,7 +138,7 @@ class FireflyConfig
public function set(string $name, $value): Configuration
{
try {
$config = Configuration::whereName($name)->first();
$config = Configuration::whereName($name)->whereNull('deleted_at')->first();
} catch (QueryException | Exception $e) { // @phpstan-ignore-line
$item = new Configuration;
$item->name = $name;
@@ -146,12 +146,12 @@ class FireflyConfig
return $item;
}
if (null === $config) {
$item = new Configuration;
$item->name = $name;
$item->data = $value;
$item->save();
Cache::forget('ff-config-' . $name);
return $item;