motiejus
/
jgit
1
Fork 0
Code Releases Activity

Added characters to be escaped in file name patterns 

Originally, characters could not be escaped in FileNameMatcher patterns.
This breaks file name matching when escaped brackets "\[" and "\]" are
used in the pattern. A fix has been implemented to allow for any
character to be escaped by prepending it with a '\'

Bug: 340715
Change-Id: Ie46fd211931fa09ef3a6a712bd1da3d7fb64c5e3
Signed-off-by: Gustav Karlsson <gustav.karlsson@tieto.com>
This commit is contained in:
Gustav Karlsson 2013-03-29 00:07:49 +01:00
parent 5d446f410d
commit b3e9626743
2 changed files with 84 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
org.eclipse.jgit.test/tst/org/eclipse/jgit/fnmatch/FileNameMatcherTest.java
View File

@ -801,6 +801,46 @@ public void testUnsupportedGroupCase1() throws Exception {
}
}
@Test
public void testEscapedBracket1() throws Exception {
assertMatch("\\[", "[", true, false);
}
@Test
public void testEscapedBracket2() throws Exception {
assertMatch("\\[[a]", "[", false, true);
}
@Test
public void testEscapedBracket3() throws Exception {
assertMatch("\\[[a]", "a", false, false);
}
@Test
public void testEscapedBracket4() throws Exception {
assertMatch("\\[[a]", "[a", true, false);
}
@Test
public void testEscapedBracket5() throws Exception {
assertMatch("[a\\]]", "]", true, false);
}
@Test
public void testEscapedBracket6() throws Exception {
assertMatch("[a\\]]", "a", true, false);
}
@Test
public void testEscapedBackslash() throws Exception {
assertMatch("a\\\\b", "a\\b", true, false);
}
@Test
public void testMultipleEscapedCharacters1() throws Exception {
assertMatch("\\]a?c\\*\\[d\\?\\]", "]abc*[d?]", true, false);
}
@Test
public void testFilePathSimpleCase() throws Exception {
assertFileNameMatch("a/b", "a/b", '/', true, false);

28
org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/FileNameMatcher.java
View File

@ -81,6 +81,7 @@
* e. g. [[:xdigit:]]</li>
* </ul>
* </p>
* Any character can be escaped by prepending it with a \
*/
public class FileNameMatcher {
static final List<Head> EMPTY_HEAD_LIST = Collections.emptyList();
@ -199,7 +200,7 @@ private static int findGroupEnd(final int indexOfStartBracket,
int groupEnd = -1;
while (groupEnd == -1) {
final int possibleGroupEnd = pattern.indexOf(']',
final int possibleGroupEnd = indexOfUnescaped(pattern, ']',
firstValidEndBracketIndex);
if (possibleGroupEnd == -1)
throw new NoClosingBracketException(indexOfStartBracket, "[", //$NON-NLS-1$
@ -238,7 +239,7 @@ private static List<AbstractHead> parseHeads(final String pattern,
int currentIndex = 0;
List<AbstractHead> heads = new ArrayList<AbstractHead>();
while (currentIndex < pattern.length()) {
final int groupStart = pattern.indexOf('[', currentIndex);
final int groupStart = indexOfUnescaped(pattern, '[', currentIndex);
if (groupStart == -1) {
final String patternPart = pattern.substring(currentIndex);
heads.addAll(createSimpleHeads(patternPart,
@ -264,8 +265,15 @@ private static List<AbstractHead> createSimpleHeads(
final String patternPart, final Character invalidWildgetCharacter) {
final List<AbstractHead> heads = new ArrayList<AbstractHead>(
patternPart.length());
boolean escaped = false;
for (int i = 0; i < patternPart.length(); i++) {
final char c = patternPart.charAt(i);
if (escaped) {
final CharacterHead head = new CharacterHead(c);
heads.add(head);
escaped = false;
} else {
switch (c) {
case '*': {
final AbstractHead head = createWildCardHead(
@ -279,11 +287,15 @@ private static List<AbstractHead> createSimpleHeads(
heads.add(head);
break;
}
case '\\':
escaped = true;
break;
default:
final CharacterHead head = new CharacterHead(c);
heads.add(head);
}
}
}
return heads;
}
@ -317,6 +329,18 @@ private void extendStringToMatchByOneCharacter(final char c) {
heads = newHeads;
}
private static int indexOfUnescaped(final String searchString,
final char ch, final int fromIndex) {
for (int i = fromIndex; i < searchString.length(); i++) {
char current = searchString.charAt(i);
if (current == ch)
return i;
if (current == '\\')
i++; // Skip the next char as it is escaped }
}
return -1;
}
/**
*
* @param stringToMatch