Feature/backup

common/ASC.Api.Core/Middleware/TenantStatusFilter.cs

@@ -1,4 +1,6 @@
-using System.Net;
+using System;
+using System.Linq;
+using System.Net;
 
 using ASC.Common;
 using ASC.Common.Logging;
@@ -15,6 +17,8 @@ namespace ASC.Api.Core.Middleware
     public class TenantStatusFilter : IResourceFilter
     {
         private readonly ILog log;
+        private readonly string[] passthroughtRequestEndings = new[] { "preparation-portal", "getrestoreprogress", "settings", "settings.json" }; //TODO add or update when "preparation-portal" will be done
+
 
         public TenantStatusFilter(IOptionsMonitor<ILog> options, TenantManager tenantManager)
         {
@@ -44,6 +48,17 @@ public void OnResourceExecuting(ResourceExecutingContext context)
                 log.WarnFormat("Tenant {0} is not removed or suspended", tenant.TenantId);
                 return;
             }
+
+            if (tenant.Status == TenantStatus.Transfering || tenant.Status == TenantStatus.Restoring)
+            {
+                if (passthroughtRequestEndings.Any(path => context.HttpContext.Request.Path.ToString().EndsWith(path, StringComparison.InvariantCultureIgnoreCase)))
+                {
+                    return;
+                }
+                context.Result = new StatusCodeResult((int)HttpStatusCode.Forbidden);
+                log.WarnFormat("Tenant {0} is {1}", tenant.TenantId, tenant.Status);
+                return;
+            }
         }
     }
 }

common/ASC.Common/Threading/DistributedTaskQueue.cs

@@ -178,7 +178,7 @@ public void QueueTask(DistributedTaskProgress taskProgress)
         }
 
         public void QueueTask(Action<DistributedTask, CancellationToken> action, DistributedTask distributedTask = null)
