mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #15897 from Snuffleupagus/issue-15893

Browse source 
Support parsing encrypted documents in `XRef.indexObjects` (issue 15893)
This commit is contained in:
Jonas Jenwald 2023-01-07 16:55:41 +01:00 • committed by GitHub
commit 74e4b515c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/core/xref.js
View file

@ -581,16 +581,11 @@ class XRef {
this.startXRefQueue.push(xrefStm);
this.readXRef(/* recoveryMode */ true);
}
// finding main trailer
let trailerDict, trailerError;
for (const trailer of [...trailers, "generationFallback", ...trailers]) {
if (trailer === "generationFallback") {
if (!trailerError) {
break; // No need to fallback if there were no validation errors.
}
this._generationFallback = true;
continue;
}
const trailerDicts = [];
// Pre-parsing the trailers to check if the document is possibly encrypted.
let isEncrypted = false;
for (const trailer of trailers) {
stream.pos = trailer;
const parser = new Parser({
lexer: new Lexer(stream),
@ -607,6 +602,23 @@ class XRef {
if (!(dict instanceof Dict)) {
continue;
}
trailerDicts.push(dict);
if (dict.has("Encrypt")) {
isEncrypted = true;
}
}
// finding main trailer
let trailerDict, trailerError;
for (const dict of [...trailerDicts, "genFallback", ...trailerDicts]) {
if (dict === "genFallback") {
if (!trailerError) {
break; // No need to fallback if there were no validation errors.
}
this._generationFallback = true;
continue;
}
// Do some basic validation of the trailer/root dictionary candidate.
let validPagesDict = false;
try {
@ -628,7 +640,11 @@ class XRef {
continue;
}
// taking the first one with 'ID'
if (validPagesDict && dict.has("ID")) {
if (
validPagesDict &&
(!isEncrypted || dict.has("Encrypt")) &&
dict.has("ID")
) {
return dict;
}
// The current dictionary is a candidate, but continue searching.