Elgato_dark/readest
1
0
Fork 0
mirror of https://github.com/readest/readest synced 2026-04-21 13:37:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(opds): harden Content-Disposition filename parsing for complex names and encoding (#3816)

Browse source
This commit is contained in:
Zeedif 2026-04-09 22:08:57 -06:00 committed by GitHub
parent a5690e9a84
commit bd866cb049
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/readest-app/src/app/opds/utils/opdsReq.ts
View file

@ -274,19 +274,36 @@ export const probeFilename = async (headers: Record<string, string>) => {
/filename\*\s*=\s*(?:utf-8|UTF-8)'[^']*'([^;\s]+)/i,
);
if (extendedMatch?.[1]) {
return decodeURIComponent(extendedMatch[1]);
try {
return decodeURIComponent(extendedMatch[1]);
} catch (e) {
// If decoding fails, ignore and proceed to the next format
console.warn('Failed to decode filename*', e);
}
}
// 2. Try standard format with quotes (supports spaces)
const quotedMatch = contentDisposition.match(/filename\s*=\s*["']([^"']+)["']/i);
if (quotedMatch?.[1]) {
return decodeURIComponent(quotedMatch[1]);
// 2. Try standard quoted format (supports spaces, apostrophes, and escaped quotes)
const quotedMatch = contentDisposition.match(/filename\s*=\s*(["'])((?:(?!\1)[^\\]|\\.)*)\1/i);
if (quotedMatch?.[2]) {
// Unescape characters (e.g., \" becomes ")
const unescaped = quotedMatch[2].replace(/\\(.)/g, '$1');
try {
// Attempt to decode in case the server incorrectly applied URL encoding
return decodeURIComponent(unescaped);
} catch {
// If decoding fails (e.g., literal '%' symbols), return the unescaped string as-is
return unescaped;
}
}
// 3. Fallback: standard format without quotes
const plainMatch = contentDisposition.match(/filename\s*=\s*([^;\s]+)/i);
if (plainMatch?.[1]) {
return decodeURIComponent(plainMatch[1]);
try {
return decodeURIComponent(plainMatch[1]);
} catch {
return plainMatch[1];
}
}
}