Pattern Replacement Utility #494

Updating regex use to only inspect group 0 of matcher.

Extending tests to include single line with multiple entries.

Author: jeremiahjstacey

src/main/java/org/owasp/esapi/codecs/ref/EncodingPatternPreservation.java

@@ -58,12 +58,11 @@ public String captureAndReplaceMatches(String input) {
 		Matcher matcher = noEncodeContent.matcher(input);
 
 		while (matcher.find()) {
-			int groups = matcher.groupCount();
-			for (int x = 0; x < groups; x++) {
-				String replaceContent = matcher.group(x);
+			String replaceContent = matcher.group(0);
+			if (replaceContent != null) {
 				replacedContentList.add(replaceContent);
 				inputCpy = inputCpy.replaceFirst(noEncodeContent.pattern(), replacementMarker);
-			}
+			}			
 		}
 
 		return inputCpy;

src/test/java/org/owasp/esapi/codecs/ref/EncodingPatternPreservationTest.java

@@ -21,6 +21,19 @@ public void testReplaceAndRestore() {
 		assertEquals(origStr, restored);
 	}
 
+	@Test
+	public void testReplaceMultipleAndRestore() {
+		Pattern numberRegex = Pattern.compile("(ABC)");
+		EncodingPatternPreservation epp = new EncodingPatternPreservation(numberRegex);
+		String origStr = "12 ABC 34 ABC 56 G 7 ABC8";
+		String replacedStr = epp.captureAndReplaceMatches(origStr);
+		
+		assertEquals("12 EncodingPatternPreservation 34 EncodingPatternPreservation 56 G 7 EncodingPatternPreservation8", replacedStr);
+		
+		String restored = epp.restoreOriginalContent(replacedStr);
+		assertEquals(origStr, restored);
+	}
+	
 	@Test
 	public void testSetMarker() {
 		Pattern numberRegex = Pattern.compile("(ABC)");