Skip to content

v2.5.4 Fixes #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaredhendrickson13 merged 2 commits into from
Sep 4, 2025
Merged

v2.5.4 Fixes #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37cb3b8
fix(LengthValidator): don't validate maximum if no maximum is given
jaredhendrickson13 Sep 4, 2025
c2834dd
fix(FirewallAlias): do not use default many_maximum constraint for 'a…
jaredhendrickson13 Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/FirewallAlias.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class FirewallAlias extends Model {
default: [],
allow_empty: true,
many: true,
many_maximum: 0, // Do not enforce a maximum number of entries
delimiter: ' ',
help_text: "Sets the host, network or port entries for the alias. When `type` is set to `host`, each
entry must be a valid IP address or FQDN. When `type` is set to `network`, each entry must be a valid
Expand All @@ -59,6 +60,7 @@ class FirewallAlias extends Model {
default: [],
allow_empty: true,
many: true,
many_maximum: 0, // Do not enforce a maximum number of entries
delimiter: '||',
help_text: "Sets descriptions for each alias `address`. Values must match the order of the `address`
value it relates to. For example, the first value specified here is the description for the first
Expand Down
4 changes: 2 additions & 2 deletions pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Validators/LengthValidator.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LengthValidator extends RESTAPI\Core\Validator {
);
}
# Throw an error if the string contains more characters than the specified maximum
if (strlen($value) > $this->maximum) {
if ($this->maximum and strlen($value) > $this->maximum) {
throw new ValidationError(
message: "Field '$field_name' exceeds the maximum character length of $this->maximum.",
response_id: 'LENGTH_VALIDATOR_MAXIMUM_CONSTRAINT',
Expand All @@ -61,7 +61,7 @@ class LengthValidator extends RESTAPI\Core\Validator {
);
}
# Throw an error if the array contains more array entries than the specified maximum
if (count($value) > $this->maximum) {
if ($this->maximum and count($value) > $this->maximum) {
throw new ValidationError(
message: "Field '$field_name' exceeds the maximum array length of $this->maximum.",
response_id: 'LENGTH_VALIDATOR_MAXIMUM_CONSTRAINT',
Expand Down