Skip to content

Commit

Permalink
Merge branch 'develop' into feature/mobile-main-button
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexeySafronov
AlexeySafronov committed Dec 27, 2021
2 parents 1fb23a1 + 5e088d3 commit ec3c7ad
Show file tree
Hide file tree
Showing 23 changed files with 1,022 additions and 897 deletions.
8 changes: 4 additions & 4 deletions build/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pipeline {
}
stage('Backend') {
steps {
sh 'dotnet build -c Release ASC.Web.sln'
sh 'dotnet build -c Release ASC.Web.slnf'
}
}
}
Expand All @@ -28,7 +28,7 @@ pipeline {
}
stage('Backend') {
steps {
bat 'dotnet build -c Release ASC.Web.sln'
bat 'dotnet build -c Release ASC.Web.slnf'
}
}
}
Expand Down Expand Up @@ -62,7 +62,7 @@ pipeline {
}
stage('Files') {
steps {
sh "git submodule update --progress --init -- products/ASC.Files/Server/DocStore && dotnet build ASC.Web.sln && cd ${env.WORKSPACE}/products/ASC.Files/Tests/ && dotnet test ASC.Files.Tests.csproj -r linux-x64 -l \"console;verbosity=detailed\""
sh "git submodule update --progress --init -- products/ASC.Files/Server/DocStore && dotnet build ASC.Web.slnf && cd ${env.WORKSPACE}/products/ASC.Files/Tests/ && dotnet test ASC.Files.Tests.csproj -r linux-x64 -l \"console;verbosity=detailed\""
}
}
}
Expand Down Expand Up @@ -90,7 +90,7 @@ pipeline {
}
stage('Files') {
steps {
bat "git submodule update --progress --init -- products\\ASC.Files\\Server\\DocStore && dotnet build ASC.Web.sln && cd ${env.WORKSPACE}\\products\\ASC.Files\\Tests\\ && dotnet test ASC.Files.Tests.csproj"
bat "git submodule update --progress --init -- products\\ASC.Files\\Server\\DocStore && dotnet build ASC.Web.slnf && cd ${env.WORKSPACE}\\products\\ASC.Files\\Tests\\ && dotnet test ASC.Files.Tests.csproj"
}
}
}
Expand Down
16 changes: 9 additions & 7 deletions common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ public override void OnResultExecuted(ResultExecutedContext context)
base.OnResultExecuted(context);
return;
}

var result = (ObjectResult)context.Result;
var resultContent = JsonSerializer.Serialize(result.Value, jsonSerializerOptions);

var eventName = $"method: {method}, route: {routePattern}";

WebhookPublisher.Publish(eventName, resultContent);

if (context.Result is ObjectResult objectResult)
{
var resultContent = JsonSerializer.Serialize(objectResult.Value, jsonSerializerOptions);

var eventName = $"method: {method}, route: {routePattern}";

WebhookPublisher.Publish(eventName, resultContent);
}

