From: DylanB95EST <dylan.byrne@est.tech>
Date: Mon, 24 May 2021 09:04:49 +0000 (+0100)
Subject: Adding Atomic Grouping to Discard backtracking once matched as part of Sonar Security... 
X-Git-Tag: 1.1.0~48
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=940d8e4a950d8ce8075a712d9dc3852de828e5b5;hp=150d3edb6f1d3609f62caf2bd7a997485049dc23;p=cps.git

Adding Atomic Grouping to Discard backtracking once matched as part of Sonar Security Hotspot Fix

Issue-ID: CPS-89

Commit-ID: b23ee774ae2a2305f1feea747931879588f9cada

Change-Id: I1f9d54246370b0c0bc8ec3d167eaed27ad58471b
Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
---

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java
index c8886689e..401667eaa 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java
@@ -65,9 +65,9 @@ public class CpsPathQuery {
 
     private static final String INDIVIDUAL_LEAF_DETAIL_PATTERN = ("\\s{1,9}and\\s{1,9}");
 
-    private static final Pattern LEAF_VALUE_PATTERN = Pattern.compile("@(\\S+?)=(.*+)");
+    private static final Pattern LEAF_VALUE_PATTERN = Pattern.compile("@(?>(\\S+?)=(.*))");
 
-    private static final Pattern ANCESTOR_AXIS_PATTERN = Pattern.compile("(\\S+)\\/ancestor::\\/?(\\S++)");
+    private static final Pattern ANCESTOR_AXIS_PATTERN = Pattern.compile("(?>(\\S+)\\/ancestor::\\/?(\\S+))");
 
     /**
      * Returns a cps path query.