From 0c104cd86ca2c9bde4b96e3d97844054cf7aa0f0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 14:54:10 +0200 Subject: [PATCH 1/3] New file list for Sandstorm. --- .sandstorm/sandstorm-files.list | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 3fafcba06e..86e0f91672 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -759,10 +759,8 @@ opt/app/app/Support/Facades/Steam.php opt/app/app/Support/FireflyConfig.php opt/app/app/Support/Http/Controllers/DateCalculation.php opt/app/app/Support/Http/Controllers/RuleManagement.php -opt/app/app/Support/Import/Information/BunqInformation.php opt/app/app/Support/Import/Information/GetSpectreCustomerTrait.php opt/app/app/Support/Import/Information/GetSpectreTokenTrait.php -opt/app/app/Support/Import/Information/InformationInterface.php opt/app/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php opt/app/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php opt/app/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php @@ -797,7 +795,6 @@ opt/app/app/Support/Import/Routine/File/OpposingAccountMapper.php opt/app/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php opt/app/app/Support/Import/Routine/Spectre/StageImportDataHandler.php opt/app/app/Support/Import/Routine/Spectre/StageNewHandler.php -opt/app/app/Support/Models/TransactionJournalTrait.php opt/app/app/Support/Navigation.php opt/app/app/Support/Preferences.php opt/app/app/Support/Search/Modifier.php @@ -1540,7 +1537,6 @@ opt/app/resources/views/form/file.twig opt/app/resources/views/form/help.twig opt/app/resources/views/form/integer.twig opt/app/resources/views/form/location.twig -opt/app/resources/views/form/multiRadio.twig opt/app/resources/views/form/non-selectable-amount.twig opt/app/resources/views/form/number.twig opt/app/resources/views/form/options.twig @@ -3379,6 +3375,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Redis/composer.json opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.api.stub +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.invokable.stub opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.model.api.stub opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.model.stub opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.nested.api.stub From fb122ba0972613a60534d9e55c7124788c525209 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 15:10:20 +0200 Subject: [PATCH 2/3] Fix for #1572 --- app/Http/Middleware/TrustProxies.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index fe1d249e83..3377dd6720 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -36,13 +36,6 @@ class TrustProxies extends Middleware /** @var int The headers to check. */ protected $headers = Request::HEADER_X_FORWARDED_ALL; - /** - * The trusted proxies for this application. - * - * @var array|string - */ - protected $proxies = []; - /** * TrustProxies constructor. * @@ -52,6 +45,9 @@ class TrustProxies extends Middleware { $trustedProxies = (string)env('TRUSTED_PROXIES', null); $this->proxies = explode(',', $trustedProxies); + if ($trustedProxies === '**') { + $this->proxies = '**'; + } parent::__construct($config); } } From 2ae3cf79e4293f91a01645b2c25669f20a5f9ffc Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jul 2018 15:20:28 +0200 Subject: [PATCH 3/3] Update config files and change logs for hotfix. --- .sandstorm/changelog.md | 2 +- .sandstorm/sandstorm-pkgdef.capnp | 2 +- changelog.md | 5 ++++- config/firefly.php | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index 1da400992f..cbf34ab81c 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,4 +1,4 @@ -# 4.7.5.2 +# 4.7.5.3 - [Issue 1527](https://github.com/firefly-iii/firefly-iii/issues/1527), fixed views for transactions without a budget. - [Issue 1553](https://github.com/firefly-iii/firefly-iii/issues/1553), report could not handle transactions before the first one in the system. - [Issue 1549](https://github.com/firefly-iii/firefly-iii/issues/1549) update a budget will also update any rules that refer to that budget. diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index f91c2a0734..8d7814ae0d 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -16,7 +16,7 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), appVersion = 15, - appMarketingVersion = (defaultText = "4.7.5.2"), + appMarketingVersion = (defaultText = "4.7.5.3"), actions = [ # Define your "new document" handlers here. diff --git a/changelog.md b/changelog.md index b9c69958c7..121443f5bf 100644 --- a/changelog.md +++ b/changelog.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.7.5.2] - 2017-07-28 +## [4.7.5.3] - 2017-07-28 ### Added - Many updated French translations thanks to [@bubka](https://crowdin.com/profile/bubka). @@ -20,6 +20,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fixed a bug where users could not delete budget limits in the API. - Piggy bank notes are visible again. +## [4.7.5.2] - 2017-07-28 +This version was superseeded by v4.7.5.3 because of a critical bug in the proxy-middleware. + ## [4.7.5.1] - 2018-07-14 ### Fixed - [Issue 1531](https://github.com/firefly-iii/firefly-iii/issues/1531), the database routine incorrectly reports empty categories. diff --git a/config/firefly.php b/config/firefly.php index 11a2c6aa22..1af5d5b4a7 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -88,7 +88,7 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.7.5.2', + 'version' => '4.7.5.3', 'api_version' => '0.6', 'db_version' => 4, 'maxUploadSize' => 15242880,