Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New IP addresses validation #753

Merged
merged 2 commits into from
Jan 23, 2025
Merged

New IP addresses validation #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1ede6a
Changes to include the new ip addresses validations
DiegoRochaHH Jan 21, 2025
b235dec
Initializing http context
DiegoRochaHH Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions GeeksCoreLibrary.Tests/Core/Services/WiserItemsServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using FluentAssertions;
using GeeksCoreLibrary.Core.Interfaces;
using GeeksCoreLibrary.Core.Models;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;

Expand All @@ -29,6 +30,7 @@
private Mock<ILogger<WiserItemsService>> loggerMock;
private Mock<IEntityTypesService> entityTypesServiceMock;
private Mock<ILinkTypesService> linkTypesServiceMock;
private Mock<IHttpContextAccessor> httpContextAccessorMock;

Check warning on line 33 in GeeksCoreLibrary.Tests/Core/Services/WiserItemsServiceTests.cs

View workflow job for this annotation

GitHub Actions / build 

The field 'WiserItemsServiceTests.httpContextAccessorMock' is never used

Check warning on line 33 in GeeksCoreLibrary.Tests/Core/Services/WiserItemsServiceTests.cs

View workflow job for this annotation

GitHub Actions / build 

The field 'WiserItemsServiceTests.httpContextAccessorMock' is never used
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.

[SetUp]
Expand All @@ -44,6 +46,7 @@
loggerMock = new Mock<ILogger<WiserItemsService>>();
entityTypesServiceMock = new Mock<IEntityTypesService>();
linkTypesServiceMock = new Mock<ILinkTypesService>();


// Create the service that we're testing.
wiserItemsService = new WiserItemsService(databaseConnectionMock.Object, objectsServiceMock.Object, stringReplacementsServiceMock.Object, dataSelectorsServiceMock.Object, databaseHelpersServiceMock.Object, gclSettingsMock, loggerMock.Object, entityTypesServiceMock.Object, linkTypesServiceMock.Object);
Expand Down
5 changes: 5 additions & 0 deletions GeeksCoreLibrary/Core/Models/RoleModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,9 @@ public class RoleModel
/// Gets or sets all permissions for this role.
/// </summary>
public List<PermissionModel> Permissions { get; set; }

/// <summary>
/// Gets or sets the ip addresses of the role.
/// </summary>
public List<string> IpAddresses { get; set; }
}
34 changes: 19 additions & 15 deletions GeeksCoreLibrary/Core/Services/RolesService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using GeeksCoreLibrary.Core.Interfaces;
using GeeksCoreLibrary.Core.Models;
using GeeksCoreLibrary.Modules.Databases.Interfaces;
using Newtonsoft.Json;

namespace GeeksCoreLibrary.Core.Services;

