Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that we don't try to re-open, or update the password-callback, when the password dialog is already open

Browse Source 
Currently in `disableWorker=true` mode it's possible that opening of password-protected PDF documents outright fails, if an *incorrect* password is entered. Apparently the event ordering is subtly different in the non-Worker case, which causes the password-callback to be updated *before* the dialog has been fully closed.
To avoid that we'll utilize a `PromiseCapability` to keep track of the state of the password dialog, such that we can delay both re-opening and (importantly) updating of the password-callback until doing so is safe.

This patch *may* also fix issue 15330, but it's impossible for me to tell.
This commit is contained in:
Jonas Jenwald 2022-08-19 17:35:49 +02:00
parent 1a007164f7
commit 89840649d9
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/password_prompt.js
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { PasswordResponses } from "pdfjs-lib"; import { createPromiseCapability, PasswordResponses } from "pdfjs-lib";
/** /**
* @typedef {Object} PasswordPromptOptions * @typedef {Object} PasswordPromptOptions
@ -28,6 +28,8 @@ import { PasswordResponses } from "pdfjs-lib";
*/ */
class PasswordPrompt { class PasswordPrompt {
#activeCapability = null;
#updateCallback = null; #updateCallback = null;
#reason = null; #reason = null;
@ -64,7 +66,17 @@ class PasswordPrompt {
} }
async open() { async open() {
await this.overlayManager.open(this.dialog); if (this.#activeCapability) {
await this.#activeCapability.promise;
}
this.#activeCapability = createPromiseCapability();
try {
await this.overlayManager.open(this.dialog);
} catch (ex) {
this.#activeCapability = null;
throw ex;
}
const passwordIncorrect = const passwordIncorrect =
this.#reason === PasswordResponses.INCORRECT_PASSWORD; this.#reason === PasswordResponses.INCORRECT_PASSWORD;
@ -92,6 +104,7 @@ class PasswordPrompt {
#cancel() { #cancel() {
this.#invokeCallback(new Error("PasswordPrompt cancelled.")); this.#invokeCallback(new Error("PasswordPrompt cancelled."));
this.#activeCapability.resolve();
} }
#invokeCallback(password) { #invokeCallback(password) {
@ -105,7 +118,10 @@ class PasswordPrompt {
this.#updateCallback = null; this.#updateCallback = null;
} }
setUpdateCallback(updateCallback, reason) { async setUpdateCallback(updateCallback, reason) {
if (this.#activeCapability) {
await this.#activeCapability.promise;
}
this.#updateCallback = updateCallback; this.#updateCallback = updateCallback;
this.#reason = reason; this.#reason = reason;
} }