Feature/backup.core

ASC.Web.sln

@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -57,8 +58,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Feed.Aggregator", "comm
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Thumbnails.Svc", "common\services\ASC.Thumbnails.Svc\ASC.Thumbnails.Svc.csproj", "{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup", "common\services\ASC.Data.Backup\ASC.Data.Backup.csproj", "{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Files.Core", "products\ASC.Files\Core\ASC.Files.Core.csproj", "{F0A39728-940D-4DBE-A37A-05D4EB57F342}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Socket.IO.Svc", "common\services\ASC.Socket.IO.Svc\ASC.Socket.IO.Svc.csproj", "{2DADEAD3-0FE9-4199-9817-41A32E6BF450}"
@@ -88,12 +87,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Radicale", "common\serv
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.SsoAuth.Svc", "common\services\ASC.SsoAuth.Svc\ASC.SsoAuth.Svc.csproj", "{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Web.HealthChecks.UI", "web\ASC.Web.HealthChecks.UI\ASC.Web.HealthChecks.UI.csproj", "{0C1A387E-0CD0-4BE8-82FC-9FCAD05BF289}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Web.HealthChecks.UI", "web\ASC.Web.HealthChecks.UI\ASC.Web.HealthChecks.UI.csproj", "{0C1A387E-0CD0-4BE8-82FC-9FCAD05BF289}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.ClearEvents", "common\services\ASC.ClearEvents\ASC.ClearEvents.csproj", "{448221A8-EABA-4200-9192-E08BF241A487}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.CRM.BackgroundTasks", "products\ASC.CRM\BackgroundTasks\ASC.CRM.BackgroundTasks.csproj", "{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup.Core", "common\ASC.Data.Backup.Core\ASC.Data.Backup.Core.csproj", "{F5D9DE01-06CD-4881-9F41-46882E9ED45C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup", "common\services\ASC.Data.Backup\ASC.Data.Backup.csproj", "{027EEE53-7491-48F4-B467-6404D68798A7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -204,10 +207,6 @@ Global
 		{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -244,14 +243,14 @@ Global
 		{277F4A2C-07CC-4BC5-B4F3-9695BB2DFFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{277F4A2C-07CC-4BC5-B4F3-9695BB2DFFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{277F4A2C-07CC-4BC5-B4F3-9695BB2DFFB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Release|Any CPU.Build.0 = Release|Any CPU
 		{74998718-3C9A-4A89-B834-14453762C60F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74998718-3C9A-4A89-B834-14453762C60F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74998718-3C9A-4A89-B834-14453762C60F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74998718-3C9A-4A89-B834-14453762C60F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{137CA67B-D0F5-4746-B8BC-1888D2859B90}.Release|Any CPU.Build.0 = Release|Any CPU	
 		{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -268,6 +267,14 @@ Global
 		{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{027EEE53-7491-48F4-B467-6404D68798A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{027EEE53-7491-48F4-B467-6404D68798A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{027EEE53-7491-48F4-B467-6404D68798A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{027EEE53-7491-48F4-B467-6404D68798A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj

@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <NoWarn>NU1701</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="protos\BackupProgress.proto" />
+    <None Remove="protos\DeleteSchedule.proto" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Google.Protobuf" Version="3.13.0" />
+    <PackageReference Include="Grpc" Version="2.32.0">
+      <TreatAsUsed>true</TreatAsUsed>
+    </PackageReference>
+    <PackageReference Include="Grpc.Tools" Version="2.32.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
+    <PackageReference Include="MySql.Data" Version="8.0.23" />
+    <PackageReference Include="SharpZipLib" Version="1.3.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\products\ASC.Files\Core\ASC.Files.Core.csproj" />
+    <ProjectReference Include="..\ASC.Data.Storage\ASC.Data.Storage.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Protobuf Include="protos\BackupProgress.proto" />
+    <Protobuf Include="protos\DeleteSchedule.proto" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="BackupResource.Designer.cs">
+      <DependentUpon>BackupResource.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="BackupResource.resx">
+      <LastGenOutput>BackupResource.Designer.cs</LastGenOutput>
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+</Project>

common/services/ASC.Data.Backup/ActionInvoker.cs → common/ASC.Data.Backup.Core/ActionInvoker.cs

@@ -32,7 +32,7 @@ namespace ASC.Data.Backup
     public static class ActionInvoker
     {
         public static void Try(
-            Action action,
+            Action action,
             int maxAttempts,
             Action<Exception> onFailure = null,
             Action<Exception> onAttemptFailure = null,
@@ -65,13 +65,13 @@ public static void Try(
                 catch (Exception error)
                 {
                     if (countAttempts < maxAttempts)
-                    {
+                    {
                         onAttemptFailure?.Invoke(error);
 
-                        if (sleepMs > 0)
+                        if (sleepMs > 0)
                             Thread.Sleep(isSleepExponential ? sleepMs * countAttempts : sleepMs);
                     }
-                    else
+                    else
                     {
                         onFailure?.Invoke(error);
                     }

common/services/ASC.Data.Backup/BackupAjaxHandler.cs → common/ASC.Data.Backup.Core/BackupAjaxHandler.cs

@@ -1,24 +1,24 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-
-using ASC.Api.Utils;
+using System.Linq;
+
+using ASC.Api.Utils;
 using ASC.Common;
 using ASC.Core;
 using ASC.Core.Billing;
 using ASC.Core.Common.Configuration;
 using ASC.Core.Users;
-using ASC.Data.Backup.Contracts;
-using ASC.Data.Backup.Service;
+using ASC.Data.Backup.Contracts;
+using ASC.Data.Backup.Service;
 using ASC.MessagingSystem;
 using ASC.Notify.Cron;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Studio.Core;
-using ASC.Web.Studio.Core.Backup;
-using ASC.Web.Studio.Utility;
+using ASC.Web.Studio.Core.Backup;
+using ASC.Web.Studio.Utility;
 
 namespace ASC.Data.Backup
-{
+{
     [Scope]
     public class BackupAjaxHandler
     {
@@ -30,23 +30,23 @@ public class BackupAjaxHandler
         private SecurityContext SecurityContext { get; }
         private UserManager UserManager { get; }
         private TenantExtra TenantExtra { get; }
-        private ConsumerFactory ConsumerFactory { get; }
-        private BackupFileUploadHandler BackupFileUploadHandler { get; }
-        private BackupService BackupService { get; }
+        private ConsumerFactory ConsumerFactory { get; }
+        private BackupFileUploadHandler BackupFileUploadHandler { get; }
+        private BackupService BackupService { get; }
 
         #region backup
 
-        public BackupAjaxHandler(
-            BackupService backupService,
-            TenantManager tenantManager,
-            MessageService messageService,
-            CoreBaseSettings coreBaseSettings,
-            CoreConfiguration coreConfiguration,
-            PermissionContext permissionContext,
-            SecurityContext securityContext,
-            UserManager userManager,
-            TenantExtra tenantExtra,
-            ConsumerFactory consumerFactory,
+        public BackupAjaxHandler(
+            BackupService backupService,
+            TenantManager tenantManager,
+            MessageService messageService,
+            CoreBaseSettings coreBaseSettings,
+            CoreConfiguration coreConfiguration,
+            PermissionContext permissionContext,
+            SecurityContext securityContext,
+            UserManager userManager,
+            TenantExtra tenantExtra,
+            ConsumerFactory consumerFactory,
             BackupFileUploadHandler backupFileUploadHandler)
         {
             TenantManager = tenantManager;
@@ -57,8 +57,8 @@ public BackupAjaxHandler(
             SecurityContext = securityContext;
             UserManager = userManager;
             TenantExtra = tenantExtra;
-            ConsumerFactory = consumerFactory;
-            BackupFileUploadHandler = backupFileUploadHandler;
+            ConsumerFactory = consumerFactory;
+            BackupFileUploadHandler = backupFileUploadHandler;
             BackupService = backupService;
         }
 
@@ -71,7 +71,7 @@ public void StartBackup(BackupStorageType storageType, Dictionary<string, string
                 TenantId = GetCurrentTenantId(),
                 UserId = SecurityContext.CurrentAccount.ID,
                 BackupMail = backupMail,
-                StorageType = storageType,
+                StorageType = storageType,
                 StorageParams = storageParams
             };
 
@@ -87,22 +87,22 @@ public void StartBackup(BackupStorageType storageType, Dictionary<string, string
                     break;
             }
 
-            MessageService.Send(MessageAction.StartBackupSetting);
-
+            MessageService.Send(MessageAction.StartBackupSetting);
+
             BackupService.StartBackup(backupRequest);
         }
 
         public BackupProgress GetBackupProgress()
         {
-            DemandPermissionsBackup();
-
+            DemandPermissionsBackup();
+
             return BackupService.GetBackupProgress(GetCurrentTenantId());
         }
 
         public BackupProgress GetBackupProgress(int tenantId)
         {
-            DemandPermissionsBackup();
-
+            DemandPermissionsBackup();
+
             return BackupService.GetBackupProgress(tenantId);
         }
 
@@ -141,10 +141,10 @@ public void CreateSchedule(BackupStorageType storageType, Dictionary<string, str
                 BackupMail = backupMail,
                 Cron = cronParams.ToString(),
                 NumberOfBackupsStored = backupsStored,
-                StorageType = storageType,
+                StorageType = storageType,
                 StorageParams = storageParams
-            };
-
+            };
+
             switch (storageType)
             {
                 case BackupStorageType.ThridpartyDocuments:
@@ -206,7 +206,7 @@ public Schedule GetSchedule()
                     BackupMail = schedule.BackupMail != null && (bool)schedule.BackupMail,
                     Cron = schedule.CronParams.ToString(),
                     NumberOfBackupsStored = schedule.BackupsStored == null ? 0 : (int)schedule.BackupsStored,
-                    StorageType = schedule.StorageType,
+                    StorageType = schedule.StorageType,
                     StorageParams = schedule.StorageParams
                 };
 
@@ -248,7 +248,7 @@ public void StartRestore(string backupId, BackupStorageType storageType, Diction
             var restoreRequest = new StartRestoreRequest
             {
                 TenantId = GetCurrentTenantId(),
-                NotifyAfterCompletion = notify,
+                NotifyAfterCompletion = notify,
                 StorageParams = storageParams
             };
 
@@ -259,13 +259,13 @@ public void StartRestore(string backupId, BackupStorageType storageType, Diction
             else
             {
                 restoreRequest.StorageType = storageType;
-                restoreRequest.FilePathOrId = storageParams["filePath"];
-
-                if (restoreRequest.StorageType == BackupStorageType.Local && !CoreBaseSettings.Standalone)
-                {
-                    restoreRequest.FilePathOrId = BackupFileUploadHandler.GetFilePath();
+                restoreRequest.FilePathOrId = storageParams["filePath"];
+
+                if (restoreRequest.StorageType == BackupStorageType.Local && !CoreBaseSettings.Standalone)
+                {
+                    restoreRequest.FilePathOrId = BackupFileUploadHandler.GetFilePath();
                 }
-            }
+            }
 
             BackupService.StartRestore(restoreRequest);
         }
@@ -282,9 +282,9 @@ public BackupProgress GetRestoreProgress()
 
         private void DemandPermissionsRestore()
         {
-            PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
-
-            if (!SetupInfo.IsVisibleSettings("Restore") ||
+            PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
+
+            if (!SetupInfo.IsVisibleSettings("Restore") ||
                 (!CoreBaseSettings.Standalone && !TenantManager.GetTenantQuota(TenantManager.GetCurrentTenant().TenantId).Restore))
                 throw new BillingException(Resource.ErrorNotAllowedOption, "Restore");
         }
@@ -310,7 +310,7 @@ public void StartTransfer(string targetRegion, bool notifyUsers, bool transferMa
         }
 
         public BackupProgress GetTransferProgress()
-        {
+        {
             return BackupService.GetTransferProgress(GetCurrentTenantId());
         }
 
@@ -384,13 +384,13 @@ public CronParams(string cronString)
 
             public override string ToString()
             {
-                return Period switch
-                {
-                    BackupPeriod.EveryDay => string.Format("0 0 {0} ? * *", Hour),
-                    BackupPeriod.EveryMonth => string.Format("0 0 {0} {1} * ?", Hour, Day),
-                    BackupPeriod.EveryWeek => string.Format("0 0 {0} ? * {1}", Hour, Day),
-                    _ => base.ToString(),
-                };
+                return Period switch
+                {
+                    BackupPeriod.EveryDay => string.Format("0 0 {0} ? * *", Hour),
+                    BackupPeriod.EveryMonth => string.Format("0 0 {0} {1} * ?", Hour, Day),
+                    BackupPeriod.EveryWeek => string.Format("0 0 {0} ? * {1}", Hour, Day),
+                    _ => base.ToString(),
+                };
             }
         }