diff --git a/app/Api/V1/Requests/Data/DestroyRequest.php b/app/Api/V1/Requests/Data/DestroyRequest.php index 299ecf138b..0f186ffd4e 100644 --- a/app/Api/V1/Requests/Data/DestroyRequest.php +++ b/app/Api/V1/Requests/Data/DestroyRequest.php @@ -57,7 +57,7 @@ class DestroyRequest extends FormRequest ',not_assets_liabilities'; return [ - 'objects' => sprintf('required|min:1|string|in:%s', $valid), + 'objects' => sprintf('required|max:255|min:1|string|in:%s', $valid), 'unused' => 'in:true,false', ]; } diff --git a/app/Api/V1/Requests/Data/Export/ExportRequest.php b/app/Api/V1/Requests/Data/Export/ExportRequest.php index fc264e4f8d..6c6f80d3ba 100644 --- a/app/Api/V1/Requests/Data/Export/ExportRequest.php +++ b/app/Api/V1/Requests/Data/Export/ExportRequest.php @@ -73,7 +73,7 @@ class ExportRequest extends FormRequest { return [ 'type' => 'in:csv', - 'accounts' => 'min:1', + 'accounts' => 'min:1|max:65536', 'start' => 'date|before:end', 'end' => 'date|after:start', ]; diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.php index c798731236..7be849258f 100644 --- a/app/Api/V1/Requests/Models/Account/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php @@ -103,8 +103,8 @@ class StoreRequest extends FormRequest $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes'))); $type = $this->convertString('type'); $rules = [ - 'name' => 'required|min:1|uniqueAccountForUser', - 'type' => 'required|min:1|'.sprintf('in:%s', $types), + 'name' => 'required|max:1024|min:1|uniqueAccountForUser', + 'type' => 'required|max:1024|min:1|'.sprintf('in:%s', $types), 'iban' => ['iban', 'nullable', new UniqueIban(null, $type)], 'bic' => 'bic|nullable', 'account_number' => ['between:1,255', 'nullable', new UniqueAccountNumber(null, $type)], @@ -120,7 +120,7 @@ class StoreRequest extends FormRequest 'credit_card_type' => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes), 'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull', 'liability_type' => 'nullable|required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage', - 'liability_amount' => 'required_with:liability_start_date|min:0|numeric', + 'liability_amount' => 'required_with:liability_start_date|min:0|numeric|max:1000000000', 'liability_start_date' => 'required_with:liability_amount|date', 'liability_direction' => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit', 'interest' => 'between:0,100|numeric', diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index 0341e52346..a9c27e6485 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -94,7 +94,7 @@ class UpdateRequest extends FormRequest $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes'))); $rules = [ - 'name' => sprintf('min:1|uniqueAccountForUser:%d', $account->id), + 'name' => sprintf('min:1|max:1024|uniqueAccountForUser:%d', $account->id), 'type' => sprintf('in:%s', $types), 'iban' => ['iban', 'nullable', new UniqueIban($account, $this->convertString('type'))], 'bic' => 'bic|nullable', @@ -104,7 +104,7 @@ class UpdateRequest extends FormRequest 'virtual_balance' => 'numeric|nullable', 'order' => 'numeric|nullable', 'currency_id' => 'numeric|exists:transaction_currencies,id', - 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', + 'currency_code' => 'min:3|max:51|exists:transaction_currencies,code', 'active' => [new IsBoolean()], 'include_net_worth' => [new IsBoolean()], 'account_role' => sprintf('in:%s|nullable|required_if:type,asset', $accountRoles), diff --git a/app/Api/V1/Requests/Models/AvailableBudget/Request.php b/app/Api/V1/Requests/Models/AvailableBudget/Request.php index b839f0b26c..454ab77167 100644 --- a/app/Api/V1/Requests/Models/AvailableBudget/Request.php +++ b/app/Api/V1/Requests/Models/AvailableBudget/Request.php @@ -67,7 +67,7 @@ class Request extends FormRequest { return [ 'currency_id' => 'numeric|exists:transaction_currencies,id', - 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', + 'currency_code' => 'min:3|max:51|exists:transaction_currencies,code', 'amount' => 'numeric|gt:0', 'start' => 'date', 'end' => 'date', diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.php index 61ce2be480..d6f7aa5652 100644 --- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php @@ -82,7 +82,7 @@ class StoreRequest extends FormRequest 'amount_min' => 'numeric|gt:0|required', 'amount_max' => 'numeric|gt:0|required', 'currency_id' => 'numeric|exists:transaction_currencies,id', - 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', + 'currency_code' => 'min:3|max:51|exists:transaction_currencies,code', 'date' => 'date|required', 'end_date' => 'date|after:date', 'extension_date' => 'date|after:date', diff --git a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php index 482fe68a00..ded92b920c 100644 --- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php @@ -84,7 +84,7 @@ class UpdateRequest extends FormRequest 'amount_min' => 'numeric|gt:0', 'amount_max' => 'numeric|gt:0', 'currency_id' => 'numeric|exists:transaction_currencies,id', - 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', + 'currency_code' => 'min:3|max:51|exists:transaction_currencies,code', 'date' => 'date', 'end_date' => 'date|after:date', 'extension_date' => 'date|after:date', diff --git a/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php index b3a1c30ae4..1c003221ef 100644 --- a/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php +++ b/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php @@ -65,7 +65,7 @@ class StoreRequest extends FormRequest 'end' => 'required|after:start|date', 'amount' => 'required|gt:0', 'currency_id' => 'numeric|exists:transaction_currencies,id', - 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', + 'currency_code' => 'min:3|max:51|exists:transaction_currencies,code', ]; } } diff --git a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php index 552ecb8201..d863916ae5 100644 --- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php @@ -69,7 +69,7 @@ class UpdateRequest extends FormRequest 'end' => 'date', 'amount' => 'gt:0', 'currency_id' => 'numeric|exists:transaction_currencies,id', - 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', + 'currency_code' => 'min:3|max:51|exists:transaction_currencies,code', ]; } diff --git a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php index 9ea7f8dbf0..9a9f96d8da 100644 --- a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php @@ -63,7 +63,7 @@ class UpdateRequest extends FormRequest $objectGroup = $this->route()->parameter('objectGroup'); return [ - 'title' => sprintf('min:1|uniqueObjectGroup:%d', $objectGroup->id), + 'title' => sprintf('max:1024|min:1|uniqueObjectGroup:%d', $objectGroup->id), 'order' => 'numeric', ]; } diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php index 6892791352..9b34a07ad9 100644 --- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php @@ -158,9 +158,9 @@ class StoreRequest extends FormRequest 'transactions.*.amount' => 'required|numeric|gt:0', 'transactions.*.foreign_amount' => 'nullable|numeric|gt:0', 'transactions.*.currency_id' => 'nullable|numeric|exists:transaction_currencies,id', - 'transactions.*.currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', + 'transactions.*.currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', - 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', + 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.source_name' => 'between:1,255|nullable', 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index 2677ab6157..0cd1464794 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -172,9 +172,9 @@ class UpdateRequest extends FormRequest 'transactions.*.amount' => 'numeric|gt:0', 'transactions.*.foreign_amount' => 'nullable|numeric|gt:0', 'transactions.*.currency_id' => 'nullable|numeric|exists:transaction_currencies,id', - 'transactions.*.currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', + 'transactions.*.currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', - 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', + 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.source_name' => 'between:1,255|nullable', 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], diff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.php index f74df055c3..a6087c9a17 100644 --- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php @@ -130,7 +130,7 @@ class StoreRequest extends FormRequest 'rule_group_title' => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title', 'trigger' => 'required|in:store-journal,update-journal', 'triggers.*.type' => 'required|in:'.implode(',', $validTriggers), - 'triggers.*.value' => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue', + 'triggers.*.value' => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024', 'triggers.*.stop_processing' => [new IsBoolean()], 'triggers.*.active' => [new IsBoolean()], 'actions.*.type' => 'required|in:'.implode(',', $validActions), diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php index ab51cdd56c..29449397b0 100644 --- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php @@ -147,7 +147,7 @@ class UpdateRequest extends FormRequest 'rule_group_title' => 'nullable|between:1,255|belongsToUser:rule_groups,title', 'trigger' => 'in:store-journal,update-journal', 'triggers.*.type' => 'required|in:'.implode(',', $validTriggers), - 'triggers.*.value' => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue', + 'triggers.*.value' => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024', 'triggers.*.stop_processing' => [new IsBoolean()], 'triggers.*.active' => [new IsBoolean()], 'actions.*.type' => 'required|in:'.implode(',', $validActions), diff --git a/app/Api/V1/Requests/Models/Tag/StoreRequest.php b/app/Api/V1/Requests/Models/Tag/StoreRequest.php index 2717114b0b..5f0ce7737b 100644 --- a/app/Api/V1/Requests/Models/Tag/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Tag/StoreRequest.php @@ -65,8 +65,8 @@ class StoreRequest extends FormRequest public function rules(): array { $rules = [ - 'tag' => 'required|min:1|uniqueObjectForUser:tags,tag', - 'description' => 'min:1|nullable', + 'tag' => 'required|min:1|uniqueObjectForUser:tags,tag|max:1024', + 'description' => 'min:1|nullable|max:65536', 'date' => 'date|nullable', ]; diff --git a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php index c63bebdc87..03eb2d2573 100644 --- a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php @@ -71,8 +71,8 @@ class UpdateRequest extends FormRequest $tag = $this->route()->parameter('tagOrId'); // TODO check if uniqueObjectForUser is obsolete $rules = [ - 'tag' => 'min:1|uniqueObjectForUser:tags,tag,'.$tag->id, - 'description' => 'min:1|nullable', + 'tag' => 'min:1|max:1024|uniqueObjectForUser:tags,tag,'.$tag->id, + 'description' => 'min:1|nullable|max:65536', 'date' => 'date|nullable', ]; diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php index 3138ffca0b..d63cffcfcb 100644 --- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php @@ -188,9 +188,9 @@ class StoreRequest extends FormRequest // currency info 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id|nullable', - 'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code|nullable', + 'transactions.*.currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', 'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id|nullable', - 'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code|nullable', + 'transactions.*.foreign_currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', // amount 'transactions.*.amount' => 'required|numeric|gt:0', diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php index bf39777d97..801a8f03af 100644 --- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php @@ -335,9 +335,9 @@ class UpdateRequest extends FormRequest // currency info 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id', - 'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code', + 'transactions.*.currency_code' => 'min:3|max:51|exists:transaction_currencies,code', 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', - 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', + 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', // amount 'transactions.*.amount' => 'numeric|gt:0|max:100000000000', diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php index 7314acbf27..479348c85b 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php @@ -75,7 +75,7 @@ class StoreRequest extends FormRequest 'name' => 'required|between:1,255|unique:transaction_currencies,name', 'code' => 'required|between:3,51|unique:transaction_currencies,code', 'symbol' => 'required|between:1,51|unique:transaction_currencies,symbol', - 'decimal_places' => 'between:0,20|numeric|min:0|max:20', + 'decimal_places' => 'between:0,20|numeric|min:0|max:12', 'enabled' => [new IsBoolean()], 'default' => [new IsBoolean()], diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php index f9086b99ca..5e673d42b4 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php @@ -74,7 +74,7 @@ class UpdateRequest extends FormRequest 'name' => sprintf('between:1,255|unique:transaction_currencies,name,%d', $currency->id), 'code' => sprintf('between:3,51|unique:transaction_currencies,code,%d', $currency->id), 'symbol' => sprintf('between:1,51|unique:transaction_currencies,symbol,%d', $currency->id), - 'decimal_places' => 'between:0,20|numeric|min:0|max:20', + 'decimal_places' => 'between:0,20|numeric|min:0|max:12', 'enabled' => [new IsBoolean()], 'default' => [new IsBoolean()], ]; diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php index 4d819b3740..cc9a4a0dcf 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php @@ -59,9 +59,9 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|unique:link_types,name|min:1', - 'outward' => 'required|unique:link_types,outward|min:1|different:inward', - 'inward' => 'required|unique:link_types,inward|min:1|different:outward', + 'name' => 'required|unique:link_types,name|min:1|max:1024', + 'outward' => 'required|unique:link_types,outward|min:1|different:inward|max:1024', + 'inward' => 'required|unique:link_types,inward|min:1|different:outward|max:1024', ]; } } diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php index d2ca921c43..b4b3866747 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php @@ -64,9 +64,9 @@ class UpdateRequest extends FormRequest $linkType = $this->route()->parameter('linkType'); return [ - 'name' => [Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1'], - 'outward' => ['different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1'], - 'inward' => ['different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1'], + 'name' => [Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1','max:1024'], + 'outward' => ['different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1','max:1024'], + 'inward' => ['different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1','max:1024'], ]; } } diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index 6a9a132641..2c5ea2818c 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -110,7 +110,7 @@ class AccountFormRequest extends FormRequest $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes'))); $rules = [ 'administration_id' => 'min:1|max:16777216|numeric', - 'name' => 'required|min:1|uniqueAccountForUser', + 'name' => 'required|max:1024|min:1|uniqueAccountForUser', 'opening_balance' => 'numeric|nullable|max:1000000000', 'opening_balance_date' => 'date|required_with:opening_balance|nullable', 'iban' => ['iban', 'nullable', new UniqueIban(null, $this->convertString('objectType'))], @@ -133,7 +133,7 @@ class AccountFormRequest extends FormRequest if (null !== $account) { // add rules: $rules['id'] = 'belongsToUser:accounts'; - $rules['name'] = 'required|min:1|uniqueAccountForUser:'.$account->id; + $rules['name'] = 'required|max:1024|min:1|uniqueAccountForUser:'.$account->id; $rules['iban'] = ['iban', 'nullable', new UniqueIban($account, $account->accountType->type)]; } diff --git a/app/Http/Requests/LinkTypeFormRequest.php b/app/Http/Requests/LinkTypeFormRequest.php index d8864ba15e..2705775ba7 100644 --- a/app/Http/Requests/LinkTypeFormRequest.php +++ b/app/Http/Requests/LinkTypeFormRequest.php @@ -43,7 +43,7 @@ class LinkTypeFormRequest extends FormRequest public function rules(): array { // fixed - $nameRule = 'required|min:1|unique:link_types,name'; + $nameRule = 'required|max:255|min:1|unique:link_types,name'; $idRule = ''; // get parameter link: @@ -51,14 +51,14 @@ class LinkTypeFormRequest extends FormRequest if (null !== $link) { $idRule = 'exists:link_types,id'; - $nameRule = 'required|min:1'; + $nameRule = 'required|max:255|min:1'; } return [ 'id' => $idRule, 'name' => $nameRule, - 'inward' => 'required|min:1|different:outward', - 'outward' => 'required|min:1|different:inward', + 'inward' => 'required|max:255|min:1|different:outward', + 'outward' => 'required|max:255|min:1|different:inward', ]; } } diff --git a/app/Http/Requests/PiggyBankUpdateRequest.php b/app/Http/Requests/PiggyBankUpdateRequest.php index 7df2c58629..4f7558689c 100644 --- a/app/Http/Requests/PiggyBankUpdateRequest.php +++ b/app/Http/Requests/PiggyBankUpdateRequest.php @@ -70,7 +70,7 @@ class PiggyBankUpdateRequest extends FormRequest 'targetamount' => 'nullable|numeric|max:1000000000', 'startdate' => 'date', 'targetdate' => 'date|nullable', - 'order' => 'integer|min:1', + 'order' => 'integer|max:65536|min:1', 'object_group' => 'min:0|max:255', ]; } diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 152f9da4d3..facf6ceb63 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -157,9 +157,9 @@ class RuleFormRequest extends FormRequest 'rule_group_id' => 'required|belongsToUser:rule_groups', 'trigger' => 'required|in:store-journal,update-journal', 'triggers.*.type' => 'required|in:'.implode(',', $validTriggers), - 'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|min:1|ruleTriggerValue', $contextTriggers), + 'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|max:1024|min:1|ruleTriggerValue', $contextTriggers), 'actions.*.type' => 'required|in:'.implode(',', $validActions), - 'actions.*.value' => sprintf('required_if:actions.*.type,%s|min:0|max:255|ruleActionValue', $contextActions), + 'actions.*.value' => sprintf('required_if:actions.*.type,%s|min:0|max:1024|ruleActionValue', $contextActions), 'strict' => 'in:0,1', ]; diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 04ca797bb7..9a4f82fdad 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -66,10 +66,10 @@ class TagFormRequest extends FormRequest /** @var Tag $tag */ $tag = $this->route()->parameter('tag'); - $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag'; + $tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag'; if (null !== $tag) { $idRule = 'belongsToUser:tags'; - $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,'.$tag->id; + $tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag,'.$tag->id; } $rules = [ diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php index f2afa826e5..261f64437f 100644 --- a/app/Http/Requests/TestRuleFormRequest.php +++ b/app/Http/Requests/TestRuleFormRequest.php @@ -49,8 +49,8 @@ class TestRuleFormRequest extends FormRequest $validTriggers = $this->getTriggers(); return [ - 'rule-trigger.*' => 'required|min:1|in:'.implode(',', $validTriggers), - 'rule-trigger-value.*' => 'required|min:1|ruleTriggerValue', + 'rule-trigger.*' => 'required|max:1024|min:1|in:'.implode(',', $validTriggers), + 'rule-trigger-value.*' => 'required|max:1024|min:1|ruleTriggerValue', ]; } }