Skip to content

fix(generator): escape discriminator JSON names instead of allowlist filtering #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erraggy merged 2 commits into from
Feb 21, 2026
Merged

fix(generator): escape discriminator JSON names instead of allowlist filtering #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1edf72
fix(generator): escape discriminator JSON names instead of allowlist …
erraggy Feb 21, 2026
0f5212d
fix(generator): remove pre-escaping, rely on template quote pipe
erraggy Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions generator/template_builders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,15 +444,7 @@ func (cg *oas3CodeGenerator) buildOneOfTypeDefinition(typeName, originalName str
if schema.Discriminator != nil && schema.Discriminator.PropertyName != "" {
oneOfData.Discriminator = schema.Discriminator.PropertyName
oneOfData.DiscriminatorField = toFieldName(schema.Discriminator.PropertyName)
// Sanitize the discriminator property name to prevent injection in generated code.
// Only allow alphanumeric, underscore, hyphen, and dot — safe for JSON struct tags.
jsonName := strings.Map(func(r rune) rune {
if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '_' || r == '-' || r == '.' {
return r
}
return -1 // drop unsafe characters
}, schema.Discriminator.PropertyName)
oneOfData.DiscriminatorJSONName = jsonName
oneOfData.DiscriminatorJSONName = schema.Discriminator.PropertyName
oneOfData.HasUnmarshal = true

// Build unmarshal cases from discriminator mapping
Expand Down
2 changes: 1 addition & 1 deletion generator/templates/types/unmarshal.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// UnmarshalJSON implements json.Unmarshaler for {{.TypeName}}.
func (u *{{.TypeName}}) UnmarshalJSON(data []byte) error {
var disc struct {
{{.DiscriminatorField}} string `json:"{{.DiscriminatorJSONName}}"`
{{.DiscriminatorField}} string `json:{{.DiscriminatorJSONName | quote}}`
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
if err := json.Unmarshal(data, &disc); err != nil {
return err
Expand Down