From d5cb33579db8646ea0cfdb9ae5c3fe6bdb4232a9 Mon Sep 17 00:00:00 2001
From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com>
Date: Mon, 21 Aug 2023 18:05:07 +0500
Subject: [PATCH 1/7] fix Bug 63689 - Fix issue with adding administrators
 (#1647)

---
 build/install/win/DocSpace.aip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/install/win/DocSpace.aip b/build/install/win/DocSpace.aip
index 4d7421e93a..5969f7be8e 100644
--- a/build/install/win/DocSpace.aip
+++ b/build/install/win/DocSpace.aip
@@ -1060,7 +1060,7 @@
     <ROW Action="Set_DS_JWT_HEADER" Type="51" Source="DOCUMENT_SERVER_JWT_HEADER" Target="[JWT_HEADER]"/>
     <ROW Action="Set_DS_JWT_SECRET" Type="51" Source="DOCUMENT_SERVER_JWT_SECRET" Target="[JWT_SECRET]"/>
     <ROW Action="StartElasticSearchService" Type="3073" Source="aicustact.dll" Target="StartWinService" Options="1" AdditionalSeq="AI_DATA_SETTER_13"/>
-    <ROW Action="StartMigrationRunner" Type="3074" Source="viewer.exe" Target="/EnforcedRunAsAdmin /RunAsAdmin /HideWindow /dir &quot;[APPDIR]services\ASC.Migration.Runner\service&quot; &quot;[APPDIR]services\ASC.Migration.Runner\service\ASC.Migration.Runner.exe&quot;" Options="1"/>
+    <ROW Action="StartMigrationRunner" Type="3074" Source="viewer.exe" Target="/EnforcedRunAsAdmin /RunAsAdmin /HideWindow /dir &quot;[APPDIR]services\ASC.Migration.Runner\service&quot; &quot;[APPDIR]services\ASC.Migration.Runner\service\ASC.Migration.Runner.exe&quot; standalone=true" Options="1"/>
     <ROW Action="StartMySQLService" Type="1" Source="aicustact.dll" Target="StartWinService" Options="1" AdditionalSeq="AI_DATA_SETTER_11"/>
     <ROW Action="StartService" Type="3073" Source="aicustact.dll" Target="StartWinService" Options="1" AdditionalSeq="AI_DATA_SETTER_19"/>
     <ROW Action="StopElasticSearchService" Type="1" Source="aicustact.dll" Target="StopWinService" Options="1" AdditionalSeq="AI_DATA_SETTER_12"/>

From 4dcd8099d6b913384c4b60a93d790b1d5c863212 Mon Sep 17 00:00:00 2001
From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com>
Date: Mon, 21 Aug 2023 18:07:13 +0500
Subject: [PATCH 2/7] Reduce the install time in DocSpace msi build (#1611)

---
 build/install/win/DocSpace.aip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/install/win/DocSpace.aip b/build/install/win/DocSpace.aip
index 5969f7be8e..6dde825f79 100644
--- a/build/install/win/DocSpace.aip
+++ b/build/install/win/DocSpace.aip
@@ -51,7 +51,7 @@
     <ROW Property="JWT_ENABLED" Value="true"/>
     <ROW Property="JWT_HEADER" Value="Authorization"/>
     <ROW Property="Login_Port" Value="5011"/>
-    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3#ExeBuild:3"/>
+    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3#ExeBuild:7"/>
     <ROW Property="MYSQLODBCDRIVER" Value="MySQL ODBC 8.0 Unicode Driver"/>
     <ROW Property="Manufacturer" Value="Ascensio System SIA"/>
     <ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp#ExeBuild:vp"/>

From 195a1c7386f3049368491d687de7cef06011c790 Mon Sep 17 00:00:00 2001
From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:46:14 +0500
Subject: [PATCH 3/7] fix Bug 63642 - Fix issue with installing MySql (#1649)

---
 build/install/win/DocSpace.aip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/install/win/DocSpace.aip b/build/install/win/DocSpace.aip
index 6dde825f79..9a9f26e59d 100644
--- a/build/install/win/DocSpace.aip
+++ b/build/install/win/DocSpace.aip
@@ -1526,7 +1526,7 @@
     <ATTRIBUTE name="PrereqsOrder" value="B96F93FA27E74B02866727AAE83982D0 F3520F64DA5998338D97129FAD2 EA5B60A5CAD4115A8386D017CC889B9 CA62D813A4E74FA2AAE86A7D7B7B1493 A918597FE054CCCB65ABDBA0AD8F63C C4FE6FD5B7C4D07B3A313E754A9A6A8 RequiredApplication RequiredApplication_2 MySQLInstallerRunn RequiredApplication_1 RequiredApplication_4 Erlangv26.0x64 RequiredApplication_5 RequiredApplication_6 FFmpegx64 PostgreSQL_ODBC PostgresSQL DocumentServer"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
-    <ROW SearchKey="A918597FE054CCCB65ABDBA0AD8F63CSyst" Prereq="A918597FE054CCCB65ABDBA0AD8F63C" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum\Version" VerMin="14.26.28720" Order="1" Property="PreReqSearch_A918597FE054CCCB65ABDB"/>
+    <ROW SearchKey="A918597FE054CCCB65ABDBA0AD8F63CSyst" Prereq="A918597FE054CCCB65ABDBA0AD8F63C" SearchType="0" SearchString="[SystemFolder]vcruntime140.dll" VerMin="14.26.28720" Order="2" Property="PreReqSearch_A918597FE054CCCB65ABDB"/>
     <ROW SearchKey="A918597FE054CCCB65ABDBA0AD8F63CVers" Prereq="A918597FE054CCCB65ABDBA0AD8F63C" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum\Version" VerMin="14.26.28720" Order="1" Property="PreReqSearch_A918597FE054CCCB65ABDB"/>
     <ROW SearchKey="B96F93FA27E74B02866727AAE83982D0Rel" Prereq="B96F93FA27E74B02866727AAE83982D0" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G528048" Order="1" Property="PreReqSearch_B96F93FA27E74B02866727"/>
     <ROW SearchKey="C4FE6FD5B7C4D07B3A313E754A9A6A8Vers" Prereq="C4FE6FD5B7C4D07B3A313E754A9A6A8" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum\Version" VerMin="14.26.28720" Order="1" Property="PreReqSearch_C4FE6FD5B7C4D07B3A313E"/>

From 83d4daf9e1420b7635b37a90226b250e4e5d9f4c Mon Sep 17 00:00:00 2001
From: Timofey Boyko <timofey.boyko@onlyoffice.com>
Date: Tue, 22 Aug 2023 11:47:46 +0300
Subject: [PATCH 4/7] Fixed Bug 63730 - Rooms: Tags. Refresh page with active
 tag 'xss' view to fall

---
 packages/common/utils/index.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/common/utils/index.ts b/packages/common/utils/index.ts
index 9984823aff..5f46f00548 100644
--- a/packages/common/utils/index.ts
+++ b/packages/common/utils/index.ts
@@ -77,11 +77,16 @@ export function getObjectByLocation(location) {
     .replace(/\\\\"\]/g, '"]')
     .replace(/"\[/g, "[")
     .replace(/\]"/g, "]")
-    .replace(/\\\\",\\\\"/g, '","');
+    .replace(/\\\\",\\\\"/g, '","')
+    .replace(/\\\\\\\\"/g, '\\"');
 
-  const object = JSON.parse(`{"${decodedString}"}`);
+  try {
+    const object = JSON.parse(`{"${decodedString}"}`);
 
-  return object;
+    return object;
+  } catch (e) {
+    return {};
+  }
 }
 
 export function changeLanguage(i18n, currentLng = getCookie(LANGUAGE)) {

From f182292c44717253cc14de8bd85c73139b785a46 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <timofey.boyko@onlyoffice.com>
Date: Tue, 22 Aug 2023 12:16:14 +0300
Subject: [PATCH 5/7] Fixed Bug 63728 - Settings: Customization. Xss script
 inserted into the Welcome Page line breaks the authorization page.

---
 packages/login/src/server/lib/template.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/login/src/server/lib/template.ts b/packages/login/src/server/lib/template.ts
index dd42a6449c..d05abc5a57 100644
--- a/packages/login/src/server/lib/template.ts
+++ b/packages/login/src/server/lib/template.ts
@@ -49,9 +49,17 @@ const template: Template = (
       });
   }
 
+  const initialLoginStateStringify = JSON.stringify(initLoginState);
+
+  const initialLoginStateString = initialLoginStateStringify.includes(
+    "</script>"
+  )
+    ? initialLoginStateStringify.replace(/<\/script>/g, "<\\/script>")
+    : initialLoginStateStringify;
+
   const scripts = `   
     <script id="__ASC_INITIAL_LOGIN_STATE__">
-      window.__ASC_INITIAL_LOGIN_STATE__ = ${JSON.stringify(initLoginState)}
+      window.__ASC_INITIAL_LOGIN_STATE__ = ${initialLoginStateString}
     </script>
     <script id="__ASC_INITIAL_LOGIN_I18N__">
       window.initialI18nStoreASC = ${JSON.stringify(initialI18nStoreASC)}

From 3a2b455019c73430f9ccd696871f49c8404978ca Mon Sep 17 00:00:00 2001
From: Anton Sukhorukov <anton.sukhorukov@onlyoffice.com>
Date: Tue, 22 Aug 2023 13:15:34 +0300
Subject: [PATCH 6/7] Bug 63729 - Srv:Restore. restore from localfile

---
 common/ASC.Data.Backup.Core/BackupAjaxHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/ASC.Data.Backup.Core/BackupAjaxHandler.cs b/common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
index c0ef3c1bcd..61f22eb842 100644
--- a/common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
+++ b/common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
@@ -277,7 +277,7 @@ public class BackupAjaxHandler
             restoreRequest.StorageType = storageType;
             restoreRequest.FilePathOrId = storageParams["filePath"];
 
-            if (restoreRequest.StorageType == BackupStorageType.Local && !_coreBaseSettings.Standalone)
+            if (restoreRequest.StorageType == BackupStorageType.Local)
             {
                 restoreRequest.FilePathOrId = GetTmpFilePath();
             }

From 0b1bae97806c79b8f7e702e1586718b28ae853e8 Mon Sep 17 00:00:00 2001
From: Eloncase <gensurkin@yandex.ru>
Date: Mon, 10 Jul 2023 15:31:08 +0300
Subject: [PATCH 7/7] Files: move initialization from constructor to getter

---
 .../Core/Core/Compress/CompressToArchive.cs   | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/products/ASC.Files/Core/Core/Compress/CompressToArchive.cs b/products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
index 1b20c8e319..e25a767c4e 100644
--- a/products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
+++ b/products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
@@ -25,7 +25,6 @@
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
 namespace ASC.Web.Files.Core.Compress;
-using System.Threading.Tasks;
 
 /// <summary>
 /// Archives the data stream in the format selected in the settings
@@ -33,17 +32,32 @@ using System.Threading.Tasks;
 [Scope]
 public class CompressToArchive : ICompress
 {
-    private readonly ICompress _compress;
+    private readonly FilesSettingsHelper _settings;
+    private readonly CompressToTarGz _compressToTarGz;
+    private readonly CompressToZip _compressToZip;
 
     internal static readonly string TarExt = ".tar.gz";
     internal static readonly string ZipExt = ".zip";
-    private static readonly List<string> _exts = new List<string>(2) { TarExt, ZipExt };
+    private static readonly List<string> _exts = new List<string>(2) { TarExt, ZipExt };
+
+    private ICompress _compress;
+    private ICompress Compress
+    {
+        get
+        {
+            _compress ??= _settings.DownloadTarGz
+                    ? _compressToTarGz
+                    : _compressToZip;
+
+            return _compress;
+        }
+    }
 
     public CompressToArchive(FilesSettingsHelper filesSettings, CompressToTarGz compressToTarGz, CompressToZip compressToZip)
     {
-        _compress = filesSettings.DownloadTarGz
-            ? compressToTarGz
-            : compressToZip;
+        _settings = filesSettings;
+        _compressToTarGz = compressToTarGz;
+        _compressToZip = compressToZip;
     }
 
     public string GetExt(string ext)
@@ -58,7 +72,7 @@ public class CompressToArchive : ICompress
 
     public void SetStream(Stream stream)
     {
-        _compress.SetStream(stream);
+        Compress.SetStream(stream);
     }
 
     /// <summary>
@@ -68,21 +82,21 @@ public class CompressToArchive : ICompress
     /// <param name="lastModification"></param>
     public void CreateEntry(string title, DateTime? lastModification = null)
     {
-        _compress.CreateEntry(title, lastModification);
+        Compress.CreateEntry(title, lastModification);
     }
 
     /// <summary>
     /// Transfer the file itself to the archive
     /// </summary>
     /// <param name="readStream">File data</param>
-        public async Task PutStream(Stream readStream) => await _compress.PutStream(readStream);
+    public async Task PutStream(Stream readStream) => await Compress.PutStream(readStream);
 
     /// <summary>
     /// Put an entry on the output stream.
     /// </summary>
     public void PutNextEntry()
     {
-        _compress.PutNextEntry();
+        Compress.PutNextEntry();
     }
 
     /// <summary>
@@ -90,24 +104,27 @@ public class CompressToArchive : ICompress
     /// </summary>
     public void CloseEntry()
     {
-        _compress.CloseEntry();
+        Compress.CloseEntry();
     }
 
     /// <summary>
     /// Resource title (does not affect the work of the class)
     /// </summary>
     /// <returns></returns>
-    public string Title => _compress.Title;
+    public string Title => Compress.Title;
 
     /// <summary>
     /// Extension the archive (does not affect the work of the class)
     /// </summary>
     /// <returns></returns>
-    public string ArchiveExtension => _compress.ArchiveExtension;
+    public string ArchiveExtension => Compress.ArchiveExtension;
 
     /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
     public void Dispose()
     {
-        _compress.Dispose();
+        if (_compress != null)
+        {
+            _compress.Dispose();
+        }
     }
 }