Merge pull request #409 from jaredhendrickson13/next_patch

Author: jaredhendrickson13

composer.json

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

composer.lock

@@ -14,11 +14,6 @@
 //   limitations under the License.
 
 namespace APITools;
-require_once("firebase/php-jwt/src/JWT.php");
-require_once("firebase/php-jwt/src/ExpiredException.php");
-require_once("firebase/php-jwt/src/SignatureInvalidException.php");
-require_once("firebase/php-jwt/src/BeforeValidException.php");
-require_once("firebase/php-jwt/src/Key.php");
 require_once("config.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
@@ -34,6 +29,14 @@ require_once("openvpn.inc");
 require_once("certs.inc");
 require_once("pkg-utils.inc");
 require_once("firewall_virtual_ip.inc");
+require_once("firebase/php-jwt/src/JWT.php");
+require_once("firebase/php-jwt/src/JWK.php");
+require_once("firebase/php-jwt/src/Key.php");
+require_once("firebase/php-jwt/src/CachedKeySet.php");
+require_once("firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php");
+require_once("firebase/php-jwt/src/ExpiredException.php");
+require_once("firebase/php-jwt/src/SignatureInvalidException.php");
+require_once("firebase/php-jwt/src/BeforeValidException.php");
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 

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

@@ -27,8 +27,12 @@ class APISystemConfigUpdate extends APIModel {
     }
 
     public function action() {
+        global $config;
+
         # Simply replace the entire configuration with the data sent in the request
-        $this->set_config("", $this->initial_data);
+        # Note: this requires direct access to the $config since the new configuration access method introduced in
+        # pfSense 2.7+ do not allow the entire configuration to be replaced.
+        $config = $this->initial_data;
         $this->write_config();
         return APIResponse\get(0, $this->initial_data);
     }