luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

d2parser: impose max key length

Browse source
This commit is contained in:
Alexander Wang 2025-03-25 10:07:05 -06:00
parent 8dc32c03d1
commit ef51ef432a
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
3 changed files with 117 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
d2parser/parse.go
View file

@ -984,6 +984,14 @@ func (p *parser) parseKey() (k *d2ast.KeyPath) {
k = nil k = nil
} else { } else {
k.Range.End = k.Path[len(k.Path)-1].Unbox().GetRange().End k.Range.End = k.Path[len(k.Path)-1].Unbox().GetRange().End
for _, part := range k.Path {
if part.Unbox() != nil {
if len(part.Unbox().ScalarString()) > 518 {
p.errorf(k.Range.Start, k.Range.End, "key length %d exceeds maximum allowed length of 518", len(part.Unbox().ScalarString()))
break
}
}
}
} }
}() }()

9
d2parser/parse_test.go
View file

@ -500,6 +500,15 @@ func testImport(t *testing.T) {
assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#09.d2:1:7: unquoted strings cannot begin with ...@ as that's import spread syntax") assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#09.d2:1:7: unquoted strings cannot begin with ...@ as that's import spread syntax")
}, },
}, },
{
text: `gcloud: {
icon: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAA
}
`,
assert: func(t testing.TB, ast *d2ast.Map, err error) {
assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#10.d2:2:24: key length 555 exceeds maximum allowed length of 518")
},
},
} }
runa(t, tca) runa(t, tca)

100
testdata/d2parser/TestParse/import/#10.exp.json generated vendored Normal file
View file

@ -0,0 +1,100 @@
{
"ast": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-3:0:591",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-2:1:590",
"key": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-0:6:6",
"value": [
{
"string": "gcloud",
"raw_string": "gcloud"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:8:8-2:1:590",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:2:12-1:22:32",
"key": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:2:12-1:6:16",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:2:12-1:6:16",
"value": [
{
"string": "icon",
"raw_string": "icon"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:8:18-1:22:32",
"value": [
{
"string": "data:image/png",
"raw_string": "data:image/png"
}
]
}
}
}
},
{
"map_key": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588",
"key": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588",
"value": [
{
"string": "base64,iVBORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAA",
"raw_string": "base64,iVBORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAA"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
]
}
}
}
}
]
},
"err": {
"errs": [
{
"range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588",
"errmsg": "d2/testdata/d2parser/TestParse/import/#10.d2:2:24: key length 555 exceeds maximum allowed length of 518"
}
]
}
}