File TEST-improve-salt.utils.json.find_json.patch of Package venv-salt-minion

Overview Repositories Revisions Requests Users Attributes Meta

File TEST-improve-salt.utils.json.find_json.patch of Package venv-salt-minion (Revision 97eacde5d74d35e47f41fa41e964833a)

Currently displaying revision 97eacde5d74d35e47f41fa41e964833a , Show latest

commit c348437add2ccc7df04b8fa34fb9c2bb2ef7342b
Author: vzhestkov <vzhestkov@suse.com>
Date:   Tue Sep 12 16:04:09 2023 +0200

Improve salt.utils.json.find_json

diff --git a/salt/utils/json.py b/salt/utils/json.py
index 33cdbf401d..aeb138377e 100644
--- a/salt/utils/json.py
+++ b/salt/utils/json.py
@@ -32,18 +32,51 @@ def find_json(raw):
     """
     ret = {}
     lines = __split(raw)
+    lengths = list(map(len, lines))
+    starts = []
+    ends = []
+
+    # Search for possible starts end ends of the json fragments
     for ind, _ in enumerate(lines):
+        line = lines[ind].lstrip()
+        if line == "{" or line == "[":
+            starts.append((ind, line))
+        if line == "}" or line == "]":
+            ends.append((ind, line))
+
+    # List all the possible pairs of starts and ends,
+    # and fill the length of each block to sort by size after
+    stars_ends = []
+    for start, start_br in starts:
+        for end, end_br in reversed(ends):
+            if end > start and (
+                (start_br == "{" and end_br == "}")
+                or (start_br == "[" and end_br == "]")
+            ):
+                stars_ends.append((start, end, sum(lengths[start : end + 1])))
+
+    # Iterate through all the possible pairs starting from the largest
+    stars_ends.sort(key=lambda x: (x[2], x[1] - x[0], x[0]), reverse=True)
+    for start, end, _ in stars_ends:
+        working = "\n".join(lines[start : end + 1])
         try:
-            working = "\n".join(lines[ind:])
-        except UnicodeDecodeError:
-            working = "\n".join(salt.utils.data.decode(lines[ind:]))
+            ret = json.loads(working)
+        except ValueError:
+            continue
+        if ret:
+            return ret
 
+    # Fall back to old implementation for backward compatibility
+    # excpecting json after the text
+    for ind, _ in enumerate(lines):
+        working = "\n".join(lines[ind:])
         try:
             ret = json.loads(working)
         except ValueError:
             continue
         if ret:
             return ret
+
     if not ret:
         # Not json, raise an error
         raise ValueError

Places

File TEST-improve-salt.utils.json.find_json.patch of Package venv-salt-minion (Revision 97eacde5d74d35e47f41fa41e964833a)

Places