fix!: change BINDZone refresh, retry, expire and minimum fields to StringFields #653

Author: jaredhendrickson13

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

@@ -35,10 +35,10 @@ class BINDZone extends Model {
     public StringField $nameserver;
     public StringField $mail;
     public IntegerField $serial;
-    public IntegerField $refresh;
-    public IntegerField $retry;
-    public IntegerField $expire;
-    public IntegerField $minimum;
+    public StringField $refresh;
+    public StringField $retry;
+    public StringField $expire;
+    public StringField $minimum;
     public BooleanField $enable_updatepolicy;
     public StringField $updatepolicy;
     public ForeignModelField $allowupdate;
@@ -161,30 +161,34 @@ class BINDZone extends Model {
             conditions: ['type' => ['master', 'redirect']],
             help_text: 'The SOA serial number for this zone.',
         );
-        $this->refresh = new IntegerField(
+        $this->refresh = new StringField(
             default: null,
             allow_null: true,
             conditions: ['type' => ['master', 'redirect']],
-            help_text: 'The SOA refresh interval (in seconds) for this zone.',
+            help_text: 'The SOA refresh interval for this zone. TTL-style time-unit suffixes are ' .
+                'supported (e.g. 1h, 1d, 1w), otherwise time in seconds is assumed.',
         );
-        $this->retry = new IntegerField(
+        $this->retry = new StringField(
             default: null,
             allow_null: true,
             conditions: ['type' => ['master', 'redirect']],
-            help_text: 'The SOA retry interval (in seconds) for this zone.',
+            help_text: 'The SOA retry interval for this zone. TTL-style time-unit suffixes are ' .
+                'supported (e.g. 1h, 1d, 1w), otherwise time in seconds is assumed.',
         );
-        $this->expire = new IntegerField(
+        $this->expire = new StringField(
             default: null,
             allow_null: true,
             conditions: ['type' => ['master', 'redirect']],
-            help_text: 'The SOA expiry interval (in seconds) for this zone.',
+            help_text: 'The SOA expiry interval for this zone. TTL-style time-unit suffixes are ' .
+                'supported (e.g. 1h, 1d, 1w), otherwise time in seconds is assumed.',
         );
-        $this->minimum = new IntegerField(
+        $this->minimum = new StringField(
             default: null,
             allow_null: true,
             conditions: ['type' => ['master', 'redirect']],
             help_text: 'The SOA minimum TTL interval (in seconds) for this zone. This is also referred to as the ' .
-                'negative TTL.',
+                'negative TTL. TTL-style time-unit suffixes are supported (e.g. 1h, 1d, 1w), otherwise time in ' .
+                'seconds is assumed.',
         );
         $this->enable_updatepolicy = new BooleanField(
             default: false,

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

@@ -49,10 +49,10 @@ class APIModelsBINDZoneTestCase extends TestCase {
             nameserver: 'ns1.example.com',
             mail: 'admin.example.com',
             serial: 123456,
-            refresh: 3605,
-            retry: 605,
-            expire: 86405,
-            minimum: 2605,
+            refresh: '3605',
+            retry: '605',
+            expire: '86405',
+            minimum: '2605',
             records: [
                 ['name' => 'a.example.com.', 'type' => 'A', 'rdata' => '4.3.2.1'],
                 ['name' => 'mx.example.com.', 'type' => 'MX', 'rdata' => 'mail.example.com.', 'priority' => 5],
@@ -92,10 +92,10 @@ class APIModelsBINDZoneTestCase extends TestCase {
         $zone->nameserver->value = 'ns2.example.com';
         $zone->mail->value = 'admin2.example.com';
         $zone->serial->value = 654321;
-        $zone->refresh->value = 3606;
-        $zone->retry->value = 606;
-        $zone->expire->value = 86406;
-        $zone->minimum->value = 2606;
+        $zone->refresh->value = '3606';
+        $zone->retry->value = '606';
+        $zone->expire->value = '86406';
+        $zone->minimum->value = '2606';
         $zone->records->value = [
             ['name' => 'a2.example.com.', 'type' => 'A', 'rdata' => '5.5.5.5'],
             ['name' => 'mx2.example.com.', 'type' => 'MX', 'rdata' => 'mail2.example.com.', 'priority' => 15],