Skip more validation

doublestar_test.go

@@ -281,6 +281,29 @@ func TestMatchUnvalidated(t *testing.T) {
 	for idx, tt := range matchTests {
 		testMatchUnvalidatedWith(t, idx, tt)
 	}
+
+	// Not only test that they get the right matches, but make sure Unvalidated is properly *skipping* validation
+	unvalidatedTests := []struct {
+		pattern, testPath      string // a pattern and path to test the pattern on
+		expectedErrValidated   error  // the error expected if the pattern was being validated
+		expectedErrUnvalidated error  // the error expected if the pattern was not being validated
+	}{
+		{"", "", nil, nil},
+		{"*", "", nil, nil},
+		{"a[", "a", ErrBadPattern, nil},          // End early because got to end of match; do not need to validate the rest
+		{"a[", "b", ErrBadPattern, nil},          // End early because failed to match; do not need to validate the rest
+		{"[", "a", ErrBadPattern, ErrBadPattern}, // Error right up front, needs to fail whether validate or not
+	}
+	for idx, tt := range unvalidatedTests {
+		_, errValidated := matchWithSeparator(tt.pattern, tt.testPath, '/', true)
+		_, errUnvalidated := matchWithSeparator(tt.pattern, tt.testPath, '/', false)
+		if errValidated != tt.expectedErrValidated {
+			t.Errorf("#%v. Validated error of Match(%#q, %#q) = %v want %v", idx, tt.pattern, tt.testPath, errValidated, tt.expectedErrValidated)
+		}
+		if errUnvalidated != tt.expectedErrUnvalidated {
+			t.Errorf("#%v. Unvalidated error of Match(%#q, %#q) = %v want %v", idx, tt.pattern, tt.testPath, errUnvalidated, tt.expectedErrUnvalidated)
+		}
+	}
 }
 
 func testMatchUnvalidatedWith(t *testing.T, idx int, tt MatchTest) {

match.go

@@ -319,10 +319,10 @@ MATCH:
 	// we've reached the end of `name`; we've successfully matched if we've also
 	// reached the end of `pattern`, or if the rest of `pattern` can match a
 	// zero-length string
-	return isZeroLengthPattern(pattern[patIdx:], separator)
+	return isZeroLengthPattern(pattern[patIdx:], separator, validate)
 }
 
-func isZeroLengthPattern(pattern string, separator rune) (ret bool, err error) {
+func isZeroLengthPattern(pattern string, separator rune, validate bool) (ret bool, err error) {
 	// `/**`, `**/`, and `/**/` are special cases - a pattern such as `path/to/a/**` or `path/to/a/**/`
 	// *should* match `path/to/a` because `a` might be a directory
 	if pattern == "" ||
@@ -350,18 +350,18 @@ func isZeroLengthPattern(pattern string, separator rune) (ret bool, err error) {
 			}
 			commaIdx += patIdx
 
-			ret, err = isZeroLengthPattern(pattern[patIdx:commaIdx]+pattern[closingIdx+1:], separator)
+			ret, err = isZeroLengthPattern(pattern[patIdx:commaIdx]+pattern[closingIdx+1:], separator, validate)
 			if ret || err != nil {
 				return
 			}
 
 			patIdx = commaIdx + 1
 		}
-		return isZeroLengthPattern(pattern[patIdx:closingIdx]+pattern[closingIdx+1:], separator)
+		return isZeroLengthPattern(pattern[patIdx:closingIdx]+pattern[closingIdx+1:], separator, validate)
 	}
 
 	// no luck - validate the rest of the pattern
-	if !doValidatePattern(pattern, separator) {
+	if validate && !doValidatePattern(pattern, separator) {
 		return false, ErrBadPattern
 	}
 	return false, nil