LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Fix broken resolves due to escaped characters (#849)

Browse source 
## Issue
`/$/embed/尾崎豊--－-大阪球場ライブ%E3%80%801_6/bfd63daa9453bb1a11674ca8a7c5f5dd6b49d024?r=2ituZftpdG18f1TBADDbCaaEZ9ecYYYm` wasn't working

## Change
Probably need to revisit this properly, but for now, grab the `requestPath` that's needed for resolving before escaping the characters.

Tested that `http://localhost:1337/$/search?q=%22\/%3E%3Cimg%20s+src+c=x%20on+onerror+%20=alert(1)+\%3E` would still be blocked.
This commit is contained in:
infinite-persistence 2022-02-11 18:26:36 -08:00 committed by GitHub
parent f17662cf46
commit d102cbe802
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/src/html.js
View file

@ -304,16 +304,16 @@ async function getHtml(ctx) {
html = fs.readFileSync(path.join(__dirname, '/../dist/index.html'), 'utf8'); html = fs.readFileSync(path.join(__dirname, '/../dist/index.html'), 'utf8');
} }
if (ctx?.request?.url) {
ctx.request.url = encodeURIComponent(escapeHtmlProperty(decodeURIComponent(ctx.request.url)));
}
const requestPath = unscapeHtmlProperty(decodeURIComponent(ctx.path)); const requestPath = unscapeHtmlProperty(decodeURIComponent(ctx.path));
if (requestPath.length === 0) { if (requestPath.length === 0) {
const ogMetadata = buildBasicOgMetadata(); const ogMetadata = buildBasicOgMetadata();
return insertToHead(html, ogMetadata); return insertToHead(html, ogMetadata);
} }
if (ctx?.request?.url) {
ctx.request.url = encodeURIComponent(escapeHtmlProperty(decodeURIComponent(ctx.request.url)));
}
const invitePath = `/$/${PAGES.INVITE}/`; const invitePath = `/$/${PAGES.INVITE}/`;
const embedPath = `/$/${PAGES.EMBED}/`; const embedPath = `/$/${PAGES.EMBED}/`;