Skip to content

Add dscp field to FirewallRule model #919

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

Open
scottmsilver wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −0
Open

Add dscp field to FirewallRule model #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions 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 @@ -191,6 +191,13 @@ class FirewallRule extends Model {
verbose_name: 'Log',
help_text: 'Enable or disable logging of traffic that matches this rule.',
);
$this->dscp = new StringField(
default: '',
choices: ['af11', 'af12', 'af13', 'af21', 'af22', 'af23', 'af31', 'af32', 'af33', 'af41', 'af42', 'af43', 'VA', 'EF', 'cs1', 'cs2', 'cs3', 'cs4', 'cs5', 'cs6', 'cs7', '0x01', '0x02', '0x04'],
allow_empty: true,
verbose_name: 'DSCP',
help_text: 'The DSCP value this firewall rule should match.',
);
$this->tag = new StringField(
default: '',
allow_empty: true,
Expand Down
27 changes: 27 additions & 0 deletions pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Tests/APIModelsFirewallRuleTestCase.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,33 @@ class APIModelsFirewallRuleTestCase extends TestCase {
$rule->delete(apply: true);
}

/**
* Checks that the `dscp` field is properly set in the pfctl rule
*/
public function test_dscp() {
# Create a firewall rule to test with
$rule = new FirewallRule(
data: [
'type' => 'pass',
'interface' => ['lan'],
'ipprotocol' => 'inet',
'protocol' => 'tcp',
'source' => 'any',
'destination' => 'any',
'dscp' => 'af11',
],
async: false,
);
$rule->create(apply: true);

# Ensure the pfctl rule with this rule object's tracker matches the requested DSCP value
$pfctl_rules = file_get_contents('/tmp/rules.debug');
$this->assert_str_contains($pfctl_rules, "tos af11 ridentifier {$rule->tracker->value}");

# Delete the firewall rule
$rule->delete(apply: true);
}

/**
* Checks that firewall rules with `log` enabled have the log flag set in pfctl
*/
Expand Down