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

[repo] Mitigate vulnerabilities in System.Text.Json 8.0.4 package #5891

Merged
merged 4 commits into from
Oct 8, 2024
Merged

[repo] Mitigate vulnerabilities in System.Text.Json 8.0.4 package #5891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3310d2
Bump STJ to 8.0.5 on net8.0 targets.
CodeBlanch Oct 8, 2024
5cff279
CHANGELOG patch.
CodeBlanch Oct 8, 2024
91a7e96
Merge branch 'main' into repo-mitigate-stj-net8-2
CodeBlanch Oct 8, 2024
d8ba817
Tweak notes/comments.
CodeBlanch Oct 8, 2024
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
11 changes: 9 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<OTelLatestStableVer>1.9.0</OTelLatestStableVer>

<!-- Mitigate https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485. -->
<SystemTextEncodingsWebOutOfBandMinimumCoreAppVer>8.0.0</SystemTextEncodingsWebOutOfBandMinimumCoreAppVer>
<SystemTextJsonOutOfBandMinimumCoreAppVer>8.0.4</SystemTextJsonOutOfBandMinimumCoreAppVer>
<SystemTextJsonOutOfBandMinimumCoreAppVer>8.0.5</SystemTextJsonOutOfBandMinimumCoreAppVer>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -59,6 +61,11 @@
</ItemGroup>

<ItemGroup>
<!--
Note: See TargetFrameworksRequiringSystemTextJsonDirectReference for the
list of targets where System.Text.Json direct reference is applied.
-->

<!--
We use conservative versions of these packages for older runtimes where
an upgrade might introduce breaking changes. For example see:
Expand All @@ -67,7 +74,7 @@
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Json" Version="4.7.2" />

<!-- Bump System.Text.Json on NETCoreApp targets to mitigate https://github.com/advisories/GHSA-hh2w-p6rv-4g7w. -->
<!-- Newer NETCoreApp runtimes need to be redirected to safe versions. -->
<PackageVersion Update="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebOutOfBandMinimumCoreAppVer)" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
<PackageVersion Update="System.Text.Json" Version="$(SystemTextJsonOutOfBandMinimumCoreAppVer)" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
</ItemGroup>
Expand Down
8 changes: 5 additions & 3 deletions src/OpenTelemetry.Exporter.Console/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ Notes](../../RELEASENOTES.md).
## Unreleased

* Added direct reference to `System.Text.Json` for the `net8.0` target with
minimum version of `8.0.4` in response to
[CVE-2024-30105](https://github.com/advisories/GHSA-hh2w-p6rv-4g7w).
([#5874](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5874))
minimum version of `8.0.5` in response to
[CVE-2024-30105](https://github.com/advisories/GHSA-hh2w-p6rv-4g7w) &
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#5874](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5874),
[#5891](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5891))

## 1.10.0-beta.1

Expand Down
8 changes: 5 additions & 3 deletions src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ Notes](../../RELEASENOTES.md).
## Unreleased

* Added direct reference to `System.Text.Json` for the `net8.0` target with
minimum version of `8.0.4` in response to
[CVE-2024-30105](https://github.com/advisories/GHSA-hh2w-p6rv-4g7w).
([#5874](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5874))
minimum version of `8.0.5` in response to
[CVE-2024-30105](https://github.com/advisories/GHSA-hh2w-p6rv-4g7w) &
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#5874](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5874),
[#5891](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5891))

## 1.10.0-beta.1

Expand Down
Loading