1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-27 10:16:47 +00:00

Merge pull request #3450 from shleeable/patch-4

Updated Trustedproxy with safer default + Added diagnostic detail to TRUST_PROXIES
This commit is contained in:
daniel 2022-05-15 21:36:07 -06:00 committed by GitHub
commit ef4260c506
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions

View file

@ -8,6 +8,7 @@
- Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444)) - Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444))
- Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1)) - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
- Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24)) - Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
- Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
- Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1)) - Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
- Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233)) - Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))

View file

@ -23,5 +23,5 @@ return [
* how many proxies that client's request has * how many proxies that client's request has
* subsequently passed through. * subsequently passed through.
*/ */
'proxies' => env('TRUST_PROXIES', ''), 'proxies' => env('TRUST_PROXIES', '*'),
]; ];

View file

@ -184,6 +184,11 @@
<strong><span class="badge badge-primary">Storage</span> Filesystems default (local/s3/spaces): </strong> <strong><span class="badge badge-primary">Storage</span> Filesystems default (local/s3/spaces): </strong>
<span>{{ config_cache('filesystems.default')}}</span> <span>{{ config_cache('filesystems.default')}}</span>
</li> </li>
<li>
<strong><span class="badge badge-primary">Network</span> TrustedProxy: </strong>
<span>{{ config('trustedproxy.proxies') }}</span>
</li>
</ul> </ul>
</div> </div>
<div class="pb-3 border-bottom"> <div class="pb-3 border-bottom">