mvc:JsonKeyValueStoreField - restore support for json input data with…

…out configd callout, closes #8180 partially reverts 525481c (cherry picked from commit e150a57)
opnsense · Jan 8, 2025 · b9ae3f9 · b9ae3f9
1 parent 18e492f
commit b9ae3f9
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/JsonKeyValueStoreField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/JsonKeyValueStoreField.php
@@ -123,17 +123,18 @@ public function setConfigdPopulateTTL($value)
     protected function actionPostLoadingEvent()
     {
         $data = null;
+        if ($this->internalSourceFile != null && $this->internalSourceField != null) {
+            $sourcefile = sprintf($this->internalSourceFile, $this->internalSourceField);
+        } else {
+            $sourcefile = $this->internalSourceFile;
+        }
+        $cachename = $sourcefile != null ? $sourcefile : $this->internalConfigdPopulateAct;
         if (!empty($this->internalConfigdPopulateAct)) {
-            if (isset(static::$internalStaticContent[$this->internalConfigdPopulateAct])) {
+            if (isset(static::$internalStaticContent[$cachename])) {
                 /* cached for the lifetime of this session */
-                $data = static::$internalStaticContent[$this->internalConfigdPopulateAct];
-            } elseif ($this->internalSourceFile != null) {
+                $data = static::$internalStaticContent[$cachename];
+            } elseif ($sourcefile != null) {
                 /* use a file cache for the configd call*/
-                if ($this->internalSourceField != null) {
-                    $sourcefile = sprintf($this->internalSourceFile, $this->internalSourceField);
-                } else {
-                    $sourcefile = $this->internalSourceFile;
-                }
                 if (is_file($sourcefile)) {
                     $sourcehandle = fopen($sourcefile, "r+");
                 } else {
@@ -166,12 +167,18 @@ protected function actionPostLoadingEvent()
                     true
                 );
             }
-            if ($data != null) {
-                static::$internalStaticContent[$this->internalConfigdPopulateAct] = $data;
-                $this->internalOptionList = $data;
-                if ($this->internalSelectAll && $this->internalValue == "") {
-                    $this->internalValue = implode(',', array_keys($this->internalOptionList));
-                }
+        } elseif ($sourcefile != null && is_file($sourcefile)) {
+            if (isset(static::$internalStaticContent[$cachename])) {
+                $data = static::$internalStaticContent[$cachename];
+            } else {
+                $data = json_decode(file_get_contents($sourcefile), true) ?? [];
+            }
+        }
+        if ($data != null) {
+            static::$internalStaticContent[$cachename] = $data;
+            $this->internalOptionList = $data;
+            if ($this->internalSelectAll && $this->internalValue == "") {
+                $this->internalValue = implode(',', array_keys($this->internalOptionList));
             }
         }
     }