base.OnResultExecuted(context);
}
Expand Down
31 changes: 12 additions & 19 deletions common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ namespace ASC.Security.Cryptography
[Singletone]
public class InstanceCrypto
{
private MachinePseudoKeys MachinePseudoKeys { get; }
private byte[] EKey { get; }

public InstanceCrypto(MachinePseudoKeys machinePseudoKeys)
{
MachinePseudoKeys = machinePseudoKeys;
EKey = machinePseudoKeys.GetMachineConstant(32);
}

public string Encrypt(string data)
Expand All @@ -50,8 +50,8 @@ public string Encrypt(string data)

public byte[] Encrypt(byte[] data)
{
var hasher = Aes.Create();
hasher.Key = EKey();
using var hasher = Aes.Create();
hasher.Key = EKey;
hasher.IV = new byte[hasher.BlockSize >> 3];

using var ms = new MemoryStream();
Expand All @@ -70,24 +70,17 @@ public string Decrypt(string data)

public string Decrypt(byte[] data)
{
var hasher = Aes.Create();
hasher.Key = EKey();
using var hasher = Aes.Create();
hasher.Key = EKey;
hasher.IV = new byte[hasher.BlockSize >> 3];

using (MemoryStream msDecrypt = new MemoryStream(data))
using (CryptoStream csDecrypt = new CryptoStream(msDecrypt, hasher.CreateDecryptor(), CryptoStreamMode.Read))
using (StreamReader srDecrypt = new StreamReader(csDecrypt))
{
using var msDecrypt = new MemoryStream(data);
using var csDecrypt = new CryptoStream(msDecrypt, hasher.CreateDecryptor(), CryptoStreamMode.Read);
using var srDecrypt = new StreamReader(csDecrypt);

// Read the decrypted bytes from the decrypting stream
// and place them in a string.
return srDecrypt.ReadToEnd();
}
}

private byte[] EKey()
{
return MachinePseudoKeys.GetMachineConstant(32);
// Read the decrypted bytes from the decrypting stream
// and place them in a string.
return srDecrypt.ReadToEnd();
}
}
}
8 changes: 4 additions & 4 deletions common/ASC.Core.Common/Data/DbQuotaService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ public void Configure(DbQuotaService options)
[Scope]
class DbQuotaService : IQuotaService
{
private Expression<Func<DbQuota, TenantQuota>> FromDbQuotaToTenantQuota { get; set; }
private Expression<Func<DbQuotaRow, TenantQuotaRow>> FromDbQuotaRowToTenantQuotaRow { get; set; }
private static Expression<Func<DbQuota, TenantQuota>> FromDbQuotaToTenantQuota { get; set; }
private static Expression<Func<DbQuotaRow, TenantQuotaRow>> FromDbQuotaRowToTenantQuotaRow { get; set; }
internal CoreDbContext CoreDbContext { get => LazyCoreDbContext.Value; }
internal Lazy<CoreDbContext> LazyCoreDbContext { get; set; }

public DbQuotaService()
static DbQuotaService()
{
FromDbQuotaToTenantQuota = r => new TenantQuota()
{
Expand All @@ -91,7 +91,7 @@ public DbQuotaService()
};
}

public DbQuotaService(DbContextManager<CoreDbContext> dbContextManager) : this()
public DbQuotaService(DbContextManager<CoreDbContext> dbContextManager)
{
LazyCoreDbContext = new Lazy<CoreDbContext>(() => dbContextManager.Value);
}
Expand Down
2 changes: 1 addition & 1 deletion common/ASC.Core.Common/EF/Context/BaseDbContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
optionsBuilder.UseLoggerFactory(LoggerFactory);
optionsBuilder.EnableSensitiveDataLogging();
Provider = GetProviderByConnectionString();
Provider = GetProviderByConnectionString();
switch (Provider)
{
case Provider.MySql:
Expand Down
4 changes: 3 additions & 1 deletion common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,20 @@ public class ConfigureDbContext<T> : IConfigureNamedOptions<T> where T : BaseDbC
public const string baseName = "default";
private EFLoggerFactory LoggerFactory { get; }
private ConfigurationExtension Configuration { get; }
private string MigrateAssembly { get; }

public ConfigureDbContext(EFLoggerFactory loggerFactory, ConfigurationExtension configuration)
{
LoggerFactory = loggerFactory;
Configuration = configuration;
MigrateAssembly = Configuration["testAssembly"];
}

public void Configure(string name, T context)
{
context.LoggerFactory = LoggerFactory;
context.ConnectionStringSettings = Configuration.GetConnectionStrings(name) ?? Configuration.GetConnectionStrings(baseName);
context.MigrateAssembly = Configuration["testAssembly"];
context.MigrateAssembly = MigrateAssembly;
}

public void Configure(T context)
Expand Down
2 changes: 1 addition & 1 deletion common/ASC.Data.Storage/PathUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public string ResolveVirtualPath(string virtPath, bool addTrailingSlash = true)
virtPath = "";
}

if (virtPath.StartsWith("~") && !Uri.IsWellFormedUriString(virtPath, UriKind.Absolute))
if (virtPath.StartsWith('~') && !Uri.IsWellFormedUriString(virtPath, UriKind.Absolute))
{
var rootPath = "/";
if (!string.IsNullOrEmpty(WebHostEnvironment?.WebRootPath) && WebHostEnvironment?.WebRootPath.Length > 1)
Expand Down
57 changes: 14 additions & 43 deletions common/ASC.FederatedLogin/OAuth20Token.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,37 @@

using System;
using System.Diagnostics;
using System.Globalization;
using System.Text;

using Newtonsoft.Json.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;

namespace ASC.FederatedLogin
{
[DebuggerDisplay("{AccessToken} (expired: {IsExpired})")]
public class OAuth20Token
{
[JsonPropertyName("access_token")]
public string AccessToken { get; set; }

[JsonPropertyName("refresh_token")]
public string RefreshToken { get; set; }

[JsonPropertyName("expires_in")]
[JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
public long ExpiresIn { get; set; }

[JsonPropertyName("client_id")]
public string ClientID { get; set; }

[JsonPropertyName("client_secret")]
public string ClientSecret { get; set; }

[JsonPropertyName("redirect_uri")]
public string RedirectUri { get; set; }

[JsonPropertyName("timestamp")]
public DateTime Timestamp { get; set; }

[JsonIgnore]
public string OriginJson { get; set; }

public OAuth20Token()
Expand Down Expand Up @@ -92,55 +99,19 @@ public bool IsExpired
public static OAuth20Token FromJson(string json)
{
if (string.IsNullOrEmpty(json)) return null;
var parser = JObject.Parse(json);
if (parser == null) return null;

var accessToken = parser.Value<string>("access_token");

if (string.IsNullOrEmpty(accessToken))
return null;

var token = new OAuth20Token
{
AccessToken = accessToken,
RefreshToken = parser.Value<string>("refresh_token"),
ClientID = parser.Value<string>("client_id"),
ClientSecret = parser.Value<string>("client_secret"),
RedirectUri = parser.Value<string>("redirect_uri"),
OriginJson = json,
};

if (long.TryParse(parser.Value<string>("expires_in"), out var expiresIn))
token.ExpiresIn = expiresIn;

try
{
token.Timestamp =
!string.IsNullOrEmpty(parser.Value<string>("timestamp"))
? parser.Value<DateTime>("timestamp")
: DateTime.UtcNow;
return JsonSerializer.Deserialize<OAuth20Token>(json);
}
catch (Exception)
{
token.Timestamp = DateTime.MinValue;
return null;
}

return token;
}

public string ToJson()
{
var sb = new StringBuilder();
sb.Append("{");
sb.AppendFormat(" \"access_token\": \"{0}\"", AccessToken);
sb.AppendFormat(", \"refresh_token\": \"{0}\"", RefreshToken);
sb.AppendFormat(", \"expires_in\": \"{0}\"", ExpiresIn);
sb.AppendFormat(", \"client_id\": \"{0}\"", ClientID);
sb.AppendFormat(", \"client_secret\": \"{0}\"", ClientSecret);
sb.AppendFormat(", \"redirect_uri\": \"{0}\"", RedirectUri);
sb.AppendFormat(", \"timestamp\": \"{0}\"", Timestamp.ToString("o", new CultureInfo("en-US")));
sb.Append("}");
return sb.ToString();
return JsonSerializer.Serialize(this);
}

public override string ToString()
Expand Down
5 changes: 2 additions & 3 deletions common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
using ASC.Common;
using ASC.Common.Caching;
using ASC.Common.Logging;
using ASC.Common.Utils;
using ASC.Core;
using ASC.Core.Common.EF;
using ASC.Core.Common.EF.Context;
Expand Down Expand Up @@ -103,14 +102,14 @@ public class BaseIndexer<T> where T : class, ISearchItem
DbContextManager<WebstudioDbContext> dbContextManager,
TenantManager tenantManager,
BaseIndexerHelper baseIndexerHelper,
ConfigurationExtension configurationExtension,
SettingsHelper settingsHelper,
IServiceProvider serviceProvider)
{
Client = client;
Log = log.CurrentValue;
TenantManager = tenantManager;
BaseIndexerHelper = baseIndexerHelper;
Settings = Settings.GetInstance(configurationExtension);
Settings = settingsHelper.Settings;
ServiceProvider = serviceProvider;
LazyWebstudioDbContext = new Lazy<WebstudioDbContext>(() => dbContextManager.Value);
}
Expand Down
5 changes: 2 additions & 3 deletions common/services/ASC.ElasticSearch/Engine/Client.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

using ASC.Common;
using ASC.Common.Logging;
using ASC.Common.Utils;
using ASC.Core;
using ASC.Core.Tenants;
using ASC.ElasticSearch.Service;
Expand All @@ -54,11 +53,11 @@ public class Client
private CoreConfiguration CoreConfiguration { get; }
private Settings Settings { get; }

public Client(IOptionsMonitor<ILog> option, CoreConfiguration coreConfiguration, ConfigurationExtension configurationExtension)
public Client(IOptionsMonitor<ILog> option, CoreConfiguration coreConfiguration, SettingsHelper settingsHelper)
{
Log = option.Get("ASC.Indexer");
CoreConfiguration = coreConfiguration;
Settings = Settings.GetInstance(configurationExtension);
Settings = settingsHelper.Settings;
}

public ElasticClient Instance
Expand Down
5 changes: 2 additions & 3 deletions common/services/ASC.ElasticSearch/Service/Launcher.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
using ASC.Common;
using ASC.Common.Caching;
using ASC.Common.Logging;
using ASC.Common.Utils;
using ASC.ElasticSearch.Service;

using Microsoft.Extensions.DependencyInjection;
Expand All @@ -58,14 +57,14 @@ public class ServiceLauncher : IHostedService
ICacheNotify<AscCacheItem> notify,
ICacheNotify<IndexAction> indexNotify,
IServiceProvider serviceProvider,
ConfigurationExtension configurationExtension)
SettingsHelper settingsHelper)
{
Log = options.Get("ASC.Indexer");
Notify = notify;
IndexNotify = indexNotify;
ServiceProvider = serviceProvider;
CancellationTokenSource = new CancellationTokenSource();
var settings = Settings.GetInstance(configurationExtension);
var settings = settingsHelper.Settings;
Period = TimeSpan.FromMinutes(settings.Period.Value);
}

Expand Down
34 changes: 20 additions & 14 deletions common/services/ASC.ElasticSearch/Service/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,29 @@
namespace ASC.ElasticSearch.Service
{
[Singletone]
public class Settings
{
public static Settings GetInstance(ConfigurationExtension configuration)
public class SettingsHelper
{
public Settings Settings { get; set; }
public SettingsHelper(ConfigurationExtension configuration)
{
var result = new Settings();
var cfg = configuration.GetSetting<Settings>("elastic");
result.Scheme = cfg.Scheme ?? "http";
result.Host = cfg.Host ?? "localhost";
result.Port = cfg.Port ?? 9200;
result.Period = cfg.Period ?? 1;
result.MaxContentLength = cfg.MaxContentLength ?? 100 * 1024 * 1024L;
result.MaxFileSize = cfg.MaxFileSize ?? 10 * 1024 * 1024L;
result.Threads = cfg.Threads ?? 1;
result.HttpCompression = cfg.HttpCompression ?? true;
return result;

Settings = new Settings
{
Scheme = cfg.Scheme ?? "http",
Host = cfg.Host ?? "localhost",
Port = cfg.Port ?? 9200,
Period = cfg.Period ?? 1,
MaxContentLength = cfg.MaxContentLength ?? 100 * 1024 * 1024L,
MaxFileSize = cfg.MaxFileSize ?? 10 * 1024 * 1024L,
Threads = cfg.Threads ?? 1,
HttpCompression = cfg.HttpCompression ?? true
};
}

}

public class Settings
{
public string Host { get; set; }

public int? Port { get; set; }
Expand Down

0 comments on commit ec3c7ad

Please sign in to comment.