Skip to content

Commit 2a261e5

Browse files
author
Jared Hendrickson
committed
Updated response codes to accomodate new response code in patch
1 parent 696a187 commit 2a261e5

3 files changed

Lines changed: 27 additions & 21 deletions

File tree

‎pfSense-pkg-API/files/etc/inc/api/framework/APIResponse.inc‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -832,51 +832,57 @@ function get($id, $data=[], $all=false) {
832832
"status" => "bad request",
833833
"code" => 400,
834834
"return" => $id,
835-
"message" => "Interface ID is required"
835+
"message" => "Interface VLAN ID required"
836836
],
837837
3057 => [
838838
"status" => "bad request",
839839
"code" => 400,
840840
"return" => $id,
841-
"message" => "Interface ID does not exist"
841+
"message" => "Interface ID is required"
842842
],
843843
3058 => [
844844
"status" => "bad request",
845845
"code" => 400,
846846
"return" => $id,
847-
"message" => "Interface descriptive name cannot start with 'pkg_'"
847+
"message" => "Interface ID does not exist"
848848
],
849849
3059 => [
850850
"status" => "bad request",
851851
"code" => 400,
852852
"return" => $id,
853-
"message" => "Interface descriptive name cannot match alias name"
853+
"message" => "Interface descriptive name cannot start with 'pkg_'"
854854
],
855855
3060 => [
856856
"status" => "bad request",
857857
"code" => 400,
858858
"return" => $id,
859-
"message" => "Interface descriptive name cannot be entirely numeric"
859+
"message" => "Interface descriptive name cannot match alias name"
860860
],
861861
3061 => [
862862
"status" => "bad request",
863863
"code" => 400,
864864
"return" => $id,
865-
"message" => "Interface descriptive name cannot match interface group name"
865+
"message" => "Interface descriptive name cannot be entirely numeric"
866866
],
867867
3062 => [
868868
"status" => "bad request",
869869
"code" => 400,
870870
"return" => $id,
871-
"message" => "Interface type cannot be changed while DHCP server is enabled"
871+
"message" => "Interface descriptive name cannot match existing interface name"
872872
],
873873
3063 => [
874874
"status" => "bad request",
875875
"code" => 400,
876876
"return" => $id,
877-
"message" => "Interface subnet must be less than 31 while DHCP server is enabled"
877+
"message" => "Interface type cannot be changed while DHCP server is enabled"
878878
],
879879
3064 => [
880+
"status" => "bad request",
881+
"code" => 400,
882+
"return" => $id,
883+
"message" => "Interface subnet must be less than 31 while DHCP server is enabled"
884+
],
885+
3065 => [
880886
"status" => "bad request",
881887
"code" => 400,
882888
"return" => $id,

‎pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceCreate.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,19 @@ class APIInterfaceCreate extends APIModel {
132132
$this->initial_data["descr"] = APITools\sanitize_str($this->initial_data["descr"]);
133133
# Ensure this interface description does not contain reserved keywords
134134
if (substr($this->initial_data['descr'], 0, 4) === "pkg_") {
135-
$this->errors[] = APIResponse\get(3058);
135+
$this->errors[] = APIResponse\get(3059);
136136
}
137137
# Ensure this interface is not named the same as an alias
138138
elseif (APITools\is_alias($this->initial_data["descr"])) {
139-
$this->errors[] = APIResponse\get(3059);
139+
$this->errors[] = APIResponse\get(3060);
140140
}
141141
# Ensure this interface is name named entirely numerical
142142
elseif (is_numeric($this->initial_data["descr"])) {
143-
$this->errors[] = APIResponse\get(3060);
143+
$this->errors[] = APIResponse\get(3061);
144144
}
145145
# Ensure this interface is not named the same as an interface group
146146
elseif (APITools\is_ifgroup($this->initial_data["descr"])) {
147-
$this->errors[] = APIResponse\get(3061);
147+
$this->errors[] = APIResponse\get(3062);
148148
}
149149
# Ensure this interface description is not already used
150150
elseif (APITools\get_pfsense_if_id($this->initial_data["descr"])) {

‎pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceUpdate.inc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ class APIInterfaceUpdate extends APIModel {
4444
if ($this->id) {
4545
$this->validated_data = $this->config["interfaces"][$this->id];
4646
} else {
47-
$this->errors[] = APIResponse\get(3057);
47+
$this->errors[] = APIResponse\get(3058);
4848
}
4949
} else {
50-
$this->errors[] = APIResponse\get(3056);
50+
$this->errors[] = APIResponse\get(3057);
5151
}
5252
}
5353

@@ -146,19 +146,19 @@ class APIInterfaceUpdate extends APIModel {
146146
$this->initial_data["descr"] = APITools\sanitize_str($this->initial_data["descr"]);
147147
# Ensure this interface description does not contain reserved pkg keywords
148148
if (substr($this->initial_data['descr'], 0, 4) === "pkg_") {
149-
$this->errors[] = APIResponse\get(3058);
149+
$this->errors[] = APIResponse\get(3059);
150150
}
151151
# Ensure this interface is not named the same as an alias
152152
elseif (APITools\is_alias($this->initial_data["descr"])) {
153-
$this->errors[] = APIResponse\get(3059);
153+
$this->errors[] = APIResponse\get(3060);
154154
}
155155
# Ensure this interface is not named entirely numerical
156156
elseif (is_numeric($this->initial_data["descr"])) {
157-
$this->errors[] = APIResponse\get(3060);
157+
$this->errors[] = APIResponse\get(3061);
158158
}
159159
# Ensure this interface is not named the same as an interface group
160160
elseif (APITools\is_ifgroup($this->initial_data["descr"])) {
161-
$this->errors[] = APIResponse\get(3061);
161+
$this->errors[] = APIResponse\get(3062);
162162
}
163163
# Ensure this interface description is not already used
164164
elseif (APITools\get_pfsense_if_id($this->initial_data["descr"])) {
@@ -235,7 +235,7 @@ class APIInterfaceUpdate extends APIModel {
235235
}
236236
# Check if DHCP server is enabled for this interface, if so do not allow /32
237237
elseif(APITools\is_dhcpd_enabled($this->id) and intval($this->initial_data["subnet"]) >= 31) {
238-
$this->errors[] = APIResponse\get(3063);
238+
$this->errors[] = APIResponse\get(3064);
239239
}
240240
# Otherwise, this subnet appears to be valid. Update the value.
241241
else {
@@ -429,7 +429,7 @@ class APIInterfaceUpdate extends APIModel {
429429
private function __validate_type_dhcp() {
430430
# Before configuring for DHCP, ensure the DHCP server is not enabled
431431
if (APITools\is_dhcpd_enabled($this->id)) {
432-
$this->errors[] = APIResponse\get(3062);
432+
$this->errors[] = APIResponse\get(3063);
433433
}
434434

435435
$this->validated_data["ipaddr"] = "dhcp";
@@ -445,7 +445,7 @@ class APIInterfaceUpdate extends APIModel {
445445
private function __validate_type6_change() {
446446
# Before configuring for non-static type6, ensure DHCPv6 is not enabled
447447
if (APITools\is_dhcpdv6_enabled($this->id)) {
448-
$this->errors[] = APIResponse\get(3064);
448+
$this->errors[] = APIResponse\get(3065);
449449
}
450450
}
451451

0 commit comments

Comments
 (0)