-        {
+        {   
             if (distributedTask == null)
             {
                 distributedTask = new DistributedTask();
@@ -329,7 +329,10 @@ private void OnCompleted(Task task, string id)
             if (distributedTask != null)
             {
                 distributedTask.Status = DistributedTaskStatus.Completed;
-                distributedTask.Exception = task.Exception;
+                if (task.Exception != null)
+                {
+                    distributedTask.Exception = task.Exception;
+                }
                 if (task.IsFaulted)
                 {
                     distributedTask.Status = DistributedTaskStatus.Failted;

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
 using ASC.Api.Utils;
@@ -14,7 +15,6 @@
 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;
 
 namespace ASC.Data.Backup
@@ -31,8 +31,11 @@ public class BackupAjaxHandler
         private UserManager UserManager { get; }
         private TenantExtra TenantExtra { get; }
         private ConsumerFactory ConsumerFactory { get; }
-        private BackupFileUploadHandler BackupFileUploadHandler { get; }
         private BackupService BackupService { get; }
+        private TempPath TempPath { get; }
+
+        private const string BackupTempFolder = "backup";
+        private const string BackupFileName = "backup.tmp";
 
         #region backup
 
@@ -47,7 +50,7 @@ public BackupAjaxHandler(
             UserManager userManager,
             TenantExtra tenantExtra,
             ConsumerFactory consumerFactory,
-            BackupFileUploadHandler backupFileUploadHandler)
+            TempPath tempPath)
         {
             TenantManager = tenantManager;
             MessageService = messageService;
@@ -58,8 +61,8 @@ public BackupAjaxHandler(
             UserManager = userManager;
             TenantExtra = tenantExtra;
             ConsumerFactory = consumerFactory;
-            BackupFileUploadHandler = backupFileUploadHandler;
             BackupService = backupService;
+            TempPath = tempPath;
         }
 
         public void StartBackup(BackupStorageType storageType, Dictionary<string, string> storageParams, bool backupMail)
@@ -263,7 +266,7 @@ public void StartRestore(string backupId, BackupStorageType storageType, Diction
 
                 if (restoreRequest.StorageType == BackupStorageType.Local && !CoreBaseSettings.Standalone)
                 {
-                    restoreRequest.FilePathOrId = BackupFileUploadHandler.GetFilePath();
+                    restoreRequest.FilePathOrId = GetTmpFilePath();
                 }
             }
 
@@ -280,7 +283,7 @@ public BackupProgress GetRestoreProgress()
             return result;
         }
 
-        private void DemandPermissionsRestore()
+        public void DemandPermissionsRestore()
         {
             PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
 
@@ -289,6 +292,15 @@ private void DemandPermissionsRestore()
                 throw new BillingException(Resource.ErrorNotAllowedOption, "Restore");
         }
 
+        public void DemandPermissionsAutoBackup()
+        {
+            PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
+
+            if (!SetupInfo.IsVisibleSettings("AutoBackup") ||
+                (!CoreBaseSettings.Standalone && !TenantManager.GetTenantQuota(TenantManager.GetCurrentTenant().TenantId).AutoBackup))
+                throw new BillingException(Resource.ErrorNotAllowedOption, "AutoBackup");
+        }
+
         #endregion
 
         #region transfer
@@ -342,6 +354,18 @@ private int GetCurrentTenantId()
             return TenantManager.GetCurrentTenant().TenantId;
         }
 
+        public string GetTmpFilePath()
+        {
+            var folder = Path.Combine(TempPath.GetTempPath(), BackupTempFolder, TenantManager.GetCurrentTenant().TenantId.ToString());
+
+            if (!Directory.Exists(folder))
+            {
+                Directory.CreateDirectory(folder);
+            }
+
+            return Path.Combine(folder, BackupFileName);
+        }
+
         public class Schedule
         {
             public BackupStorageType StorageType { get; set; }

common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs

@@ -17,55 +17,52 @@
 
 using System;
 using System.IO;
+using System.Text.Json;
+using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Core;
+using ASC.Web.Core.Utility;
+using ASC.Web.Studio.Core;
 
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 
-namespace ASC.Web.Studio.Core.Backup
+namespace ASC.Data.Backup
 {
-    [Scope]
     public class BackupFileUploadHandler
     {
         private const long MaxBackupFileSize = 1024L * 1024L * 1024L;
-        private const string BackupTempFolder = "backup";
-        private const string BackupFileName = "backup.tmp";
 
-        private PermissionContext PermissionContext { get; }
-        private TempPath TempPath { get; }
-        private TenantManager TenantManager { get; }
-
-        public BackupFileUploadHandler(
-            PermissionContext permissionContext,
-            TempPath tempPath,
-            TenantManager tenantManager)
+        public BackupFileUploadHandler(RequestDelegate next)
         {
-            PermissionContext = permissionContext;
-            TempPath = tempPath;
-            TenantManager = tenantManager;
-        }
 
-        public string ProcessUpload(IFormFile file)
+        }
+        public async Task Invoke(HttpContext context,
+            PermissionContext permissionContext,
+            BackupAjaxHandler backupAjaxHandler)
         {
-            if (file == null)
+            FileUploadResult result = null;
+            try
+            {
+            if (context.Request.Form.Files.Count == 0)
             {
-                return "No files.";
+                result = Error("No files.");
             }
 
-            if (!PermissionContext.CheckPermissions(SecutiryConstants.EditPortalSettings))
+            if (!permissionContext.CheckPermissions(SecutiryConstants.EditPortalSettings))
             {
-                return "Access denied.";
+                result = Error("Access denied.");
             }
 
+            var file = context.Request.Form.Files[0];
+
             if (file.Length <= 0 || file.Length > MaxBackupFileSize)
             {
-                return $"File size must be greater than 0 and less than {MaxBackupFileSize} bytes";
+                result = Error($"File size must be greater than 0 and less than {MaxBackupFileSize} bytes");
             }
 
-            try
-            {
-                var filePath = GetFilePath();
+
+                var filePath = backupAjaxHandler.GetTmpFilePath();
 
                 if (File.Exists(filePath))
                 {
@@ -74,27 +71,42 @@ public string ProcessUpload(IFormFile file)
 
                 using (var fileStream = File.Create(filePath))
                 {
-                    file.CopyTo(fileStream);
+                    await file.CopyToAsync(fileStream);
                 }
 
-                return string.Empty;
+                result = Success();
             }
             catch (Exception error)
             {
-                return error.Message;
+                result = Error(error.Message);
             }
+
+            await context.Response.WriteAsync(JsonSerializer.Serialize(result));
         }
 
-        internal string GetFilePath()
+        private FileUploadResult Success()
         {
-            var folder = Path.Combine(TempPath.GetTempPath(), BackupTempFolder, TenantManager.GetCurrentTenant().TenantId.ToString());
+            return new FileUploadResult
+            {
+                Success = true
+            };
+        }
 
-            if (!Directory.Exists(folder))
+        private FileUploadResult Error(string messageFormat, params object[] args)
+        {
+            return new FileUploadResult
             {
-                Directory.CreateDirectory(folder);
-            }
+                Success = false,
+                Message = string.Format(messageFormat, args)
+            };
+        }
+    }
 
-            return Path.Combine(folder, BackupFileName);
+    public static class BackupFileUploadHandlerExtensions
+    {
+        public static IApplicationBuilder UseBackupFileUploadHandler(this IApplicationBuilder builder)
+        {
+            return builder.UseMiddleware<BackupFileUploadHandler>();
         }
     }
 }