hotfix: Fix major XSS vulnerability

This commit is contained in:
Xyphyn committed 2023-07-10 09:12:38 -07:00
1 parent 4412169602
commit d34e58d809
11 files changed
+111 -101

No files matched your search

+3 -2
View File
@@ -13,6 +13,7 @@
"devDependencies": {
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/kit": "^1.5.0",
"@types/markdown-it": "^12.2.3",
"@types/nprogress": "^0.2.0",
"autoprefixer": "^10.4.14",
"jsdom": "^22.1.0",
@@ -21,7 +22,6 @@
"svelte": "^3.54.0",
"svelte-check": "^3.0.1",
"svelte-hero-icons": "^5.0.0",
"svelte-markdown": "^0.2.3",
"tailwindcss": "^3.3.2",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
@@ -29,7 +29,8 @@
"vitest": "^0.33.0"
},
"dependencies": {
"lemmy-js-client": "^0.18.0-rc.2"
"lemmy-js-client": "^0.18.0-rc.2",
"markdown-it": "^13.0.1"
},
"type": "module"
}
@@ -67,14 +67,16 @@
<svelte:self {post} nodes={node.children} isParent={false} />
{/if}
{#if node.comment_view.counts.child_count > 0 && node.children.length == 0}
<Button
loading={loadingChildren}
disabled={loadingChildren}
on:click={() => fetchChildren(node)}
>
<Icon src={ChevronDown} width={16} mini />
Load {node.comment_view.counts.child_count} more
</Button>
<div class="m-1">
<Button
loading={loadingChildren}
disabled={loadingChildren}
on:click={() => fetchChildren(node)}
>
<Icon src={ChevronDown} width={16} mini />
Load {node.comment_view.counts.child_count} more
</Button>
</div>
{/if}
</Comment>
{/each}
+44 -21
View File
@@ -1,25 +1,48 @@
<script lang="ts">
import MarkdownHeader from '$lib/components/markdown/MarkdownHeader.svelte'
import MarkdownHr from '$lib/components/markdown/MarkdownHr.svelte'
import MarkdownLink from '$lib/components/markdown/MarkdownLink.svelte'
import MarkdownQuote from '$lib/components/markdown/MarkdownQuote.svelte'
import SvelteMarkdown from 'svelte-markdown'
import MarkdownList from '$lib/components/markdown/MarkdownList.svelte'
import MarkdownImage from '$lib/components/markdown/MarkdownImage.svelte'
import MarkdownIt from 'markdown-it'
const md = new MarkdownIt({
html: false,
})
export let source: string | undefined
export let source: string = ''
</script>
<div class="break-words flex flex-col gap-2">
<SvelteMarkdown
{source}
renderers={{
link: MarkdownLink,
heading: MarkdownHeader,
hr: MarkdownHr,
blockquote: MarkdownQuote,
list: MarkdownList,
image: MarkdownImage,
}}
/>
</div>
<article class="break-words flex flex-col gap-2 markdown">
{@html md.render(source)}
</article>
<style lang="postcss">
.markdown :global(h1) {
@apply text-3xl font-bold my-2;
}
.markdown :global(h2) {
@apply text-2xl font-bold my-2;
}
.markdown :global(h3) {
@apply text-xl font-bold my-2;
}
.markdown :global(hr) {
@apply w-[90%] mx-auto my-4 opacity-50;
}
.markdown :global(img) {
@apply max-h-[40vh] border rounded-md border-slate-200 dark:border-zinc-800;
}
.markdown :global(a) {
@apply text-sky-400 hover:underline;
}
.markdown :global(ul) {
@apply list-disc pl-3;
}
.markdown :global(ol) {
@apply list-decimal pl-3;
}
.markdown :global(blockquote) {
@apply border-l-2 border-black/20 dark:border-white/20 pl-2 my-1;
}
</style>
@@ -1,19 +0,0 @@
<script lang="ts">
export let depth: Number
</script>
{#if depth == 1}
<h1 class="font-bold text-3xl my-2"><slot /></h1>
{:else if depth == 2}
<h2 class="font-bold text-2xl my-2"><slot /></h2>
{:else if depth == 3}
<h3 class="font-bold text-xl my-2"><slot /></h3>
{:else if depth == 4}
<h4 class="font-bold text-lg my-2"><slot /></h4>
{:else if depth == 5}
<h5 class="font-bold text-base my-2"><slot /></h5>
{:else if depth == 6}
<h6 class="font-bold text-sm my-2"><slot /></h6>
{:else}
<slot />
{/if}
@@ -1 +0,0 @@
<hr class="w-[90%] mx-auto my-4 opacity-50" />
@@ -1,12 +0,0 @@
<script lang="ts">
export let href: string = ''
export let title: string | undefined = undefined
export let text: string = ''
</script>
<img
src={href}
{title}
alt={text}
class="max-h-[40vh] border rounded-md border-slate-200 dark:border-zinc-800"
/>
@@ -1,5 +0,0 @@
<script lang="ts">
export let href: string
</script>
<a {href} class="text-sky-400 hover:underline"><slot /></a>
@@ -1,10 +0,0 @@
<script lang="ts">
export let ordered: boolean
export let start: number
</script>
{#if ordered}
<ol {start} class="list-decimal pl-3"><slot /></ol>
{:else}
<ul class="list-disc pl-3"><slot /></ul>
{/if}
@@ -1,3 +0,0 @@
<blockquote class="border-l-2 border-black/20 dark:border-white/20 pl-2 my-1">
<slot />
</blockquote>
-4
View File
@@ -30,7 +30,3 @@ code {
@apply bg-slate-200 border border-slate-300 dark:bg-zinc-800
dark:border-zinc-700 rounded-md px-1 py-0.5;
}
ol {
@apply list-decimal;
}
+54 -16
View File
@@ -374,10 +374,23 @@
resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.5.1.tgz#b29aa1f91a59f35e29ff8f7cb24faf1a3a750554"
integrity sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==
"@types/marked@^4.0.1":
version "4.3.1"
resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.3.1.tgz#45fb6dfd47afb595766c71ed7749ead23f137de3"
integrity sha512-vSSbKZFbNktrQ15v7o1EaH78EbWV+sPQbPjHG+Cp8CaNcPFUEfjZ0Iml/V0bFDwsTlYe8o6XC5Hfdp91cqPV2g==
"@types/linkify-it@*":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
"@types/markdown-it@^12.2.3":
version "12.2.3"
resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
dependencies:
"@types/linkify-it" "*"
"@types/mdurl" "*"
"@types/mdurl@*":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
"@types/node@*":
version "20.4.1"
@@ -482,6 +495,11 @@ arg@^5.0.2:
resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
argparse@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
assertion-error@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
@@ -725,6 +743,11 @@ entities@^4.4.0:
resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
entities@~3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
es6-promise@^3.1.2:
version "3.3.1"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
@@ -1060,6 +1083,13 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
linkify-it@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
dependencies:
uc.micro "^1.0.1"
local-pkg@^0.4.3:
version "0.4.3"
resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963"
@@ -1093,10 +1123,21 @@ magic-string@^0.30.1:
dependencies:
"@jridgewell/sourcemap-codec" "^1.4.15"
marked@^4.0.10:
version "4.3.0"
resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
markdown-it@^13.0.1:
version "13.0.1"
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
dependencies:
argparse "^2.0.1"
entities "~3.0.1"
linkify-it "^4.0.1"
mdurl "^1.0.1"
uc.micro "^1.0.5"
mdurl@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
merge2@^1.3.0:
version "1.4.1"
@@ -1604,14 +1645,6 @@ svelte-hmr@^0.15.1:
resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.15.2.tgz#d2f6fc82e040f2734abd54cea5cbef46828f2538"
integrity sha512-q/bAruCvFLwvNbeE1x3n37TYFb3mTBJ6TrCq6p2CoFbSTNhDE9oAtEfpy+wmc9So8AG0Tja+X0/mJzX9tSfvIg==
svelte-markdown@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/svelte-markdown/-/svelte-markdown-0.2.3.tgz#16c6db61605512100cf25c3e18f8e4105837895c"
integrity sha512-2h680NzTXnAD0CXhxe3GeHl6W+ayG4iKQRl+BIDRw+R0mUE0OiNxP1Vt8Rn+aWevB/LBiBIPCAwvL+0BkG057A==
dependencies:
"@types/marked" "^4.0.1"
marked "^4.0.10"
svelte-preprocess@^5.0.3:
version "5.0.4"
resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-5.0.4.tgz#2123898e079a074f7f4ef1799e10e037f5bcc55b"
@@ -1745,6 +1778,11 @@ typescript@^5.0.0, typescript@^5.0.3:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826"
integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==
uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
ufo@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"