3.2.0

Added encryption support
PandaTechAM · Oct 30, 2023 · 6bcac8c · 6bcac8c
1 parent bb892a0
commit 6bcac8c
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 47 deletions.
diff --git a/IEnumerableExtenders.sln.DotSettings.user b/IEnumerableExtenders.sln.DotSettings.user
@@ -1,2 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
+  &lt;Assembly Path="C:\Users\defgh\.nuget\packages\pandatech.crypto\2.0.0\lib\net7.0\Pandatech.Crypto.dll" /&gt;&#xD;
+&lt;/AssemblyExplorer&gt;</s:String>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/IEnumerableExtenders/EnumerableExtendersV3.cs b/IEnumerableExtenders/EnumerableExtendersV3.cs
@@ -1,11 +1,13 @@
 using System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
 using System.Reflection;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
 using PandaTech.IEnumerableFilters.Attributes;
 using PandaTech.IEnumerableFilters.Dto;
 using PandaTech.IEnumerableFilters.Exceptions;
 using PandaTech.IEnumerableFilters.Helpers;
+using PandaTech.IEnumerableFilters.PostgresContext;
 using static System.Linq.Expressions.Expression;
 
 namespace PandaTech.IEnumerableFilters;
@@ -24,7 +26,7 @@ public static class EnumerableExtendersV3
             ComparisonTypesDefault.ByteArray => DefaultComparisonTypes.ByteArray,
             _ => null
         };
-    
+
     private static ComparisonTypesDefault GetComparisonTypesDefault(Type type)
     {
         if (type == typeof(int) || type == typeof(long) || type == typeof(decimal) || type == typeof(double) ||
@@ -123,6 +125,39 @@ public static IQueryable<TModel> ApplyFilters<TModel, TDto>(this IQueryable<TMod
                 }
             }
 
+
+            if (filter.Attribute.Encrypted)
+            {
+                if (filterDto.ComparisonType != ComparisonType.Equal &&
+                    filterDto.ComparisonType != ComparisonType.In)
+                    throw new ComparisonNotSupportedException(
+                        $"Comparison type {filterDto.ComparisonType} not supported for encrypted property");
+
+
+                // var hashes = filterDto.Values.Select(x => Pandatech.Crypto.Sha3.Hash(x.ToString()!)).ToList();
+                //.Where(x => hashes.Contains(PostgresDbContext.substr(x.SomeBytes, 1, 64)));
+
+                var parameter = Parameter(typeof(TModel));
+                var property = Property(parameter, targetProperty);
+
+                var hashes = filterDto.Values.Select(x => Pandatech.Crypto.Sha3.Hash(x.ToString()!)).ToList();
+
+                var substrMethod = typeof(PostgresDbContext).GetMethod("substr", new[] {typeof(byte[]), typeof(int), typeof(int)});
+
+                var substrExpression = Call(substrMethod!, property, Constant(1), Constant(64));
+
+                var containsMethod = typeof(List<byte[]>).GetMethod("Contains", new[] {typeof(byte[])});
+
+                var containsExpression = Call(Constant(hashes), containsMethod!, substrExpression);
+
+                var lambda = Lambda<Func<TModel, bool>>(containsExpression, parameter);
+
+                q = q.Where(lambda);
+
+                return q;
+            }
+
+
             var converter =
                 Activator.CreateInstance(filter.Attribute.ConverterType ?? typeof(DirectConverter));
 
@@ -210,11 +245,14 @@ public static DistinctColumnValuesResult DistinctColumnValues<T, TDto>(this IQue
             {
                 x.Name,
                 Attribute = x.GetCustomAttribute<MappedToPropertyAttribute>()!,
-                Type = x.PropertyType
+                Type = x.PropertyType,
             }).ToDictionary(x => x.Name, x => new { x.Attribute, x.Type });
 
         var filter = mappedProperties[columnName];
 
+        if (filter.Attribute.Encrypted)
+            throw new Exception("Encrypted column not supported");
+
         var targetProperty = typeof(T).GetProperty(filter.Attribute.TargetPropertyName);
         if (targetProperty is null)
             throw new PropertyNotFoundException(
@@ -286,7 +324,10 @@ public static async Task<DistinctColumnValuesResult> DistinctColumnValuesAsync<T
             }).ToDictionary(x => x.Name, x => new { x.Attribute, x.Type });
 
         var filter = mappedProperties[columnName];
