－修复PDF编辑器无法打开带密码文档的问题

LUCASLEEE · Feb 10, 2022 · f3238d4 · f3238d4
1 parent 8072865
commit f3238d4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/App/Functions/Editor/Controller.cs b/App/Functions/Editor/Controller.cs
@@ -103,7 +103,7 @@ void LoadPdfDocument() {
 			if (s != null) {
 				try {
 					var d = v.Document;
-					Model.PdfDocument = v.Document = new MuPdfSharp.MuDocument(s);
+					Model.PdfDocument = v.Document = PdfHelper.OpenMuDocument(s);
 					d.TryDispose();
 					View.AutoBookmark.TryDispose();
 					v.Enabled = true;

diff --git a/App/Processor/Mupdf/MuDocument.cs b/App/Processor/Mupdf/MuDocument.cs
@@ -26,6 +26,7 @@ public int AntiAlias {
 		public bool IsDocumentOpened => _document.IsValid() && _sourceStream.IsValid();
 		/// <summary>获取文档是否设置了打开密码。</summary>
 		public bool NeedsPassword => NativeMethods.NeedsPdfPassword(_context, _document);
+		public bool IsAuthenticated { get; private set; }
 		public bool IsCancellationPending => _cookie.IsCancellationPending;
 		object _SyncObj = new object();
 		public object SyncObj => _SyncObj;
@@ -151,18 +152,14 @@ public MuPage LoadPage(int pageNumber) {
 			return new MuPage(_context, _document, pageNumber, ref _cookie);
 		}
 
-		private int InitPdf(string password) {
-			if (NativeMethods.NeedsPdfPassword(_context, _document)) {
-				if (String.IsNullOrEmpty(password) == false) {
-					if (NativeMethods.AuthenticatePassword(_context, _document, password) == false) {
-						throw new iTextSharp.text.exceptions.BadPasswordException("密码无效。");
-					}
-				}
-				else {
-					throw new iTextSharp.text.exceptions.BadPasswordException("需要提供打开 PDF 文档的密码。");
-				}
-			}
+		public bool AuthenticatePassword(string password) {
+			return IsAuthenticated = 
+				NativeMethods.NeedsPdfPassword(_context, _document) == false
+				|| String.IsNullOrEmpty(password) == false && NativeMethods.AuthenticatePassword(_context, _document, password);
+		}
 
+		int InitPdf(string password) {
+			AuthenticatePassword(password);
 			PageCount = NativeMethods.CountPages(_context, _document);
 			return PageCount;
 		}

diff --git a/App/Processor/PdfHelper.cs b/App/Processor/PdfHelper.cs
@@ -80,22 +80,22 @@ internal static bool ConfirmUnethicalMode(this PdfReader pdf) {
 		}
 
 		internal static MuPdfSharp.MuDocument OpenMuDocument(string sourceFile) {
-			byte[] password;
-			__PdfPasswordBox.TryGetValue(sourceFile, out password);
-			while (true) {
-				var r = new MuPdfSharp.MuDocument(sourceFile, password != null ? Encoding.Default.GetString(password) : String.Empty);
-				if (password != null && password.Length > 0) {
-					__PdfPasswordBox[sourceFile] = password;
+			var d = new MuPdfSharp.MuDocument(sourceFile);
+			if (d.NeedsPassword) {
+				if (__PdfPasswordBox.TryGetValue(sourceFile, out byte[] password)) {
+					d.AuthenticatePassword(password != null ? Encoding.Default.GetString(password) : String.Empty);
 				}
-				if (r.NeedsPassword) {
-					var f = new PasswordEntryForm(sourceFile);
-					if (f.ShowDialog() == System.Windows.Forms.DialogResult.Cancel) {
-						throw new iTextSharp.text.exceptions.BadPasswordException("密码错误，没有权限打开 PDF 文件。");
+				while (d.IsAuthenticated == false) {
+					using (var f = new PasswordEntryForm(sourceFile)) {
+						if (f.ShowDialog() == System.Windows.Forms.DialogResult.Cancel) {
+							throw new iTextSharp.text.exceptions.BadPasswordException("密码错误，没有权限打开 PDF 文件。");
+						}
+						__PdfPasswordBox[sourceFile] = password = Encoding.Default.GetBytes(f.Password);
 					}
-					password = Encoding.Default.GetBytes(f.Password);
+					d.AuthenticatePassword(password != null ? Encoding.Default.GetString(password) : String.Empty);
 				}
-				return r;
 			}
+			return d;
 		}
 
 		static PdfHelper() {