diff --git a/package.json b/package.json index 747778f..5bd82ce 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "bcryptjs": "^3.0.2", "cheerio": "^1.0.0", "cookie-es": "^2.0.0", + "dompurify": "^3.2.6", "fast-fuzzy": "^1.12.0", "file-type-mime": "^0.4.3", "jdenticon": "^3.3.0", diff --git a/server/api/v1/admin/import/redist/index.post.ts b/server/api/v1/admin/import/redist/index.post.ts index 95cb22f..d36c002 100644 --- a/server/api/v1/admin/import/redist/index.post.ts +++ b/server/api/v1/admin/import/redist/index.post.ts @@ -5,6 +5,7 @@ import * as jdenticon from "jdenticon"; import prisma from "~/server/internal/db/database"; import libraryManager from "~/server/internal/library"; import jsdom from "jsdom"; +import DOMPurify from 'dompurify'; export const ImportRedist = type({ library: "string", @@ -47,6 +48,9 @@ export default defineEventHandler(async (h3) => { let svgContent = ""; if (options.platform) { + // This logic is duplicated on the client to make viewing there possible. + // TODO?: refactor into a single function. Not totally sure if this is a good idea though, + // because they do different things const dom = new jsdom.JSDOM(options.platform.icon); const svg = dom.window.document.getElementsByTagName("svg").item(0); if (!svg) @@ -56,7 +60,7 @@ export default defineEventHandler(async (h3) => { }); svg.removeAttribute("width"); svg.removeAttribute("height"); - svgContent = svg.outerHTML; + svgContent = DOMPurify.sanitize(svg.outerHTML, {USE_PROFILES: {svg: true, svgFilters: true}}); } const redist = await prisma.redist.create({ diff --git a/yarn.lock b/yarn.lock index 7e2450b..ceebda0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2497,6 +2497,11 @@ resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw== +"@types/trusted-types@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== + "@types/turndown@^5.0.5": version "5.0.5" resolved "https://registry.yarnpkg.com/@types/turndown/-/turndown-5.0.5.tgz#614de24fc9ace4d8c0d9483ba81dc8c1976dd26f" @@ -4267,6 +4272,13 @@ domhandler@^5.0.2, domhandler@^5.0.3: dependencies: domelementtype "^2.3.0" +dompurify@^3.2.6: + version "3.2.6" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.6.tgz#ca040a6ad2b88e2a92dc45f38c79f84a714a1cad" + integrity sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ== + optionalDependencies: + "@types/trusted-types" "^2.0.7" + domutils@^3.0.1, domutils@^3.2.1, domutils@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.2.2.tgz#edbfe2b668b0c1d97c24baf0f1062b132221bc78"