Merge pull request #11554 from firefly-iii/JC5-patch-2

Update PHP version setup in release workflow

.env.example

@@ -14,15 +14,7 @@ SITE_OWNER=mail@example.com
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 #
-# Try to avoid special characters like #, < and > in your app key. This string does not need full entropy
-# When in doubt, follow the link below and pick one.
-#
-# https://www.random.org/strings/?num=5&len=32&digits=on&upperalpha=on&loweralpha=on&unique=on&format=html&rnd=new
-#
-# If you are a fancy linux nerd like me, use this command:
-#
-# head /dev/urandom | LC_ALL=C tr -dc 'A-Za-z0-9' | head -c 32 && echo
-#
+# Avoid the "#" character in your APP_KEY, it may break things.
 #
 APP_KEY=SomeRandomStringOf32CharsExactly
 

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ github.event.inputs.phpversion }}
+          php-version: ${{ github.event.inputs.phpversion || '8.4' }}
           extensions: mbstring, intl, zip, bcmath
       - name: Switch and pull
         run: |

app/Console/Commands/Correction/RestoresOAuthKeys.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 
 class RestoresOAuthKeys extends Command
 {
@@ -41,9 +40,7 @@ class RestoresOAuthKeys extends Command
      */
     public function handle(): int
     {
-        Log::debug('Restore OAuth Keys command.');
         $this->restoreOAuthKeys();
-        Log::debug('Done with OAuth Keys command.');
 
         return 0;
     }

app/Support/System/OAuthKeys.php

@@ -24,12 +24,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\System;
 
+use Illuminate\Support\Facades\Log;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Log;
 use Laravel\Passport\Console\KeysCommand;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -48,27 +48,16 @@ class OAuthKeys
 
     public static function generateKeys(): void
     {
-        Log::debug('Will now run generateKeys()');
         Artisan::registerCommand(new KeysCommand());
         Artisan::call('firefly-iii:laravel-passport-keys');
-        Log::debug('Done with generateKeys()');
     }
 
     public static function hasKeyFiles(): bool
     {
-        Log::debug('hasKeyFiles()');
-        $private       = storage_path('oauth-private.key');
-        $public        = storage_path('oauth-public.key');
-        $privateExists = file_exists($private);
-        $publicExists  = file_exists($public);
+        $private = storage_path('oauth-private.key');
+        $public  = storage_path('oauth-public.key');
 
-        Log::debug(sprintf('Private key file at "%s" exists? %s', $private, var_export($privateExists, true)));
-        Log::debug(sprintf('Public key file at "%s" exists ? %s', $public, var_export($publicExists, true)));
-
-        $result        = file_exists($private) && file_exists($public);
-        Log::debug(sprintf('Method will return %s', var_export($result, true)));
-
-        return $result;
+        return file_exists($private) && file_exists($public);
     }
 
     public static function keysInDatabase(): bool
@@ -76,36 +65,17 @@ class OAuthKeys
         $privateKey = '';
         $publicKey  = '';
         // better check if keys are in the database:
-        $hasPrivate = FireflyConfig::has(self::PRIVATE_KEY);
-        $hasPublic  = FireflyConfig::has(self::PUBLIC_KEY);
-
-        Log::debug(sprintf('keysInDatabase: hasPrivate:%s, hasPublic:%s', var_export($hasPrivate, true), var_export($hasPublic, true)));
-
-        if ($hasPrivate && $hasPublic) {
+        if (FireflyConfig::has(self::PRIVATE_KEY) && FireflyConfig::has(self::PUBLIC_KEY)) {
             try {
-                $privateKey = trim((string)FireflyConfig::get(self::PRIVATE_KEY)?->data);
-                $publicKey  = trim((string)FireflyConfig::get(self::PUBLIC_KEY)?->data);
+                $privateKey = (string)FireflyConfig::get(self::PRIVATE_KEY)?->data;
+                $publicKey  = (string)FireflyConfig::get(self::PUBLIC_KEY)?->data;
             } catch (ContainerExceptionInterface|FireflyException|NotFoundExceptionInterface $e) {
                 Log::error(sprintf('Could not validate keysInDatabase(): %s', $e->getMessage()));
                 Log::error($e->getTraceAsString());
             }
         }
-        if ('' === $privateKey) {
-            Log::warning('Private key in DB is unexpectedly an empty string.');
-        }
-        if ('' === $publicKey) {
-            Log::warning('Public key in DB is unexpectedly an empty string.');
-        }
-        if ('' !== $privateKey) {
-            Log::debug(sprintf('SHA2 hash of private key in DB: %s', hash('sha256', $privateKey)));
-        }
-        if ('' !== $publicKey) {
-            Log::debug(sprintf('SHA2 hash of public key in DB : %s', hash('sha256', $publicKey)));
-        }
-        $return     = '' !== $privateKey && '' !== $publicKey;
-        Log::debug(sprintf('keysInDatabase will return %s', var_export($return, true)));
 
-        return $return;
+        return '' !== $privateKey && '' !== $publicKey;
     }
 
     /**
@@ -116,20 +86,12 @@ class OAuthKeys
      */
     public static function restoreKeysFromDB(): bool
     {
-        Log::debug('restoreKeysFromDB()');
         $privateKey = (string)FireflyConfig::get(self::PRIVATE_KEY)?->data;
         $publicKey  = (string)FireflyConfig::get(self::PUBLIC_KEY)?->data;
 
-        if ('' === $privateKey) {
-            Log::warning('Private key is not in the database.');
-        }
-        if ('' === $publicKey) {
-            Log::warning('Public key is not in the database.');
-        }
-
         try {
-            $privateContent = trim(Crypt::decrypt($privateKey));
-            $publicContent  = trim(Crypt::decrypt($publicKey));
+            $privateContent = Crypt::decrypt($privateKey);
+            $publicContent  = Crypt::decrypt($publicKey);
         } catch (DecryptException $e) {
             Log::error('Could not decrypt pub/private keypair.');
             Log::error($e->getMessage());
@@ -137,7 +99,6 @@ class OAuthKeys
             // delete config vars from DB:
             FireflyConfig::delete(self::PRIVATE_KEY);
             FireflyConfig::delete(self::PUBLIC_KEY);
-            Log::debug('Done with generateKeysFromDB(), return FALSE');
 
             return false;
         }
@@ -146,24 +107,15 @@ class OAuthKeys
         file_put_contents($private, $privateContent);
         file_put_contents($public, $publicContent);
 
-        Log::debug(sprintf('Will store private key with hash "%s" in file "%s"', hash('sha256', $privateContent), $private));
-        Log::debug(sprintf('Will store public key with hash "%s" in file "%s"', hash('sha256', $publicContent), $public));
-        Log::debug('Done with generateKeysFromDB()');
-
         return true;
     }
 
     public static function storeKeysInDB(): void
     {
-        $private        = storage_path('oauth-private.key');
-        $public         = storage_path('oauth-public.key');
-        $privateContent = file_get_contents($private);
-        $publicContent  = file_get_contents($public);
-        FireflyConfig::set(self::PRIVATE_KEY, Crypt::encrypt($privateContent));
-        FireflyConfig::set(self::PUBLIC_KEY, Crypt::encrypt($publicContent));
-
-        Log::debug(sprintf('Will store the content of file "%s" as "%s" in the database (hash: %s)', $private, self::PRIVATE_KEY, hash('sha256', $privateContent)));
-        Log::debug(sprintf('Will store the content of file "%s" as "%s" in the database (hash: %s)', $public, self::PUBLIC_KEY, hash('sha256', $publicContent)));
+        $private = storage_path('oauth-private.key');
+        $public  = storage_path('oauth-public.key');
+        FireflyConfig::set(self::PRIVATE_KEY, Crypt::encrypt(file_get_contents($private)));
+        FireflyConfig::set(self::PUBLIC_KEY, Crypt::encrypt(file_get_contents($public)));
     }
 
     public static function verifyKeysRoutine(): void

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                              => 'develop/2026-01-17',
-    'build_time'                           => 1768662564,
+    'version'                              => '6.4.16',
+    'build_time'                           => 1768636333,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.