Skip to content

Avoid alerting CG when an intermediate nupkg contains "vulnerable" dependencies #13935

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

Merged
merged 2 commits into from
Aug 2, 2023
Merged

Avoid alerting CG when an intermediate nupkg contains "vulnerable" dependencies #13935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2025b01
Avoid alerting CG when an intermediate nupkg contains "vulnerable" de…
mmitche Aug 1, 2023
304c3f8
Attempt to remove one location where the nuget package cache path is …
mmitche Aug 2, 2023
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
9 changes: 9 additions & 0 deletions eng/common/templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,12 @@ steps:
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
continueOnError: true
condition: succeededOrFailed()

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
- task: ComponentGovernanceComponentDetection@0
displayName: Component Detection (Exclude upstream cache)
inputs:
ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
2 changes: 2 additions & 0 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcade.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<CurrentRepoSourceBuildArtifactsDir>$([MSBuild]::NormalizeDirectory('$(CurrentRepoSourceBuildSourceDir)', 'artifacts'))</CurrentRepoSourceBuildArtifactsDir>
<CurrentRepoSourceBuildArtifactsPackagesDir>$([MSBuild]::NormalizeDirectory('$(CurrentRepoSourceBuildArtifactsDir)', 'packages', '$(Configuration)'))</CurrentRepoSourceBuildArtifactsPackagesDir>

<CurrentRepoSourceBuildNuGetSourceName>source-build-int-nupkg-cache</CurrentRepoSourceBuildNuGetSourceName>
<!-- If this path is updated, also update the component detection task in eng\common\templates\steps\source-build.yml -->
<CurrentRepoSourceBuiltNupkgCacheDir>$([MSBuild]::NormalizeDirectory('$(CurrentRepoSourceBuildArtifactsDir)', 'obj', 'source-built-upstream-cache'))</CurrentRepoSourceBuiltNupkgCacheDir>

<PrebuiltBaselineDataFileDefault>$(RepositoryEngineeringDir)SourceBuildPrebuiltBaseline.xml</PrebuiltBaselineDataFileDefault>
Expand Down
26 changes: 15 additions & 11 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeTools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,33 +36,37 @@
(('$(ArcadeBuildFromSource)' == 'true' and '$(ArcadeInnerBuildFromSource)' == 'true' and '@(SourceBuildIntermediateNupkgReference)' != '') or
'$(SetUpSourceBuildIntermediateNupkgCache)' == 'true')"
AfterTargets="Restore">
<PropertyGroup>
<SourceBuildNuGetSourceName>source-build-int-nupkg-cache</SourceBuildNuGetSourceName>
<SourceBuiltNupkgCacheDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'source-built-upstream-cache'))</SourceBuiltNupkgCacheDir>
</PropertyGroup>

<ItemGroup>
<IntermediateNupkgSourceDir Include="$([MSBuild]::NormalizeDirectory(
'$(NuGetPackageRoot)',
'$([System.String]::new(`%(SourceBuildIntermediateNupkgReference.Identity)`).ToLowerInvariant())',
'$([System.String]::new(`%(SourceBuildIntermediateNupkgReference.ExactVersion)`).ToLowerInvariant())',
'$([System.String]::new(`%(SourceBuildIntermediateNupkgReference.ExactVersion)`).ToLowerInvariant())'))" />

<IntermediateNupkgSourceArtifactsDir Include="$([MSBuild]::NormalizeDirectory(
'$([System.String]::new(`%(IntermediateNupkgSourceDir.Identity)`).ToLowerInvariant())',
'artifacts'))" />

<SourceBuiltNupkgFile Include="%(IntermediateNupkgSourceDir.Identity)**\*.nupkg" />
<SourceBuiltNupkgFile Include="%(IntermediateNupkgSourceArtifactsDir.Identity)**\*.nupkg" />
</ItemGroup>

<Copy
SourceFiles="@(SourceBuiltNupkgFile)"
DestinationFiles="@(SourceBuiltNupkgFile -> '$(SourceBuiltNupkgCacheDir)%(Filename)%(Extension)')" />
DestinationFiles="@(SourceBuiltNupkgFile -> '$(CurrentRepoSourceBuiltNupkgCacheDir)%(Filename)%(Extension)')" />

<!-- Remove the original source build intermediate directory. The extracted cached remains.
This ensures that all sources of intermediates are in the nupkg cache dir, and tooling like CG can
exclude scanning of these directories, instead focusing on whether the packages are utilized rather
than simply available. -->
<RemoveDir Directories="@(IntermediateNupkgSourceDir)" />

<AddSourceToNuGetConfig
NuGetConfigFile="$(RestoreConfigFile)"
SourceName="$(SourceBuildNuGetSourceName)"
SourcePath="$(SourceBuiltNupkgCacheDir)" />
SourceName="$(CurrentRepoSourceBuildNuGetSourceName)"
SourcePath="$(CurrentRepoSourceBuiltNupkgCacheDir)" />

<AddSourceMappingToNugetConfig
NuGetConfigFile="$(RestoreConfigFile)"
SourceName="$(SourceBuildNuGetSourceName)" />
SourceName="$(CurrentRepoSourceBuildNuGetSourceName)" />
</Target>

</Project>