-
+
+        if (filter.Attribute.Encrypted)
+            throw new Exception("Encrypted column not supported");
+
         var targetProperty = typeof(Tmodel).GetProperty(filter.Attribute.TargetPropertyName);
         if (targetProperty is null)
             throw new PropertyNotFoundException(
@@ -371,14 +412,14 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
                 PropertyName = x.Name,
                 Table = tableName,
                 ComparisonTypes = (x.GetCustomAttribute<MappedToPropertyAttribute>()!.ComparisonTypes ??
-                    ComparisonTypes(GetComparisonTypesDefault(x.PropertyType))
-                    ?? new[]
-                {
-                    ComparisonType.Equal,
-                    ComparisonType.NotEqual,
-                    ComparisonType.In,
-                    ComparisonType.NotIn
-                }).ToList()
+                                   ComparisonTypes(GetComparisonTypesDefault(x.PropertyType))
+                                   ?? new[]
+                                   {
+                                       ComparisonType.Equal,
+                                       ComparisonType.NotEqual,
+                                       ComparisonType.In,
+                                       ComparisonType.NotIn
+                                   }).ToList()
             }
         );
 

diff --git a/IEnumerableExtenders/IEnumerableExtenders.csproj b/IEnumerableExtenders/IEnumerableExtenders.csproj
@@ -5,7 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>PandaTech.IEnumerableFilters</RootNamespace>
-        <Version>3.1.0</Version>
+        <Version>3.2.0</Version>
         <Authors>PandaTech</Authors>
         <Description>This NuGet helps with filtering tables.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-ienumerable-extenders-filters.git</RepositoryUrl>
@@ -15,6 +15,8 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
+      <PackageReference Include="PandaTech.BaseConverter" Version="1.0.12" />
+      <PackageReference Include="Pandatech.Crypto" Version="2.0.0" />
       <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
     </ItemGroup>
 

diff --git a/IEnumerableExtenders/PostgresContext/PostgresDbContext.cs b/IEnumerableExtenders/PostgresContext/PostgresDbContext.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace PandaTech.IEnumerableFilters.PostgresContext;
+
+public abstract class PostgresDbContext: DbContext
+{
+    protected PostgresDbContext(DbContextOptions options): base(options)
+    {
+    }
+
+    [DbFunction("substr", IsBuiltIn = true)]
+    public static byte[] substr(byte[] target, int start, int count) 
+    {
+        throw new Exception();
+    }
+
+    [DbFunction("rtrim", Schema = "public")]
+    public static byte[] rtrim(byte[] from, byte[] remove)
+    {
+        throw new NotSupportedException();
+    }
+
+}
diff --git a/TestFilters/Controllers/Context.cs b/TestFilters/Controllers/Context.cs
@@ -1,11 +1,12 @@
 using Microsoft.EntityFrameworkCore;
 using PandaTech.IEnumerableFilters;
 using PandaTech.IEnumerableFilters.Dto;
+using PandaTech.IEnumerableFilters.PostgresContext;
 using TestFilters.Controllers.Models;
 
 namespace TestFilters.Controllers;
 
-public class Context : DbContext
+public class Context : PostgresDbContext
 {
     public virtual DbSet<Person> Persons { get; set; } = null!;
     public virtual DbSet<Cat> Cats { get; set; } = null!;

diff --git a/TestFilters/Controllers/Models/Cat.cs b/TestFilters/Controllers/Models/Cat.cs
@@ -9,6 +9,8 @@ public class Cat
     public string Name { get; set; } = null!;
     public int Age { get; set; }
 
+    public byte[] SomeBytes { get; set; } = null!;
+
     public override string ToString() => $"Cat {Name} {Age} {Id}";
 
 }
diff --git a/TestFilters/Controllers/Models/CatDto.cs b/TestFilters/Controllers/Models/CatDto.cs
@@ -19,6 +19,9 @@ public class CatDto
 
     [MappedToProperty(nameof(Cat.Age))]
     public int Age { get; set; }
+
+    [MappedToProperty(nameof(Cat.SomeBytes), Encrypted = true)]
+    public string EncryptedString { get; set; } = null!;
 }
 
 public class PandaFilterBaseConverter : IConverter<string, long>

diff --git a/TestFilters/Controllers/SomeController.cs b/TestFilters/Controllers/SomeController.cs
@@ -4,7 +4,7 @@
 using PandaTech.IEnumerableFilters;
 using PandaTech.IEnumerableFilters.Attributes;
 using PandaTech.IEnumerableFilters.Dto;
-using PandaTech.Mapper;
+using PandaTech.IEnumerableFilters.PostgresContext;
 using TestFilters.Controllers.bulk;
 using TestFilters.Controllers.Models;
 using JsonSerializer = System.Text.Json.JsonSerializer;
