Skip to content
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

Fixed adding a gateway with a dynamic address to Firewall Rules. Added tag field to Firewall Rules #636

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Fixed adding a gateway with a dynamic address to Firewall Rules. Added tag field to Firewall Rules #636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab31c82
Update FirewallRule.inc
AlexTrushkovsky Jan 7, 2025
c0f380d
added allow_empty to tag
AlexTrushkovsky Jan 8, 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
8 changes: 7 additions & 1 deletion pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/FirewallRule.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class FirewallRule extends Model {
public StringField $descr;
public BooleanField $disabled;
public BooleanField $log;
public StringField $tag;
public StringField $statetype;
public BooleanField $tcp_flags_any;
public StringField $tcp_flags_out_of;
Expand Down Expand Up @@ -171,6 +172,11 @@ class FirewallRule extends Model {
default: false,
help_text: 'Enable or disable logging of traffic that matches this rule.',
);
$this->tag = new StringField(
default: '',
allow_empty: true,
help_text: 'A packet matching this rule can be marked and this mark used to match on other NAT/filter rules. It is called ',
);
$this->statetype = new StringField(
default: 'keep state',
choices: ['keep state', 'sloppy state', 'synproxy state', 'none'],
Expand Down Expand Up @@ -200,7 +206,7 @@ class FirewallRule extends Model {
help_text: 'The TCP flags that must be set for this rule to match.',
);
$this->gateway = new ForeignModelField(
model_name: ['RoutingGateway', 'RoutingGatewayGroup'],
model_name: ['RoutingGateway', 'RoutingGatewayGroup', 'RoutingGatewayStatus'],
model_field: 'name',
default: null,
allow_null: true,
Expand Down