comphelper/source/misc/docpasswordhelper.cxx | 31 ++++++++-------
sc/qa/uitest/calc_tests8/tdf147086.py | 55 +++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 14 deletions(-)
New commits:
commit f7e03352c18e13161effcfe08c7591d3be11b3e0
Author: Tünde Tóth <toth.tu...@nisz.hu>
AuthorDate: Mon Feb 7 11:58:16 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Feb 17 16:29:34 2022 +0100
tdf#147086 OOXML export: don't save the empty editing password
Saving with opening password, but without editing password
resulted read-only documents (only on their original path: saving,
i.e. copying the file in a different path was a workaround for
the lost permission).
Regression from commit 1b53c1dfc76f08ca7df40a0673aa50eca700d072
(tdf#144374 DOCX: export the password for editing).
Change-Id: I2759dc876ee7668d00eee0aa81490c9d1e0c272b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129593
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130060
Tested-by: Jenkins
diff --git a/comphelper/source/misc/docpasswordhelper.cxx
b/comphelper/source/misc/docpasswordhelper.cxx
index 71f92db48d00..952368bc91ed 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -111,23 +111,26 @@
DocPasswordHelper::GenerateNewModifyPasswordInfoOOXML(std::u16string_view aPassw
{
uno::Sequence<beans::PropertyValue> aResult;
- uno::Sequence<sal_Int8> aSalt = GenerateRandomByteSequence(16);
- OUStringBuffer aBuffer;
- comphelper::Base64::encode(aBuffer, aSalt);
- OUString sSalt = aBuffer.toString();
+ if (!aPassword.empty())
+ {
+ uno::Sequence<sal_Int8> aSalt = GenerateRandomByteSequence(16);
+ OUStringBuffer aBuffer;
+ comphelper::Base64::encode(aBuffer, aSalt);
+ OUString sSalt = aBuffer.toString();
- sal_Int32 const nIterationCount = 100000;
- OUString sAlgorithm("SHA-512");
+ sal_Int32 const nIterationCount = 100000;
+ OUString sAlgorithm("SHA-512");
- const OUString sHash(GetOoxHashAsBase64(OUString(aPassword), sSalt,
nIterationCount,
-
comphelper::Hash::IterCount::APPEND, sAlgorithm));
+ const OUString sHash(GetOoxHashAsBase64(OUString(aPassword), sSalt,
nIterationCount,
+
comphelper::Hash::IterCount::APPEND, sAlgorithm));
- if (!sHash.isEmpty())
- {
- aResult = { comphelper::makePropertyValue("algorithm-name",
sAlgorithm),
- comphelper::makePropertyValue("salt", sSalt),
- comphelper::makePropertyValue("iteration-count",
nIterationCount),
- comphelper::makePropertyValue("hash", sHash) };
+ if (!sHash.isEmpty())
+ {
+ aResult = { comphelper::makePropertyValue("algorithm-name",
sAlgorithm),
+ comphelper::makePropertyValue("salt", sSalt),
+ comphelper::makePropertyValue("iteration-count",
nIterationCount),
+ comphelper::makePropertyValue("hash", sHash) };
+ }
}
return aResult;
diff --git a/sc/qa/uitest/calc_tests8/tdf147086.py
b/sc/qa/uitest/calc_tests8/tdf147086.py
new file mode 100755
index 000000000000..906f79075b59
--- /dev/null
+++ b/sc/qa/uitest/calc_tests8/tdf147086.py
@@ -0,0 +1,55 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from org.libreoffice.unotest import systemPathToFileUrl
+from uitest.uihelper.common import select_by_text
+from tempfile import TemporaryDirectory
+import os.path
+
+#Bug 147086 - Password in .xlsx creates readonly sheet
+
+class tdf147086(UITestCase):
+
+ def test_tdf147086(self):
+
+ with TemporaryDirectory() as tempdir:
+ xFilePath = os.path.join(tempdir, "tdf147086_tmp.xlsx")
+
+ with self.ui_test.create_doc_in_start_center("calc"):
+ # Save the document
+ with self.ui_test.execute_dialog_through_command(".uno:Save",
close_button="") as xSaveDialog:
+ xFileName = xSaveDialog.getChild("file_name")
+ xFileName.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+ xFileName.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+ xFileName.executeAction("TYPE", mkPropertyValues({"TEXT":
xFilePath}))
+ xFileTypeCombo = xSaveDialog.getChild("file_type")
+ select_by_text(xFileTypeCombo, "Excel 2007–365 (.xlsx)")
+ xPasswordCheckButton = xSaveDialog.getChild("password")
+ xPasswordCheckButton.executeAction("CLICK", tuple())
+ xOpen = xSaveDialog.getChild("open")
+
+ with self.ui_test.execute_dialog_through_action(xOpen,
"CLICK", close_button="") as xPasswordDialog:
+ xReadonly = xPasswordDialog.getChild("readonly")
+ xReadonly.executeAction("CLICK", tuple())
+
+ xOk = xPasswordDialog.getChild("ok")
+ # XLSX confirmation dialog is displayed
+ with self.ui_test.execute_dialog_through_action(xOk,
"CLICK", close_button="save"):
+ pass
+
+ with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as
document:
+
+ self.assertTrue(document.isReadonly())
+
+ self.xUITest.executeCommand(".uno:EditDoc")
+
+ self.assertFalse(document.isReadonly())
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
