deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

event/cmdschema: adjust handling of unterminated quotes
Some checks are pending
Go / Lint (latest) (push) Waiting to run
Details
Go / Build (old, libolm) (push) Waiting to run
Details
Go / Build (latest, libolm) (push) Waiting to run
Details
Go / Build (old, goolm) (push) Waiting to run
Details
Go / Build (latest, goolm) (push) Waiting to run
Details

Browse source
This commit is contained in:
Tulir Asokan 2026-01-12 00:57:12 +02:00
commit 650f9c3139
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
event/cmdschema/parse.go
View file

@ -39,7 +39,13 @@ func parseQuoted(val string) (parsed, remaining string, quoted bool) {
var buf strings.Builder
for {
quoteIdx := strings.IndexByte(val, '"')
escapeIdx := strings.IndexByte(val[:max(0, quoteIdx)], '\\')
var valUntilQuote string
if quoteIdx == -1 {
valUntilQuote = val
} else {
valUntilQuote = val[:quoteIdx]
}
escapeIdx := strings.IndexByte(valUntilQuote, '\\')
if escapeIdx >= 0 {
buf.WriteString(val[:escapeIdx])
if len(val) > escapeIdx+1 {

12
event/cmdschema/testdata/parse_quote.json vendored
View file

@ -1,12 +1,21 @@
[
{"name": "empty string", "input": "", "output": ["", "", false]},
{"name": "single word", "input": "meow", "output": ["meow", "", false]},
{"name": "two words", "input": "meow woof", "output": ["meow", "woof", false]},
{"name": "many words", "input": "meow meow mrrp", "output": ["meow", "meow mrrp", false]},
{"name": "extra spaces", "input": "meow meow mrrp", "output": ["meow", "meow mrrp", false]},
{"name": "trailing space", "input": "meow ", "output": ["meow", "", false]},
{"name": "only spaces", "input": " ", "output": ["", "", false]},
{"name": "leading spaces", "input": " meow woof", "output": ["", "meow woof", false]},
{"name": "backslash at end unquoted", "input": "meow\\ woof", "output": ["meow\\", "woof", false]},
{"name": "quoted word", "input": "\"meow\" meow mrrp", "output": ["meow", "meow mrrp", true]},
{"name": "quoted words", "input": "\"meow meow\" mrrp", "output": ["meow meow", "mrrp", true]},
{"name": "spaces in quotes", "input": "\" meow meow \" mrrp", "output": [" meow meow ", "mrrp", true]},
{"name": "empty quoted string", "input": "\"\"", "output": ["", "", true]},
{"name": "empty quoted with trailing", "input": "\"\" meow", "output": ["", "meow", true]},
{"name": "quote no space before next", "input": "\"meow\"woof", "output": ["meow", "woof", true]},
{"name": "just opening quote", "input": "\"", "output": ["", "", true]},
{"name": "quote then space then text", "input": "\" meow", "output": [" meow", "", true]},
{"name": "quotes after word", "input": "meow \" meow mrrp \"", "output": ["meow", "\" meow mrrp \"", false]},
{"name": "escaped quote", "input": "\"meow\\\" meow\" mrrp", "output": ["meow\" meow", "mrrp", true]},
{"name": "missing end quote", "input": "\"meow meow mrrp", "output": ["meow meow mrrp", "", true]},
@ -16,5 +25,6 @@
{"name": "other escaped character", "input": "\"m\\eow\" meow mrrp", "output": ["meow", "meow mrrp", true]},
{"name": "escaped backslashes", "input": "\"m\\\\e\\\"ow\\\\\" meow mrrp", "output": ["m\\e\"ow\\", "meow mrrp", true]},
{"name": "just quotes", "input": "\"\\\"\\\"\\\\\\\"\" meow", "output": ["\"\"\\\"", "meow", true]},
{"name": "eof escape", "input": "\"meow\\", "output": ["meow\\", "", true]}
{"name": "escape at eof", "input": "\"meow\\", "output": ["meow", "", true]},
{"name": "escaped backslash at eof", "input": "\"meow\\\\", "output": ["meow\\", "", true]}
]