Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 0 additions & 14 deletions .changeset/blue-dragons-see.md

This file was deleted.

13 changes: 0 additions & 13 deletions .changeset/frank-memes-knock.md

This file was deleted.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions packages/runtime-class/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
# Change Log

## 5.38.36

### Patch Changes

- [#3159](https://github.com/marko-js/marko/pull/3159) [`19d4b37`](https://github.com/marko-js/marko/commit/19d4b37d0806c4185eed4e0f300092621974f45e) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix escaping issue for dynamic text interpolation inside `<script>`, `<style>`, `<html-script>` and `<html-style>` tags.

The issue was that the escaping logic for those tags used a CASE SENSITIVE search for the closing tag which could be bypassed like so:

```marko
<script>${"</SCRIPT><img src=x onerror=alert('uh oh')>"}</script>
```

Note that `script` and `style` there should _never_ render unsanitized user defined values, regardless of wether or not the closing tag is escaped, since these are conceptually just "eval".

- [#3159](https://github.com/marko-js/marko/pull/3159) [`19d4b37`](https://github.com/marko-js/marko/commit/19d4b37d0806c4185eed4e0f300092621974f45e) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix escaping for `<html-comment>` tag.
Previously this tag relied on normal xml escaping which looks for `<`.
This PR updates to have a special escape for `<html-comment>` tags that replaces `>` instead.

```marko
// Previously incorrectly escaped.
<html-comment>${">Uh oh"}</html-comment>
```

- Updated dependencies [[`19d4b37`](https://github.com/marko-js/marko/commit/19d4b37d0806c4185eed4e0f300092621974f45e), [`19d4b37`](https://github.com/marko-js/marko/commit/19d4b37d0806c4185eed4e0f300092621974f45e)]:
- @marko/runtime-tags@6.0.164

## 5.38.35

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/runtime-class/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "marko",
"version": "5.38.35",
"version": "5.38.36",
"description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
"keywords": [
"front-end",
Expand Down Expand Up @@ -70,7 +70,7 @@
},
"dependencies": {
"@marko/compiler": "^5.39.62",
"@marko/runtime-tags": "^6.0.162",
"@marko/runtime-tags": "^6.0.164",
"app-module-path": "^2.2.0",
"argly": "^1.2.0",
"browser-refresh-client": "1.1.4",
Expand Down
23 changes: 23 additions & 0 deletions packages/runtime-tags/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# @marko/runtime-tags

## 6.0.164

### Patch Changes

- [#3159](https://github.com/marko-js/marko/pull/3159) [`19d4b37`](https://github.com/marko-js/marko/commit/19d4b37d0806c4185eed4e0f300092621974f45e) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix escaping issue for dynamic text interpolation inside `<script>`, `<style>`, `<html-script>` and `<html-style>` tags.

The issue was that the escaping logic for those tags used a CASE SENSITIVE search for the closing tag which could be bypassed like so:

```marko
<script>${"</SCRIPT><img src=x onerror=alert('uh oh')>"}</script>
```

Note that `script` and `style` there should _never_ render unsanitized user defined values, regardless of wether or not the closing tag is escaped, since these are conceptually just "eval".

- [#3159](https://github.com/marko-js/marko/pull/3159) [`19d4b37`](https://github.com/marko-js/marko/commit/19d4b37d0806c4185eed4e0f300092621974f45e) Thanks [@DylanPiercey](https://github.com/DylanPiercey)! - Fix escaping for `<html-comment>` tag.
Previously this tag relied on normal xml escaping which looks for `<`.
This PR updates to have a special escape for `<html-comment>` tags that replaces `>` instead.

```marko
// Previously incorrectly escaped.
<html-comment>${">Uh oh"}</html-comment>
```

## 6.0.163

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-tags/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marko/runtime-tags",
"version": "6.0.163",
"version": "6.0.164",
"description": "Optimized runtime for Marko templates.",
"keywords": [
"api",
Expand Down
Loading