Merge pull request #865 from pfrest/next_patch

Author: jaredhendrickson13

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

@@ -117,6 +117,19 @@ class CertificateRevocationListRevokedCertificate extends Model {
         }
     }
 
+    /**
+     * Adds extra processing when loading internal objects for this model. This is primarily used to catch any value
+     * that is not using the expected reason codes and convert them to a -1 (unspecified) reason code.
+     */
+    public function from_internal_object(mixed $internal_object): void {
+        # If the reason code is not a number, convert it to -1 (unspecified)
+        if (!is_numeric($internal_object['reason'])) {
+            $internal_object['reason'] = -1;
+        }
+
+        parent::from_internal_object($internal_object);
+    }
+
     /**
      * Applies the newly created CRL by reloading the OpenVPN and IPsec services.
      */

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

@@ -30,7 +30,7 @@ class Service extends Model {
             write_only: true,
             help_text: 'The action to perform against this service.',
         );
-        $this->name = new StringField(unique: true, read_only: true, help_text: 'The internal name of the service.');
+        $this->name = new StringField(required: true, unique: true, help_text: 'The internal name of the service.');
         $this->description = new StringField(read_only: true, help_text: 'The full descriptive name of the service.');
         $this->enabled = new BooleanField(
             read_only: true,
@@ -54,7 +54,15 @@ class Service extends Model {
      * @return array An array of available pfSense services and their current statuses.
      */
     public static function get_services(): array {
-        return get_services();
+        $services = get_services();
+
+        # For each service, determine if it's really enabled and running
+        foreach ($services as $key => $service) {
+            $services[$key]['enabled'] = is_service_enabled($service['name']);
+            $services[$key]['status'] = get_service_status($service);
+        }
+
+        return $services;
     }
 
     /**

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

@@ -130,4 +130,23 @@ class APIModelsCertificateRevocationListRevokedCertificateTestCase extends TestC
             },
         );
     }
+
+    /**
+     * Ensures revoked certificates with non-numeric reasons are converted to -1 (unspecified) when reading #864
+     */
+    public function test_non_numeric_reason_conversion(): void {
+        # Mock a revoked certificate with a non-numeric reason
+        Model::set_config("crl/{$this->crl->id}/cert/0", [
+            'certref' => $this->cert->refid->value,
+            'reason' => 'some-non-numeric-reason',
+            'revoke_time' => time(),
+        ]);
+
+        # Read the CRL and ensure the reason was converted to -1
+        $crl_revoked_cert = CertificateRevocationListRevokedCertificate::query(
+            parent_id: $this->crl->id,
+            id: 0,
+        )->first();
+        $this->assert_equals(-1, $crl_revoked_cert->reason->value);
+    }
 }