Merge pull request #358 from jaredhendrickson13/next_patch

v1.5.4 Fixes

Author: jaredhendrickson13

composer.json

@@ -1,5 +1,5 @@
 {
   "require": {
-    "firebase/php-jwt": "v6.3.*"
+    "firebase/php-jwt": "v6.7.*"
   }
 }

composer.lock

@@ -345,7 +345,7 @@ function sort_nat_rules($top=false, $data=null, $field=null) {
 
     foreach ($acl as $idx => $fre) {
         # Check if top mode is enabled, if so add this item to the start of the array
-        if ($top === true and $idx === $data) {
+        if ($top == true and $idx === $data) {
             array_unshift($sort_arr, $fre);
         } else {
             $sort_arr[] = $fre;

pfSense-pkg-API/files/etc/inc/api/framework/APITools.inc

@@ -31,7 +31,7 @@ class APISystemCARead extends APIModel {
 
     public function validate_payload() {
         if (!empty($this->config["ca"])) {
-            $this->validated_data["ca"] = $this->config["ca"];
+            $this->validated_data = $this->config["ca"];
         }
     }
 }

pfSense-pkg-API/files/etc/inc/api/models/APISystemCARead.inc

@@ -31,7 +31,7 @@ class APISystemCertificateRead extends APIModel {
 
     public function validate_payload() {
         if (!empty($this->config["cert"])) {
-            $this->validated_data["cert"] = $this->config["cert"];
+            $this->validated_data = $this->config["cert"];
         }
     }
 }

pfSense-pkg-API/files/etc/inc/api/models/APISystemCertificateRead.inc

@@ -9324,6 +9324,9 @@ paths:
 
                     _Note: If you are using a failover group, the failover group must be configured to use the same_.'
                   type: string
+                server_addr:
+                  description: Sets the server IP or hostname of the OpenVPN server this client will connect to.
+                  type: string
                 local_port:
                   description: For clients, the local port should be blank in nearly every case so that OpenVPN
                     will use a randomized local port. This behavior is more secure, but some server configurations
@@ -9791,6 +9794,9 @@ paths:
 
                     _Note: If you are using a failover group, the failover group must be configured to use the same_.'
                   type: string
+                server_addr:
+                  description: Sets the server IP or hostname of the OpenVPN server this client will connect to.
+                  type: string
                 local_port:
                   description: The port number upon which OpenVPN will listen for incoming connections from peers.
                     Firewall rules must allow traffic to this port and this port must be specified in the client configuration.

pfSense-pkg-API/files/usr/local/www/api/documentation/openapi.yml

@@ -1,4 +1,4 @@
 jinja2~=3.1.2
 requests~=2.28.1
-pylint~=2.15.4
+pylint~=2.17.2
 urllib3~=1.26.13