Skip to content

Commit f7c4cd9

Browse files
I-RzR-II-RzR-I
authored
Merge pull request #2 from I-RzR-I/fix/Fix-CVE-2024-32655
Upgrade libs version (cve fix)
2 parents 570e15d + 220655b commit f7c4cd9

File tree

11 files changed

+226
-23
lines changed

11 files changed

+226
-23
lines changed

‎docs/CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
### **1.0.1.8361**
1+
### **v1.0.2.6703**
2+
-> Update lib version for 'Npgsql', with `CVE-2024-32655` fix;<br />
3+
-> Update some libs version related to previous update;<br />
4+
5+
### **v1.0.1.8361**
26
-> Change property mapper (map by property/column name);<br />
37
-> Add EF DbContextExtension (that load neccessary information);<br />
48
-> Add tests for simple select query and adjust mapper.<br />

‎src/DbObjectExecutor.Attribute/DbObjectExecutor.Attribute.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@
5757
</ItemGroup>
5858

5959
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
60-
<PackageReference Include="Npgsql" Version="5.0.0" />
60+
<PackageReference Include="Npgsql" Version="5.0.18" />
6161
</ItemGroup>
6262

6363
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
64-
<PackageReference Include="Npgsql" Version="6.0.0" />
64+
<PackageReference Include="Npgsql" Version="6.0.11" />
6565
</ItemGroup>
6666

6767
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
68-
<PackageReference Include="Npgsql" Version="7.0.0" />
68+
<PackageReference Include="Npgsql" Version="7.0.7" />
6969
</ItemGroup>
7070

7171
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
72-
<PackageReference Include="Npgsql" Version="8.0.0" />
72+
<PackageReference Include="Npgsql" Version="8.0.3" />
7373
</ItemGroup>
7474
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
75-
<PackageReference Include="Npgsql" Version="4.1.12" />
75+
<PackageReference Include="Npgsql" Version="4.1.13" />
7676
</ItemGroup>
7777

7878
<ItemGroup>

‎src/DbObjectExecutor.Imp.EntityFramework/DbObjectExecutor.Imp.EntityFramework.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@
3636
<ItemGroup>
3737
<Compile Include="..\shared\GeneralAssemblyInfo.cs" Link="Properties\GeneralAssemblyInfo.cs" />
3838
</ItemGroup>
39-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' &#xD;&#xA; Or '$(TargetFramework)' == 'netstandard2.1' &#xD;&#xA; Or '$(TargetFramework)' == 'net5.0' ">
39+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net5.0' ">
4040
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.32" />
4141
</ItemGroup>
4242

4343
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
44-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
44+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.29" />
4545
</ItemGroup>
4646

4747
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
48-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.18" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
52-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
52+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
5353
</ItemGroup>
5454

5555
<ItemGroup>

‎src/DbObjectExecutor/DbObjectExecutor.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
5454
</ItemGroup>
5555

56-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'&#xD;&#xA; Or '$(TargetFramework)' == 'net5.0'&#xD;&#xA; Or '$(TargetFramework)' == 'net6.0'&#xD;&#xA; Or '$(TargetFramework)' == 'net7.0'&#xD;&#xA; Or '$(TargetFramework)' == 'net8.0'">
56+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">
5757
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
5858
</ItemGroup>
5959
</Project>

