Merge branch 'release/4.7.5.3'

.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.

.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

.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.

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);
     }
 }

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.

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,