Merge pull request openwallet-foundation#4082 from jamshale/1.2.lts

chore: bump jsonpath-ng to 1.8.0 and fix full_path format

Author: PatStLouis

acapy_agent/protocols/present_proof/dif/pres_exch_handler.py

@@ -67,6 +67,9 @@
 PRESENTATION_SUBMISSION_JSONLD_TYPE = "PresentationSubmission"
 PYTZ_TIMEZONE_PATTERN = re.compile(r"(([a-zA-Z]+)(?:\/)([a-zA-Z]+))")
 LIST_INDEX_PATTERN = re.compile(r"\[(\W+)\]|\[(\d+)\]")
+# jsonpath-ng 1.8+ uses parentheses in str(full_path); normalize to "a.b.c"
+JSONPATH_FULL_PATH_PARENS = re.compile(r"[()]")
+
 LOGGER = logging.getLogger(__name__)
 
 
@@ -526,7 +529,9 @@ def reveal_doc(self, credential_dict: dict, constraints: Constraints):
                     if len(match) == 0:
                         continue
                     for match_item in match:
-                        full_path = str(match_item.full_path)
+                        full_path = JSONPATH_FULL_PATH_PARENS.sub(
+                            "", str(match_item.full_path)
+                        )
                         if bool(LIST_INDEX_PATTERN.search(full_path)):
                             full_path = re.sub(r"\[(\W+)\]|\[(\d+)\]", "[0]", full_path)
                             full_path = full_path.replace(".[", "[")
@@ -1582,7 +1587,7 @@ def update_path_recursive_call(path: str, level: int = 0):
             to_check = path_split_array[-1]
             if "." not in to_check:
                 return path
-            split_by_index = re.split(r"\[(\d+)\]", to_check, 1)
+            split_by_index = re.split(r"\[(\d+)\]", to_check, maxsplit=1)
             if len(split_by_index) > 1:
                 jsonpath = parse(split_by_index[0])
                 match = jsonpath.find(cred_dict)

poetry.lock

@@ -25,7 +25,7 @@ base58 = "~2.1.0"
 ConfigArgParse = "~1.7"
 deepmerge = "~0.3.0"
 ecdsa = "~0.19.0"
-jsonpath-ng = "1.7.0"
+jsonpath-ng = "1.8.0"
 Markdown = "~3.7"
 markupsafe = "2.1.5"
 marshmallow = "~3.25.1"