Skip to content

Commit a4e67c8

Browse files
authored
Fix CVE issues (#3371)
1 parent 4e5fc1a commit a4e67c8

File tree

10 files changed

+40
-6
lines changed

10 files changed

+40
-6
lines changed

samples/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<PackageVersion Update="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="4.0.1" />
4242
<PackageVersion Update="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1" />
4343
<PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
44-
<PackageVersion Update="System.Drawing.Common" Version="6.0.0" />
44+
<PackageVersion Update="System.Drawing.Common" Version="4.7.3" />
4545
<PackageVersion Update="System.Text.Json" Version="10.0.0" />
4646
</ItemGroup>
4747

samples/durable-client-managed-identity/aspnetcore-app/ToDoList.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<!-- To specify a version in the package reference below, simply add `Version = ""`. -->
99
<ItemGroup>
1010
<PackageReference Include="EntityFramework" />
11+
<PackageReference Include="System.Drawing.Common" VersionOverride="6.0.0" />
1112
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" />
1213
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
1314
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" >

samples/isolated-unit-tests/IsolatedUnitTest.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<ItemGroup>
1010
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1111
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" />
12+
<PackageReference Include="System.Drawing.Common" VersionOverride="6.0.0" />
1213
<PackageReference Include="Microsoft.Azure.Functions.Worker" />
1314
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" />
1415
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" />

samples/todolist-aspnetcore/ToDoList.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<!-- To specify a version in the package reference below, simply add `Version = ""`. -->
99
<ItemGroup>
1010
<PackageReference Include="EntityFramework" />
11+
<PackageReference Include="System.Drawing.Common" VersionOverride="6.0.0" />
1112
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" />
1213
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
1314
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" >

test/CodeGen.SourceGenerator.Test/DurableFunctions.TypedInterfaces.SourceGenerator.Test.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
2020
<PackageReference Include="Microsoft.Build.Locator" />
2121
<PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="runtime" />
22+
<!-- Microsoft.Build 17.8.43 transitively requires System.Drawing.Common >= 7.0.0,
23+
which conflicts with the central pin of 4.7.3. Override here since this test
24+
project does not ship to customers. -->
25+
<PackageReference Include="System.Drawing.Common" VersionOverride="7.0.0" />
2226
<PackageReference Include="Microsoft.CodeAnalysis" />
2327
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
2428
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />

test/Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
1111
<PackageVersion Include="FluentAssertions" Version="4.19.4" />
1212
<PackageVersion Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.41" />
13-
<PackageVersion Include="Microsoft.Build" Version="17.8.29" />
14-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.29" />
13+
<PackageVersion Include="Microsoft.Build" Version="17.8.43" />
14+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.43" />
1515
<PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
16-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.8.29" />
16+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.8.43" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis" Version="3.9.0" />
1818
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.9.0" />
1919
<PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.65" />
@@ -33,7 +33,7 @@
3333
<PackageVersion Update="Azure.Identity" Version="1.17.1" />
3434
<PackageVersion Update="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1" />
3535
<PackageVersion Update="Microsoft.Extensions.Azure" Version="1.10.0" />
36-
<PackageVersion Update="System.Drawing.Common" Version="7.0.0" />
36+
<PackageVersion Update="System.Drawing.Common" Version="4.7.3" />
3737
<PackageVersion Update="System.Formats.Asn1" Version="8.0.1" />
3838
<PackageVersion Update="System.Text.Json" Version="10.0.0" />
3939
</ItemGroup>

test/SmokeTests/BackendSmokeTests/MSSQL/MSSQL.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
1515
<PackageReference Include="Microsoft.DurableTask.SqlServer.AzureFunctions" Version="1.5.1" />
16-
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
16+
<PackageReference Include="System.Drawing.Common" Version="4.7.3" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<None Update="host.json">
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
<!--
3+
The Azure Functions Worker SDK auto-generates a WorkerExtensions.csproj under obj/ with hardcoded
4+
PackageReference versions. This conflicts with Central Package Management (CPM), causing NU1008
5+
errors and preventing the transitive pin of System.Drawing.Common (in test/Directory.Packages.props)
6+
from taking effect. As a result, the vulnerable transitive version 4.7.0 from
7+
Microsoft.DurableTask.SqlServer.AzureFunctions remains unpatched (CVE-2021-24112).
8+
9+
This targets file disables CPM for the generated project and injects a direct PackageReference
10+
to override the vulnerable transitive dependency.
11+
-->
12+
<PropertyGroup Condition="'$(AssemblyName)' == 'Microsoft.Azure.Functions.Worker.Extensions'">
13+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
14+
</PropertyGroup>
15+
16+
<ItemGroup Condition="'$(AssemblyName)' == 'Microsoft.Azure.Functions.Worker.Extensions'">
17+
<PackageReference Include="System.Drawing.Common" Version="4.7.3" />
18+
</ItemGroup>
19+
</Project>

test/e2e/Apps/BasicDotNetIsolated/app.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" />
2525
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask.SqlServer" />
2626
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask.AzureManaged" />
27+
<PackageReference Include="System.Drawing.Common" VersionOverride="6.0.0" />
2728
</ItemGroup>
2829

2930
<ItemGroup>

test/e2e/Apps/BasicJava/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@
4545
<version>${durabletask.azure.functions}</version>
4646
</dependency>
4747

48+
<!-- Override transitive jackson-core to fix GHSA-72hv-8253-57qq (CVE in jackson-core < 2.18.6) -->
49+
<dependency>
50+
<groupId>com.fasterxml.jackson.core</groupId>
51+
<artifactId>jackson-core</artifactId>
52+
<version>2.18.6</version>
53+
</dependency>
54+
4855
<dependency>
4956
<groupId>com.google.code.gson</groupId>
5057
<artifactId>gson</artifactId>

0 commit comments

Comments
 (0)