@@ -16,24 +16,13 @@ namespace TestFilters.Controllers;
 public class SomeController : ControllerBase
 {
     private readonly Context _context;
-    private readonly Counter _counter;
-    private readonly UpCounter2 _upCounter2;
-    private readonly UpCounter _upCounter;
+
     private readonly IServiceProvider _serviceProvider;
-    private readonly HttpClient _client;
-    private readonly IMapping<Person, PersonDto> _personDtoMapper;
 
-    public SomeController(Context context, Counter counter, UpCounter2 upCounter2, UpCounter upCounter,
-        IServiceProvider serviceProvider, HttpClient client, IMapping<Person, PersonDto> personDtoMapper
-    )
+    public SomeController(Context context, IServiceProvider serviceProvider)
     {
         _context = context;
-        _counter = counter;
-        _upCounter2 = upCounter2;
-        _upCounter = upCounter;
         _serviceProvider = serviceProvider;
-        _client = client;
-        _personDtoMapper = personDtoMapper;
     }
 
     [HttpGet("[action]/{tableName}")]
@@ -166,11 +155,14 @@ public IActionResult PopulateDb()
 
             for (var j = 0; j < catCount; j++)
             {
+                var name = NameProvider.GetRandomName();
+
                 person.Cats.Add(new Cat
                 {
                     Id = catId++,
-                    Name = NameProvider.GetRandomName(),
+                    Name = name,
                     Age = Random.Shared.Next(1, 20),
+                    SomeBytes = Pandatech.Crypto.Aes256.EncryptWithHash(name)
                 });
             }
 
@@ -246,17 +238,23 @@ public async Task<FilteredDataResult<Person>> GetPersons([FromBody] GetDataReque
     [HttpPost("GetCats")]
     public async Task<FilteredDataResult<CatDto>> GetCats([FromBody] GetDataRequest request, int page, int pageSize)
     {
-        var query = _context.Cats.ApplyFilters<Cat, CatDto>(request.Filters)
-            .ApplyOrdering<Cat, CatDto>(request.Order);
+        //var hash = Pandatech.Crypto.Sha3.Hash(test);
+
+        var query = _context.Cats
+            .ApplyFilters<Cat, CatDto>(request.Filters)
+            .ApplyOrdering<Cat, CatDto>(request.Order)
+            ;//.Where(x => PostgresDbContext.substr(x.SomeBytes, 1, 64) == hash);
 
         var count = await query.LongCountAsync();
         var data = await query.Skip((page - 1) * pageSize).Take(pageSize)
-            .Select(x => new CatDto { Id = x.Id, Name = x.Name, Age = x.Age }).ToListAsync();
-
+            .Select(x => new CatDto
+            {
+                Id = x.Id, Name = x.Name, Age = x.Age, EncryptedString = Pandatech.Crypto.Aes256.DecryptIgnoringHash(x.SomeBytes)
+            }).ToListAsync();
+
         var aggregates = await query.GetAggregatesAsync<Cat, CatDto>(request.Aggregates);
 
-
-        return new FilteredDataResult<CatDto>()
+        return new FilteredDataResult<CatDto>
         {
             Data = data,
             TotalCount = count,

diff --git a/TestFilters/Program.cs b/TestFilters/Program.cs
@@ -7,6 +7,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
+
 // Add services to the container.
 
 builder.Services.AddControllers();
@@ -19,25 +20,17 @@
 builder.Services.AddDbContext<Context>(
     optionsBuilder =>
         optionsBuilder.UseNpgsql("Server=127.0.0.1;Database=xyz;Username=postgres;Password=example")
-           // .UseSnakeCaseNamingConvention()
+    // .UseSnakeCaseNamingConvention()
     , ServiceLifetime.Scoped
 );
 
 #region Mappers
 
-builder.Services.AddScoped<FilterProvider>();
 builder.Services.AddScoped<IMapping<Person, PersonDto>, PersonDtoMapper>();
 
-builder.Services.AddSingleton<Counter>();
-
-builder.Services.AddScoped<UpCounter2>();
-builder.Services.AddScoped<FilterProvider>();
-builder.Services.AddScoped<UpCounter>();
-
-builder.Services.AddHttpClient();
-
 #endregion
 
+builder.Services.AddHttpClient();
 
 var app = builder.Build();
 

diff --git a/TestFilters/Properties/launchSettings.json b/TestFilters/Properties/launchSettings.json
@@ -8,7 +8,8 @@
       "launchUrl": "swagger",
       "applicationUrl": "https://*:444;http://*:80",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "AES_KEY": "M5pfvJCKBwpJdA7YfeX3AkAKJmfBf4piybEPDtWKWw4="
       }
     }
   }

diff --git a/TestFilters/TestFilters.csproj b/TestFilters/TestFilters.csproj
@@ -19,7 +19,6 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
-        <PackageReference Include="PandaTech.BaseConverter" Version="1.0.7" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
         <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
     </ItemGroup>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -14,7 +14,6 @@
         <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
         <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
         <PackageReference Include="coverlet.collector" Version="3.1.2" />
-        <PackageReference Include="PandaTech.BaseConverter" Version="1.0.7" />
         <PackageReference Include="Testcontainers.PostgreSql" Version="3.3.0" />
         <PackageReference Include="Testcontainers.RabbitMq" Version="3.3.0" />
     </ItemGroup>