fix(read): sanitize unescaped C0 control chars before typed decode in getInto (#525) - #526
Open
xsvm wants to merge 1 commit into
Open
fix(read): sanitize unescaped C0 control chars before typed decode in getInto (#525)#526xsvm wants to merge 1 commit into
xsvm wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #525
Context
PR #165 added
escapeJSONStringControlCharsinemitJSONto ensure--jsonoutput can always be parsed byjq. However,client.getInto()runsjson.Unmarshal(raw, out)on the unescaped wire bytes beforeemitJSONis reached.When an API response carries raw C0 control characters in string literals (e.g. literal
\rinside a prompt), Go's strictencoding/jsondecoder fails immediately:and the command aborts before
emitJSONis entered (as noted ininternal/cmd/read_help.go:57).Fix
escapeJSONStringControlCharsdown intopkg/civitai/read.goand exported it asEscapeJSONStringControlChars.getInto, if!json.Valid(raw), attempt sanitization viaEscapeJSONStringControlCharsbefore attemptingjson.Unmarshal(raw, out).internal/cmd/read.go'sescapeJSONStringControlCharswith a one-line delegation tocivitai.EscapeJSONStringControlChars.TestGetIntoSanitizesRawControlCharsinpkg/civitai/read_test.goasserting a payload with a literal carriage return decodes cleanly.Tests
TestGetIntoSanitizesRawControlChars(PASS)TestEscapeJSONStringControlCharsLeavesStructuralWhitespace(PASS)TestEmitJSONEscapesRawControlChars(PASS)TestEmitJSONEscapesAllC0ControlChars(PASS)TestEmitJSONValidInputUnchanged(PASS)gofmt -s -l .clean,go vetclean.