‎src/RzR.Shared.Entity.sln‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbObjectExecutor.Imp.Entity
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbObjectExecutorWithDITest", "tests\DbObjectExecutorWithDITest\DbObjectExecutorWithDITest.csproj", "{B91EE4B2-DD8E-49DD-8478-3D1000D3D2E2}"
3737
EndProject
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbObjectExecutorWithDINet6Test", "tests\DbObjectExecutorWithDINet6Test\DbObjectExecutorWithDINet6Test.csproj", "{0AF07CBD-1B26-494B-A3EE-DF301F8B249F}"
39+
EndProject
3840
Global
3941
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4042
Debug|Any CPU = Debug|Any CPU
@@ -77,6 +79,10 @@ Global
7779
{B91EE4B2-DD8E-49DD-8478-3D1000D3D2E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
7880
{B91EE4B2-DD8E-49DD-8478-3D1000D3D2E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
7981
{B91EE4B2-DD8E-49DD-8478-3D1000D3D2E2}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{0AF07CBD-1B26-494B-A3EE-DF301F8B249F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{0AF07CBD-1B26-494B-A3EE-DF301F8B249F}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{0AF07CBD-1B26-494B-A3EE-DF301F8B249F}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{0AF07CBD-1B26-494B-A3EE-DF301F8B249F}.Release|Any CPU.Build.0 = Release|Any CPU
8086
EndGlobalSection
8187
GlobalSection(SolutionProperties) = preSolution
8288
HideSolutionNode = FALSE
@@ -89,18 +95,20 @@ Global
8995
{8A5F2768-BD6E-4E11-8B48-92FAEF7A1844} = {E737BE4D-6DFF-4A67-A3D9-2AC58BFBBC07}
9096
{CE93444B-6F0B-40CF-A24B-767ADD839C6E} = {E737BE4D-6DFF-4A67-A3D9-2AC58BFBBC07}
9197
{B91EE4B2-DD8E-49DD-8478-3D1000D3D2E2} = {E737BE4D-6DFF-4A67-A3D9-2AC58BFBBC07}
98+
{0AF07CBD-1B26-494B-A3EE-DF301F8B249F} = {E737BE4D-6DFF-4A67-A3D9-2AC58BFBBC07}
9299
EndGlobalSection
93100
GlobalSection(ExtensibilityGlobals) = postSolution
94-
BuildVersion_UseUniversalClock = True
95-
BuildVersion_ConfigurationName = Release
96-
BuildVersion_AssemblyInfoFilename = shared\GeneralAssemblyInfo.cs
97-
BuildVersion_StartDate = 2023/4/30
98-
BuildVersion_UpdateFileVersion = True
99-
BuildVersion_UpdateAssemblyVersion = True
100-
BuildVersion_BuildVersioningStyle = None.None.Increment.TimeStamp
101101
SolutionGuid = {4B5BD8B8-58AD-47B4-B85A-E7242D47B9FE}
102+
BuildVersion_BuildVersioningStyle = None.None.Increment.TimeStamp
103+
BuildVersion_UpdateAssemblyVersion = True
104+
BuildVersion_UpdateFileVersion = True
105+
BuildVersion_StartDate = 2023/4/30
106+
BuildVersion_AssemblyInfoFilename = shared\GeneralAssemblyInfo.cs
107+
BuildVersion_ConfigurationName = Release
108+
BuildVersion_UseUniversalClock = True
102109
EndGlobalSection
103110
GlobalSection(SharedMSBuildProjectFiles) = preSolution
111+
tests\SharedDbObjectExecutorInitInfo\SharedDbObjectExecutorInitInfo.projitems*{0af07cbd-1b26-494b-a3ee-df301f8b249f}*SharedItemsImports = 5
104112
tests\SharedDbObjectExecutorInitInfo\SharedDbObjectExecutorInitInfo.projitems*{0f2aafc5-883f-4763-9d14-13224402016a}*SharedItemsImports = 13
105113
tests\SharedDbObjectExecutorInitInfo\SharedDbObjectExecutorInitInfo.projitems*{67bf3c35-63c1-4c3b-8a53-44d5432f129e}*SharedItemsImports = 5
106114
tests\SharedDbObjectExecutorInitInfo\SharedDbObjectExecutorInitInfo.projitems*{8a5f2768-bd6e-4e11-8b48-92faef7a1844}*SharedItemsImports = 5

‎src/shared/GeneralAssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
[assembly: AssemblyMetadata("ContactName", "RzR")]
3939
[assembly: AssemblyMetadata("ContactEmail", "ddpRzR@hotmail.com")]
4040
[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]
41-
[assembly: AssemblyVersion("1.0.1.8361")]
42-
[assembly: AssemblyFileVersion("1.0.1.8361")]
43-
[assembly: AssemblyInformationalVersion("1.0.1.8361")]
41+
[assembly: AssemblyVersion("1.0.2.6703")]
42+
[assembly: AssemblyFileVersion("1.0.2.6703")]
43+
[assembly: AssemblyInformationalVersion("1.0.2.6703")]

‎src/tests/DbObjectExecutor.Imp.EntityFrameworkNet6Test/DbObjectExecutor.Imp.EntityFrameworkNet6Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.23.0" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.28">
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.29">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.28" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.29" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
2020
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
2121
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />

‎src/tests/DbObjectExecutorWithDINet6Test/DbObjectExecutorWithDINet6Test.csproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
12+
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
13+
<PackageReference Include="coverlet.collector" Version="3.2.0" />
14+
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.23.0" />
15+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
16+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.1" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\..\DbObjectExecutor.Imp.EntityFramework\DbObjectExecutor.Imp.EntityFramework.csproj" />
26+
</ItemGroup>
27+
28+
<Import Project="..\SharedDbObjectExecutorInitInfo\SharedDbObjectExecutorInitInfo.projitems" Label="Shared" />
29+
30+
</Project>

‎src/tests/DbObjectExecutorWithDINet6Test/InitInfo.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// ***********************************************************************
2+
// Assembly : RzR.Shared.Entity.DbObjectExecutorWithDITest
3+
// Author : RzR
4+
// Created On : 2024-04-01 22:08
5+
//
6+
// Last Modified By : RzR
7+
// Last Modified On : 2024-04-01 22:08
8+
// ***********************************************************************
9+
// <copyright file="InitInfo.cs" company="">
10+
// Copyright (c) RzR. All rights reserved.
11+
// </copyright>
12+
//
13+
// <summary>
14+
// </summary>
15+
// ***********************************************************************
16+
17+
using DbObjectExecutor;
18+
using DbObjectExecutor.Abstractions;
19+
using Microsoft.Extensions.DependencyInjection;
20+
using Microsoft.VisualStudio.TestTools.UnitTesting;
21+
22+
namespace DbObjectExecutorWithDINet6Test
23+
{
24+
[TestClass]
25+
public class InitInfo
26+
{
27+
protected IDbObjectBuilder _dbObjectBuilder;
28+
29+
[TestInitialize]
30+
public void Init()
31+
{
32+
var sp = new ServiceCollection();
33+
sp.RegisterDbObjectBuilder();
34+
35+
var serviceProvider = sp.BuildServiceProvider();
36+
_dbObjectBuilder = serviceProvider.GetRequiredService<IDbObjectBuilder>();
37+
}
38+
}
39+
}

‎src/tests/DbObjectExecutorWithDINet6Test/Tests/SpGetRecordPagedTests.cs‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#region U S A G E S
2+
3+
using DbObjectExecutor.Enums;
4+
using DbObjectExecutor.Mapper.Extensions.DbDataReader;
5+
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
using SharedDbObjectExecutorInitInfo.DataBaseTool;
7+
using SharedDbObjectExecutorInitInfo.Models;
8+
using System.Collections.Generic;
9+
using System.Data.SqlClient;
10+
11+
#endregion
12+
13+
namespace DbObjectExecutorWithDINet6Test.Tests
14+
{
15+
[TestClass]
16+
public class SpGetRecordPagedTests : InitInfo
17+
{
18+
[TestMethod]
19+
public void SpGetRecordPaged_ManuallyReader_Success_Test()
20+
{
21+
var result = new List<SpGetRecordPagedDto>();
22+
var objConn = new SqlConnection(DataBaseHelper.ConnectionStringDefaultMsSql);
23+
24+
_dbObjectBuilder.SetInitInfo(DataBaseObjectNames.spGetRecordPaged, objConn, DbExecutorType.Procedure);
25+
_dbObjectBuilder.SetIn("Skip", "0");
26+
_dbObjectBuilder.SetIn("Take", "5");
27+
_dbObjectBuilder.SetIn("OrderBy", "Name");
28+
_dbObjectBuilder.SetIn("Where", "");
29+
_dbObjectBuilder.SetOut("RowsCount", out var outNextId, 0);
30+
31+
_dbObjectBuilder.Execute(reader =>
32+
{
33+
if (reader.HasRows)
34+
while (reader.Read())
35+
result.Add(new SpGetRecordPagedDto
36+
{
37+
Id = int.Parse(reader["Id"].ToString() ?? "-1"),
38+
Code = reader["Code"].ToString(),
39+
Name = reader["Name"].ToString(),
40+
IsActive = reader["IsActive"].ToString() == "1"
41+
});
42+
});
43+
44+
_dbObjectBuilder.Dispose();
45+
46+
Assert.IsNotNull(outNextId.Value);
47+
Assert.IsTrue(outNextId.Value > 0);
48+
Assert.IsTrue(result.Count == 5);
49+
}
50+
51+
[TestMethod]
52+
public void SpGetRecordPaged_ManuallyReader_Success_Test_1()
53+
{
54+
var result = new List<SpGetRecordPagedDto>();
55+
var objConn = new SqlConnection(DataBaseHelper.ConnectionStringDefaultMsSql);
56+
57+
_dbObjectBuilder.SetInitInfo(DataBaseObjectNames.spGetRecordPaged, objConn, DbExecutorType.Procedure);
58+
_dbObjectBuilder.SetIn("Skip", "0");
59+
_dbObjectBuilder.SetIn("Take", "5");
60+
_dbObjectBuilder.SetIn("OrderBy", "Name");
61+
_dbObjectBuilder.SetIn("Where", "");
62+
_dbObjectBuilder.SetOut("RowsCount", out var outNextId, 0);
63+
64+
_dbObjectBuilder.Execute(reader => result = reader.ToList<SpGetRecordPagedDto>());
65+
66+
_dbObjectBuilder.Dispose();
67+
68+
Assert.IsNotNull(outNextId.Value);
69+
Assert.IsTrue(outNextId.Value > 0);
70+
Assert.IsTrue(result.Count == 5);
71+
}
72+
}
73+
}

0 commit comments

Comments
 (0)