openapi3: fix regex replacing \u literals (#918)

getkin · Mar 5, 2024 · 7aa9f7e · 7aa9f7e
1 parent 672dc32
commit 7aa9f7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/openapi3/schema_pattern.go b/openapi3/schema_pattern.go
@@ -5,11 +5,11 @@ import (
 	"regexp"
 )
 
-var patRewriteCodepoints = regexp.MustCompile(`[\][u]([0-9A-F]{4})`)
+var patRewriteCodepoints = regexp.MustCompile(`(?P<replaced_with_slash_x>\\u)(?P<code>[0-9A-F]{4})`)
 
 // See https://pkg.go.dev/regexp/syntax
 func intoGoRegexp(re string) string {
-	return patRewriteCodepoints.ReplaceAllString(re, `x{$1}`)
+	return patRewriteCodepoints.ReplaceAllString(re, `\x{${code}}`)
 }
 
 // NOTE: racey WRT [writes to schema.Pattern] vs [reads schema.Pattern then writes to compiledPatterns]

diff --git a/openapi3/schema_pattern_test.go b/openapi3/schema_pattern_test.go
@@ -15,4 +15,5 @@ func TestPattern(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Equal(t, `^[a-zA-Z\x{0080}-\x{024F}]+$`, intoGoRegexp(`^[a-zA-Z\u0080-\u024F]+$`))
+	require.Equal(t, `^[6789a-zA-Z\x{0080}-\x{024F}]+$`, intoGoRegexp(`^[6789a-zA-Z\u0080-\u024F]+$`))
 }