Skip to content

Commit bf9ef30

Browse files
fix: replace OpenVPNClientSpecificOverride remove_route field with remove_options
In pfSense 2.8.0. remove_route is replaced with a more general remove_options with additional push-remove options
1 parent 40f17dc commit bf9ef30

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/OpenVPNClientSpecificOverride.inc

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class OpenVPNClientSpecificOverride extends Model {
3030
public StringField $remote_networkv6;
3131
public BooleanField $gwredir;
3232
public BooleanField $push_reset;
33-
public BooleanField $remove_route;
33+
public StringField $remove_options;
3434
public StringField $dns_domain;
3535
public StringField $dns_server1;
3636
public StringField $dns_server2;
@@ -134,12 +134,25 @@ class OpenVPNClientSpecificOverride extends Model {
134134
indicates_false: '',
135135
help_text: 'Enables or disables preventing this client from receiving any server-defined client settings.',
136136
);
137-
$this->remove_route = new BooleanField(
138-
default: false,
139-
indicates_true: 'yes',
140-
indicates_false: '',
141-
help_text: 'Enables or disables preventing this client from receiving any server-defined routes ' .
142-
'without removing any other options.',
137+
$this->remove_options = new StringField(
138+
default: [],
139+
choices: [
140+
'remove_route',
141+
'remove_iroute',
142+
'remove_redirect_gateway',
143+
'remove_inactive',
144+
'remove_ping',
145+
'remove_ping_action',
146+
'remove_dnsdomain',
147+
'remove_dnsservers',
148+
'remove_blockoutsidedns',
149+
'remove_ntpservers',
150+
'remove_netbios_ntype',
151+
'remove_netbios_scope',
152+
'remove_wins',
153+
],
154+
many: true,
155+
help_text: 'Specifies the push-remove options to apply to the client',
143156
);
144157
$this->dns_domain = new StringField(
145158
default: '',

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Tests/APIModelsOpenVPNClientSpecificOverrideTestCase.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class APIModelsOpenVPNClientSpecificOverrideTestCase extends TestCase {
8585
remote_networkv6: ['1234::/64'],
8686
gwredir: true,
8787
push_reset: true,
88-
remove_route: true,
88+
remove_options: ['remove_route'],
8989
dns_domain: 'example.com',
9090
dns_server1: '127.0.0.1',
9191
dns_server2: '127.0.0.2',
@@ -138,7 +138,7 @@ class APIModelsOpenVPNClientSpecificOverrideTestCase extends TestCase {
138138
remote_networkv6: ['4321::/64'],
139139
gwredir: false,
140140
push_reset: false,
141-
remove_route: false,
141+
remove_options: [],
142142
dns_domain: 'updated.example.com',
143143
dns_server1: '127.0.1.1',
144144
dns_server2: '127.0.1.2',

0 commit comments

Comments
 (0)