Skip to content
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

Jump to bottom

fix(tokenizer): handle unterminated quoted attributes gracefully #923

Merged
merged 12 commits into from
Jan 4, 2024
Merged

fix(tokenizer): handle unterminated quoted attributes gracefully #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9b25f39
add test
MoustaphaDev Dec 22, 2023
54a7f21
fix
MoustaphaDev Dec 22, 2023
12f566a
chore: changeset
MoustaphaDev Dec 22, 2023
470f274
test: add single quoted attribute test
MoustaphaDev Dec 22, 2023
5c98291
add (seemingly incorrect?) test for feedback
MoustaphaDev Dec 24, 2023
5839914
apply feedback to tests
MoustaphaDev Dec 26, 2023
42d1416
simple heuristic to rescue some chars off attrs
MoustaphaDev Dec 26, 2023
aa18ee3
update TS tests to refect changes
MoustaphaDev Dec 26, 2023
efbb601
simplify whitespace check
MoustaphaDev Dec 26, 2023
fdaa342
Update internal/token.go
natemoo-re Jan 2, 2024
ef249ed
Update internal/token.go
natemoo-re Jan 2, 2024
1e8453a
Merge branch 'main' of https://github.com/withastro/compiler into fix…
MoustaphaDev Jan 4, 2024
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
5 changes: 5 additions & 0 deletions .changeset/chilled-starfishes-search.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/compiler': patch
---

Fixes an issue where unterminated quoted attributes caused the compiler to crash
2 changes: 1 addition & 1 deletion internal/printer/print-to-json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ func renderNode(p *printer, parent *ASTNode, n *Node, opts t.ParseOptions) {
}
position := attrPositionAt(p, &attr, opts)
raw := ""
if attr.Type == QuotedAttribute {
if attr.Type == QuotedAttribute || attr.Type == TemplateLiteralAttribute {
MoustaphaDev marked this conversation as resolved.
Show resolved Hide resolved
start := attr.ValLoc.Start - 1
end := attr.ValLoc.Start + len(attr.Val)

Expand Down
15 changes: 15 additions & 0 deletions internal/printer/printer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3342,6 +3342,21 @@ const c = '\''
source: `<html><body><h1>Hello world!</h1><style></style></body></html>`,
want: []ASTNode{{Type: "element", Name: "html", Children: []ASTNode{{Type: "element", Name: "body", Children: []ASTNode{{Type: "element", Name: "h1", Children: []ASTNode{{Type: "text", Value: "Hello world!"}}}, {Type: "element", Name: "style"}}}}}},
},
{
name: "element with unterminated double quote attribute",
source: `<main id="gotcha />`,
want: []ASTNode{{Type: "element", Name: "main", Attributes: []ASTNode{{Type: "attribute", Kind: "quoted", Name: "id", Value: "gotcha", Raw: "\"gotcha"}}}},
},
{
name: "element with unterminated single quote attribute",
source: `<main id='gotcha />`,
want: []ASTNode{{Type: "element", Name: "main", Attributes: []ASTNode{{Type: "attribute", Kind: "quoted", Name: "id", Value: "gotcha", Raw: "'gotcha"}}}},
},
{
name: "element with unterminated template literal attribute",
source: `<main id=` + BACKTICK + `gotcha />`,
want: []ASTNode{{Type: "element", Name: "main", Attributes: []ASTNode{{Type: "attribute", Kind: "template-literal", Name: "id", Value: "gotcha", Raw: "`gotcha"}}}},
},
}

for _, tt := range tests {
Expand Down
36 changes: 35 additions & 1 deletion internal/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,6 +1448,29 @@ func (z *Tokenizer) readTagAttrVal() {
for {
c := z.readByte()
if z.err != nil {
if z.err == io.EOF {
// rescan, closing any potentially unterminated quoted attribute values
for i := z.pendingAttr[1].Start; i < z.raw.End; i++ {
c := z.buf[i]
if unicode.IsSpace(rune(c)) || c == '/' || c == '>' {
z.pendingAttr[1].End = i
break
}
if i == z.raw.End-1 {
z.pendingAttr[1].End = i
break
}
}
natemoo-re marked this conversation as resolved.
Show resolved Hide resolved
z.handler.AppendError(&loc.ErrorWithRange{
Code: loc.ERROR_UNTERMINATED_STRING,
Text: `Unterminated quoted attribute`,
Range: loc.Range{
Loc: loc.Loc{Start: z.data.Start},
Len: z.raw.End,
},
})
return
}
z.pendingAttr[1].End = z.raw.End
return
}
Expand All @@ -1463,7 +1486,18 @@ func (z *Tokenizer) readTagAttrVal() {
c := z.readByte()
if z.err != nil {
if z.err == io.EOF {
z.pendingAttr[1].End = z.pendingAttr[1].Start
// rescan, closing any potentially unterminated attribute values
for i := z.pendingAttr[1].Start; i < z.raw.End; i++ {
c := z.buf[i]
if unicode.IsSpace(rune(c)) || c == '/' || c == '>' {
natemoo-re marked this conversation as resolved.
Show resolved Hide resolved
z.pendingAttr[1].End = i
break
}
if i == z.raw.End-1 {
z.pendingAttr[1].End = i
break
}
}
z.handler.AppendError(&loc.ErrorWithRange{
Code: loc.ERROR_UNTERMINATED_STRING,
Text: `Unterminated template literal attribute`,
Expand Down
31 changes: 28 additions & 3 deletions packages/compiler/test/tsx-sourcemaps/unfinished-literal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import { test } from 'uvu';
import * as assert from 'uvu/assert';
import { convertToTSX } from '@astrojs/compiler';

const input = `<div class=\`></div>
`;

test('does not panic on unfinished template literal attribute', async () => {
const input = `<div class=\`></div>
`;
let error = 0;
try {
const output = await convertToTSX(input, { filename: 'index.astro', sourcemap: 'inline' });
Expand All @@ -16,3 +15,29 @@ test('does not panic on unfinished template literal attribute', async () => {

assert.equal(error, 0, `compiler should not have panicked`);
});

test('does not panic on unfinished double quoted attribute', async () => {
const input = `<main id="gotcha />`;
let error = 0;
try {
const output = await convertToTSX(input, { filename: 'index.astro', sourcemap: 'inline' });
assert.match(output.code, `id="gotcha"`);
} catch (e) {
error = 1;
}

assert.equal(error, 0, `compiler should not have panicked`);
});

test('does not panic on unfinished single quoted attribute', async () => {
const input = `<main id='gotcha/>`;
let error = 0;
try {
const output = await convertToTSX(input, { filename: 'index.astro', sourcemap: 'inline' });
assert.match(output.code, `id="gotcha"`);
} catch (e) {
error = 1;
}

assert.equal(error, 0, `compiler should not have panicked`);
});
Loading