Brady Wetherington
d2b7828569
This should allow us to add custom fields to just about anything we want to within Snipe-IT. Below are the commits that have been squashed together: Initial decoupling of custom field behavior from Assets for re-use Add new DB columns to Custom Fields and fieldsets for 'type' WIP: trying to figure out UI for custom fields for things other than Assets, find problematic places Real progress towards getting to where this stuff might actually work... Fix the table-name determining code for Custom Fields Getting it closer to where Assets at least work Rename the trait to it's new, even better name Solid progress on the new Trait! WIP: HasCustomFields, still working some stuff out Got some basics working; creating custom fields and stuff HasCustomFields now validates and saves Starting to yank the other boilerplate code as things start to work (!) Got the start of defaultValuesForCustomField() working More progress (squash me!) Add migrations for default_values_for_custom_fields table WIP: more towards hasCustomFields trait Progress cleaning up the PR, fixing FIXME's New, passing HasCustomFieldsTrait test! Fix date formatter helper for custom fields Fixed more FIXME's
68 lines
2.2 KiB
PHP
68 lines
2.2 KiB
PHP
<?php
|
|
|
|
use Illuminate\Http\Request;
|
|
|
|
/*
|
|
|--------------------------------------------------------------------------
|
|
| DO NOT EDIT THIS FILE DIRECTLY.
|
|
|--------------------------------------------------------------------------
|
|
| This file reads from your .env configuration file and should not
|
|
| be modified directly.
|
|
*/
|
|
|
|
return [
|
|
|
|
/*
|
|
* Set trusted proxy IP addresses.
|
|
*
|
|
* Both IPv4 and IPv6 addresses are
|
|
* supported, along with CIDR notation.
|
|
*
|
|
* The "*" character is syntactic sugar
|
|
* within TrustedProxy to trust any proxy
|
|
* that connects directly to your server,
|
|
* a requirement when you cannot know the address
|
|
* of your proxy (e.g. if using ELB or similar).
|
|
*
|
|
* The "**" character is syntactic sugar within
|
|
* TrustedProxy to trust not just any proxy that
|
|
* connects directly to your server, but also
|
|
* proxies that connect to those proxies, and all
|
|
* the way back until you reach the original source
|
|
* IP. It will mean that $request->getClientIp()
|
|
* always gets the originating client IP, no matter
|
|
* how many proxies that client's request has
|
|
* subsequently passed through.
|
|
*/
|
|
'proxies' => env('APP_TRUSTED_PROXIES') !== null ?
|
|
explode(',', env('APP_TRUSTED_PROXIES')) : '*',
|
|
|
|
/*
|
|
* To trust one or more specific proxies that connect
|
|
* directly to your server, use an array of IP addresses:
|
|
*/
|
|
// 'proxies' => ['192.168.1.1'],
|
|
|
|
/*
|
|
* Or, to trust all proxies that connect
|
|
* directly to your server, use a "*"
|
|
*/
|
|
// 'proxies' => '*',
|
|
|
|
/*
|
|
* Which headers to use to detect proxy related data (For, Host, Proto, Port)
|
|
*
|
|
* Options include:
|
|
*
|
|
* - Illuminate\Http\Request::HEADER_X_FORWARDED_ALL (use all x-forwarded-* headers to establish trust)
|
|
* - Illuminate\Http\Request::HEADER_FORWARDED (use the FORWARDED header to establish trust)
|
|
*
|
|
* @link https://symfony.com/doc/current/deployment/proxies.html
|
|
*/
|
|
'headers' => Request::HEADER_X_FORWARDED_FOR |
|
|
Request::HEADER_X_FORWARDED_HOST |
|
|
Request::HEADER_X_FORWARDED_PORT |
|
|
Request::HEADER_X_FORWARDED_PROTO |
|
|
Request::HEADER_X_FORWARDED_AWS_ELB,
|
|
];
|