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

[onecollector & resources.aws] Mitigate STJ vulnerabilities #2196

Merged
merged 3 commits into from
Oct 9, 2024
Merged

[onecollector & resources.aws] Mitigate STJ vulnerabilities #2196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be70c8d
Mitigate STJ vulnerabilities in projects targeting 6.0.0.
CodeBlanch Oct 9, 2024
1686b0f
Patch CHANGELOGs.
CodeBlanch Oct 9, 2024
a5268c2
Merge branch 'main' into repo-stj-mitigate-projects-at-6
CodeBlanch Oct 9, 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
13 changes: 9 additions & 4 deletions build/Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<MinVerPkgVer>[5.0.0,6.0)</MinVerPkgVer>
<MicrosoftExtensionsConfigurationBinderPkgVer>[8.0.1,)</MicrosoftExtensionsConfigurationBinderPkgVer>
<MicrosoftExtensionsHostingAbstractionsPkgVer>[2.1.0,5.0)</MicrosoftExtensionsHostingAbstractionsPkgVer>
<MicrosoftExtensionsConfigurationPkgVer>8.0.0</MicrosoftExtensionsConfigurationPkgVer>
<MicrosoftExtensionsOptionsPkgVer>8.0.0</MicrosoftExtensionsOptionsPkgVer>
<MicrosoftExtensionsConfigurationPkgVer>[8.0.0,)</MicrosoftExtensionsConfigurationPkgVer>
<MicrosoftExtensionsOptionsPkgVer>[8.0.0,)</MicrosoftExtensionsOptionsPkgVer>
<MicrosoftNETFrameworkReferenceAssembliesPkgVer>[1.0.3,2.0)</MicrosoftNETFrameworkReferenceAssembliesPkgVer>
<MicrosoftOwinPkgVer>[4.2.2,5.0)</MicrosoftOwinPkgVer>
<MicrosoftPublicApiAnalyzersPkgVer>[3.11.0-beta1.23525.2]</MicrosoftPublicApiAnalyzersPkgVer>
Expand All @@ -49,8 +49,13 @@
<CassandraCSharpDriverPkgVer>[3.16.0,4.0)</CassandraCSharpDriverPkgVer>
<StyleCopAnalyzersPkgVer>[1.2.0-beta.556,2.0)</StyleCopAnalyzersPkgVer>
<SystemNetHttp>[4.3.4,)</SystemNetHttp>
<SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>
<SystemTextJsonPkgVer>[6.0.0,)</SystemTextJsonPkgVer>
<SystemReflectionEmitLightweightPkgVer>[4.7.0,)</SystemReflectionEmitLightweightPkgVer>

<!-- Note: Special handling is performed for System.Text.Json. -->
<SystemTextEncodingsWebMinimumOutOfBandPkgVer>[4.7.2,)</SystemTextEncodingsWebMinimumOutOfBandPkgVer>
<SystemTextJsonMinimumOutOfBandPkgVer>[4.7.2,)</SystemTextJsonMinimumOutOfBandPkgVer>
<SystemTextJsonLatestNet6OutOfBandPkgVer>[6.0.10,)</SystemTextJsonLatestNet6OutOfBandPkgVer>
<SystemTextJsonLatestNet8OutOfBandPkgVer>[8.0.5,)</SystemTextJsonLatestNet8OutOfBandPkgVer>
</PropertyGroup>

<ItemGroup>
Expand Down
20 changes: 20 additions & 0 deletions build/Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
<Project>

<ItemGroup Condition="'$(SystemTextJsonMinimumRequiredPkgVer)' != ''">
<!--
Note: System.Text.Encodings.Web is referenced when System.Text.Json is
using v4.7.2 because System.Text.Json v4.7.2 depends on
System.Text.Encodings.Web
>= v4.7.1 but System.Text.Encodings.Web needs to be at v4.7.2 to be
safe.
-->
<PackageReference Include="System.Text.Encodings.Web"
Version="$(SystemTextEncodingsWebMinimumOutOfBandPkgVer)"
Condition="'$(SystemTextJsonMinimumRequiredPkgVer)' == '4.7.2' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
<PackageReference Include="System.Text.Json"
Version="$(SystemTextJsonMinimumRequiredPkgVer)"
Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />

<PackageReference Include="System.Text.Json"
Version="$(SystemTextJsonLatestNet8OutOfBandPkgVer)"
Condition="'$(TargetFramework)' == 'net8.0'" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
* Drop support for .NET 6 as this target is no longer supported.
([#2123](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2123))

* Bumped `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and bumped to `8.0.5` on `net8.0` in response to
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#2196](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2196))

## 1.10.0-alpha.1

Released 2024-Sep-06
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
in the future (hopefully .NET 9) see https://github.com/dotnet/runtime/issues/92509 -->
<NoWarn>$(NoWarn);SYSLIB1100;SYSLIB1101</NoWarn>
<PackageValidationBaselineVersion>1.9.2</PackageValidationBaselineVersion>
<SystemTextJsonMinimumRequiredPkgVer>$(SystemTextJsonLatestNet6OutOfBandPkgVer)</SystemTextJsonMinimumRequiredPkgVer>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -23,12 +24,11 @@

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OTelSdkVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPkgVer)" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'net462'" />
<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' == '$(NetFrameworkMinimumSupportedVersion)'" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions src/OpenTelemetry.Resources.AWS/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
and add .NET Standard 2.0 target.
([#2164](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2164))

* Bumped `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and bumped to `8.0.5` on `net8.0` in response to
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#2196](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2196))

## 1.5.0-beta.1

Released 2024-Jun-04
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
<Description>OpenTelemetry Resource Detectors for AWS ElasticBeanstalk, EC2, ECS, EKS.</Description>
<MinVerTagPrefix>Resources.AWS-</MinVerTagPrefix>
<SystemTextJsonMinimumRequiredPkgVer>$(SystemTextJsonLatestNet6OutOfBandPkgVer)</SystemTextJsonMinimumRequiredPkgVer>
</PropertyGroup>

<!-- Do not run Package Baseline Validation as this package has never released a stable version.
Expand All @@ -16,7 +17,6 @@

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading