IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #653 from ONLYOFFICE/feature/logger-IPSecurity

Browse Source 
Feature/logger ip security
This commit is contained in:
Pavel Bannov 2022-05-19 14:07:52 +03:00 committed by GitHub
commit 8d25b80ce0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.IPSecurity/GlobalUsings.cs
View File

@ -37,6 +37,8 @@ global using ASC.Core.Common.EF;
global using ASC.Core.Common.EF.Context;
global using ASC.Core.Common.EF.Model;
global using ASC.Core.Common.Settings;
global using ASC.Core.Tenants;
global using ASC.IPSecurity.Log;
global using AutoMapper;
global using AutoMapper.QueryableExtensions;

39
common/ASC.IPSecurity/Log/IPSecurityLogger.cs Normal file
View File

@ -0,0 +1,39 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
namespace ASC.IPSecurity.Log;
internal static partial class IPSecurityLogger
{
[LoggerMessage(Level = LogLevel.Error, Message = "Can't verify request with IP-address: {requestIps}. Tenant: {tenant}.")]
public static partial void ErrorCantVerifyRequest(this ILogger logger, string requestIps, Tenant tenant, Exception exception);
[LoggerMessage(Level = LogLevel.Information, Message = "Restricted from IP-address: {ip}. Tenant: {tenant}. Request to: {url}")]
public static partial void InformationRestricted(this ILogger logger, string ip, Tenant tenant, string url);
[LoggerMessage(Level = LogLevel.Error, Message = "Can't verify local network from request with IP-address: {ips}")]
public static partial void ErrorCantVerifyLocalNetWork(this ILogger logger, string ips, Exception exception);
}

6
common/ASC.IPSecurity/Utils/IPSecurity.cs
View File

@ -110,12 +110,12 @@ public class IPSecurity
}
catch (Exception ex)
{
_logger.LogError(ex, "Can't verify request with IP-address: {requestIps}. Tenant: {tenant}.", requestIps ?? "", tenant);
_logger.ErrorCantVerifyRequest(requestIps ?? "", tenant, ex);
return false;
}
_logger.LogInformation("Restricted from IP-address: {ip}. Tenant: {tenant}. Request to: {url}", requestIps ?? "", tenant, _httpContextAccessor.HttpContext.Request.GetDisplayUrl());
_logger.InformationRestricted(requestIps ?? "", tenant, _httpContextAccessor.HttpContext.Request.GetDisplayUrl());
return false;
}
@ -174,7 +174,7 @@ public class IPSecurity
}
catch (Exception ex)
{
_logger.LogError(ex, "Can't verify local network from request with IP-address: {0}", string.Join(",", ips));
_logger.ErrorCantVerifyLocalNetWork(string.Join(",", ips), ex);
}
return false;