From fbe5ac36c0aad00adbc0d5e6a6929474e63ddb19 Mon Sep 17 00:00:00 2001
From: VyacheslavSemin <vyacheslav.semin@onlyoffice.com>
Date: Tue, 19 Nov 2024 15:10:53 +0300
Subject: [PATCH 1/2] Fix an error when deleting tables in mysql

---
 schema/mysql/removetbl.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema/mysql/removetbl.sql b/schema/mysql/removetbl.sql
index 849d59a9e..cab8b7e53 100644
--- a/schema/mysql/removetbl.sql
+++ b/schema/mysql/removetbl.sql
@@ -1,7 +1,7 @@
-USE onlyoffice;
+-- USE onlyoffice;
 --
 -- Drop tables
 --
 DROP TABLE IF EXISTS `doc_callbacks`;
 DROP TABLE IF EXISTS `doc_changes`;
-DROP TABLE IF EXISTS `task_result`;
\ No newline at end of file
+DROP TABLE IF EXISTS `task_result`;

From 2f58a167548aa657529c3d88dfbda8e8f7e69281 Mon Sep 17 00:00:00 2001
From: Sergey Konovalov <Sergey.Konovalov@onlyoffice.com>
Date: Wed, 27 Nov 2024 21:04:54 +0300
Subject: [PATCH 2/2] [pe] Fix double call of encryptPasswordParams with
 "savefromorigin" command; Fix bug 71858

---
 DocService/sources/DocsCoServer.js  | 2 --
 DocService/sources/canvasservice.js | 1 -
 2 files changed, 3 deletions(-)

diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
index 818d7e023..84903ab72 100644
--- a/DocService/sources/DocsCoServer.js
+++ b/DocService/sources/DocsCoServer.js
@@ -1561,8 +1561,6 @@ async function encryptPasswordParams(ctx, data) {
     dataWithPassword = data.message;
   } else if (data.type === 'auth' && data.openCmd) {
     dataWithPassword = data.openCmd;
-  } else if (data.c === 'savefromorigin') {
-    dataWithPassword = data;
   }
   if (dataWithPassword && dataWithPassword.password) {
     if (dataWithPassword.password.length > constants.PASSWORD_MAX_LENGTH) {
diff --git a/DocService/sources/canvasservice.js b/DocService/sources/canvasservice.js
index 3665b0265..92296e67a 100644
--- a/DocService/sources/canvasservice.js
+++ b/DocService/sources/canvasservice.js
@@ -1481,7 +1481,6 @@ exports.downloadAs = function(req, res) {
           yield* commandSave(ctx, cmd, outputData);
           break;
         case 'savefromorigin':
-          yield docsCoServer.encryptPasswordParams(ctx, cmd);
           yield* commandSaveFromOrigin(ctx, cmd, outputData, row && row.password);
           break;
         case 'sendmm':