Merge pull request #489 from jaredhendrickson13/next_patch

fix: restrict upgrade path to v1 releases only

Author: jaredhendrickson13

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

@@ -107,7 +107,7 @@ class APISystemAPIVersionRead extends APIModel {
             if ($release["prerelease"] === false or isset($pkg_config["allow_pre_release"])) {
                 # Loop through the assets of each release and check if our version of pfSense is supported
                 foreach ($release["assets"] as $asset) {
-                    if (str_starts_with($asset["name"], "pfSense-" . $pf_version)) {
+                    if ($asset["name"] === "pfSense-$pf_version-pkg-API.pkg") {
                         # The first item of our list is the latest release, mark it as such.
                         if ($count === 0) {
                             $versions[$release["tag_name"]] = $release["name"] . " - Latest";

pfSense-pkg-API/files/usr/local/share/pfSense-pkg-API/manage.php

@@ -14,6 +14,7 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 require_once("api/framework/APITools.inc");
+require_once("api/models/APISystemAPIVersionRead.inc");
 
 function build_endpoints() {
     # Import each endpoint class
@@ -84,8 +85,9 @@ function sync() {
 
 function update() {
     $pf_version = APITools\get_pfsense_version()["base"];
+    $latest_version = APISystemAPIVersionRead::get_latest_api_version();
     echo shell_exec("/usr/sbin/pkg delete -y pfSense-pkg-API");
-    echo shell_exec("/usr/sbin/pkg -C /dev/null add https://github.com/jaredhendrickson13/pfsense-api/releases/latest/download/pfSense-".$pf_version."-pkg-API.pkg");
+    echo shell_exec("/usr/sbin/pkg -C /dev/null add https://github.com/jaredhendrickson13/pfsense-api/releases/download/$latest_version/pfSense-".$pf_version."-pkg-API.pkg");
     echo shell_exec("/etc/rc.restart_webgui");
 }