Expand All @@ -31,20 +32,22 @@ public async Task<List<RoleModel>> GetRolesAsync(bool includePermissions = false
string query;
if (includePermissions)
{
query = $"""
SELECT
role.id,
role.role_name,
permission.item_id,
permission.entity_property_id,
permission.module_id,
permission.permissions,
permission.endpoint_url,
permission.endpoint_http_method
FROM {WiserTableNames.WiserRoles} AS role
LEFT JOIN {WiserTableNames.WiserPermission} AS permission ON permission.role_id = role.id
ORDER BY role_name ASC
""";
query = $$"""
SELECT
role.id,
role.role_name,
user_role.ip_addresses,
permission.item_id,
permission.entity_property_id,
permission.module_id,
permission.permissions,
permission.endpoint_url,
permission.endpoint_http_method
FROM {{WiserTableNames.WiserRoles}} AS role
LEFT JOIN {{WiserTableNames.WiserUserRoles}} AS user_role ON user_role.role_id = role.id
LEFT JOIN {{WiserTableNames.WiserPermission}} AS permission ON permission.role_id = role.id
ORDER BY role_name ASC
""";
}
else
{
Expand All @@ -69,7 +72,8 @@ ORDER BY role_name ASC
role = new RoleModel
{
Id = roleId,
Name = dataRow.Field<string>("role_name")
Name = dataRow.Field<string>("role_name"),
IpAddresses = dataRow.IsNull("ip_addresses") ? null : JsonConvert.DeserializeObject<List<string>>(dataRow.Field<string>("ip_addresses"))
};

results.Add(role);
Expand Down
11 changes: 8 additions & 3 deletions GeeksCoreLibrary/Core/Services/WiserItemsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using GeeksCoreLibrary.Core.Exceptions;
using GeeksCoreLibrary.Core.Helpers;
using GeeksCoreLibrary.Modules.Databases.Helpers;
using GeeksCoreLibrary.Modules.Databases.Interfaces;
using GeeksCoreLibrary.Modules.Databases.Models;
using GeeksCoreLibrary.Modules.DataSelector.Interfaces;
using GeeksCoreLibrary.Modules.GclReplacements.Interfaces;
using GeeksCoreLibrary.Modules.ItemFiles.Models;
using GeeksCoreLibrary.Modules.Objects.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using MySqlConnector;
Expand All @@ -39,7 +41,8 @@ public class WiserItemsService(
IOptions<GclSettings> gclSettings,
ILogger<WiserItemsService> logger,
IEntityTypesService entityTypesService,
ILinkTypesService linkTypesService)
ILinkTypesService linkTypesService,
IHttpContextAccessor httpContextAccessor = null)
: IWiserItemsService, IScopedService
{
private readonly GclSettings gclSettings = gclSettings.Value;
Expand Down Expand Up @@ -2012,18 +2015,20 @@ public async Task<AccessRights> GetUserItemPermissionsAsync(IWiserItemsService w
// If someone is not logged in, they will have no permissions by default. If someone is logged in, then they have all permissions by default.
var defaultPermissions = userId == 0 ? AccessRights.Nothing : AccessRights.Read | AccessRights.Create | AccessRights.Update | AccessRights.Delete;
var tablePrefix = await wiserItemsService.GetTablePrefixForEntityAsync(entityType);
var userIp = HttpContextHelpers.GetUserIpAddress(httpContextAccessor?.HttpContext);

// First check permissions based on module ID.
var permissionsQuery = $"""
SELECT permission.permissions
FROM {WiserTableNames.WiserUserRoles} AS user_role
JOIN {tablePrefix}{WiserTableNames.WiserItem} AS item ON item.id = ?itemId AND item.moduleid > 0
LEFT JOIN {WiserTableNames.WiserPermission} AS permission ON permission.role_id = user_role.role_id AND permission.module_id = item.moduleid
WHERE user_role.user_id = ?userId
WHERE user_role.user_id = ?userId AND (user_role.ip_addresses IS NULL OR JSON_CONTAINS(user_role.ip_addresses, JSON_QUOTE(?userIp)))
""";

databaseConnection.AddParameter("itemId", itemId);
databaseConnection.AddParameter("userId", userId);
databaseConnection.AddParameter("userIp", userIp);
var dataTable = await databaseConnection.GetAsync(permissionsQuery, true);

var modulePermissionsFound = false;
Expand Down Expand Up @@ -2067,7 +2072,7 @@ SELECT permission.permissions
SELECT permission.permissions
FROM {WiserTableNames.WiserUserRoles} AS user_role
LEFT JOIN {WiserTableNames.WiserPermission} AS permission ON permission.role_id = user_role.role_id AND permission.item_id = ?itemId
WHERE user_role.user_id = ?userId
WHERE user_role.user_id = ?userId AND (user_role.ip_addresses IS NULL OR JSON_CONTAINS(user_role.ip_addresses, JSON_QUOTE(?userIp)))
""";
dataTable = await databaseConnection.GetAsync(permissionsQuery, true);

Expand Down
Loading