-
Notifications
You must be signed in to change notification settings - Fork 498
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.
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
add TSA config #4860
add TSA config #4860
Conversation
I think that's arcade's support for SDL in post-build. The 1ES equivalent is https://github.com/dotnet/arcade/blob/35ae51c95ebb0baca22475b0f5f39d5270a2f2aa/Documentation/CodeQLGuidance.md?plain=1#L18 |
Actually, you may want both. Let me look further |
If there's any doubt at all, I suggest every repo have both, it's harmless? Clearly we need the 1ES ones for non Arcade repos. |
I see that dotnet/sdk and dotnet/wpf do not have .config\tsaoptions.config. cc @marcpopMSFT and @pchaurasia14 to see whatever guidance you provide us... |
OK added both to all these PR's. |
Here's my recommendation. Can you create a branch with tsaoptions.json with relevant info, add in the change i made for enabling policheck, and let's use that. That will cover all of the tools in the Arcade list and we can verify the tsa filing capabilities. |
Well, I pushed this branch to https://github.com/dotnet/aspire/commits/tsaconfig/ -- is that what you want? (This PR is using a branch in my fork)
I don't know what this is? |
|
ah! OK, added. |
Why is policheck special in the template -- what about other compliance tooling, do we enable other stuff there? (I guess my answer is probably in the 1ES docs.) |
@mmitche do you want to sign off. |
|
@marcpopMSFT I think we're using this PR to test the theory that since moving from custom/Arcade templates to 1ES templates, we don't use that file any more, but instead use tsaoptions.config. We're going to merge this and see what happens then follow in other repos. |
@mmitche if you can sign off we can see what happens overnight? |
@danmoseley similar to dotnet/sdk we too have a sdl-tsa-vars.config file but as you mentioned there, it is not being consumed by any of the pipelines here either. Are we expected to make changes to this and create tsaoption.json file and add it to the pipeline? |
for SDK or WPF, it actually does get consumed because the staging pipeline runs SDL (currently) for all repos in the drop. Repos like aspire don't participate in that pipeline by design. My sense here is that tsaoptions is the right way to do things going forward, but let's watch the output of this overnight to be sure. |
seems to all have run? not sure what this is
|
Rerunning. We just rolled out a fix and it should work now |
I see credscan, binskim, policheck there -- good. How do I see those results, short of them showing up on my S360 eventually? Also I don't see codeql run - is that expected? And I don't see run results for it either: https://codeql.microsoft.com/codeql/jobs?Uri=https%3A%2F%2Fdev.azure.com%2Fdnceng%2Finternal%2F_git%2Fdotnet-aspire |
That issue above is now gone. @mmitche thoughts about my 2 questions above |
I downloaded drop_sdl_sources from the artifacts and see policheck and credscan results there (and "armory"). There's two credscan hits I'll suppress. I don't see binskim or codeql. |
Binskim kept getting skipped because it didn't find any binaries to scan: https://dev.azure.com/dnceng/internal/_build/results?buildId=2493583&view=logs&j=0bc77094-9fcd-5c38-f6e4-27d2ae131589&t=61b312a4-28dc-5d04-2147-0002389671a5 |
And CodeQL ran recently so it was not run on that pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2493583&view=logs&j=0bc77094-9fcd-5c38-f6e4-27d2ae131589&t=2a59943c-247e-515a-0955-8f0408e51908&l=75 |
several of those steps are looking in a 'codecoverage' sub directory of the output, which seems fishy/wrong. eg
@RussKie any idea why it thinks that's the output directory? Is the https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_apis/build/builds/2493583/logs/270 |
commit 9071c84 Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 12 19:04:26 2024 -0400 fix e2e commit 68a7ae0 Merge: 09acf2d 681f2e7 Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 12 18:57:33 2024 -0400 Merge remote-tracking branch 'origin/main' into tests-out-of-repo commit 681f2e7 Author: Dan Moseley <danmose@microsoft.com> Date: Fri Jul 12 14:04:57 2024 -0600 Make credscan run clean (dotnet#4876) * suppressions * more * typo commit a133411 Author: Dan Moseley <danmose@microsoft.com> Date: Fri Jul 12 08:42:40 2024 -0600 add TSA config (dotnet#4860) * tsaconfig * more * remove the config per Matt * add policheck in 1ES template * policheck exclusions commit cf61a58 Author: James Newton-King <james@newtonking.com> Date: Fri Jul 12 13:00:02 2024 +0800 Load plotly as a module on metrics page (dotnet#4857) commit 09acf2d Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 12 00:34:04 2024 -0400 fix archive path for e2e commit da382ff Merge: 18b92c3 de35684 Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 12 00:12:02 2024 -0400 Merge remote-tracking branch 'origin/main' into tests-out-of-repo commit 18b92c3 Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 12 00:07:52 2024 -0400 merge from playground branch commit de35684 Author: James Newton-King <james@newtonking.com> Date: Fri Jul 12 09:43:58 2024 +0800 Add support for exemplars in metrics UI (dotnet#4629) commit e23cd4c Merge: ef3158b 9421fc8 Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 11 18:00:20 2024 -0400 Merge remote-tracking branch 'origin/main' into tests-out-of-repo commit ef3158b Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 11 03:27:52 2024 -0400 wip commit 7c61df1 Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 11 02:48:20 2024 -0400 fixies mores commit d6e21ab Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 11 03:10:21 2024 -0400 share targets commit 01e419d Merge: 0741157 421f8b1 Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 11 03:00:16 2024 -0400 Merge remote-tracking branch 'origin/main' into tests-out-of-repo # Conflicts: # tests/helix/send-to-helix-inner.proj commit 0741157 Merge: 3406514 f647a66 Author: Ankit Jain <radical@gmail.com> Date: Tue Jul 9 18:43:36 2024 -0400 Merge remote-tracking branch 'origin/main' into tests-out-of-repo commit 3406514 Author: Ankit Jain <radical@gmail.com> Date: Mon Jul 8 21:18:23 2024 -0400 fix build commit 3489ff3 Author: Ankit Jain <radical@gmail.com> Date: Mon Jul 8 20:23:10 2024 -0400 fix props generation commit 6a6315f Author: Ankit Jain <radical@gmail.com> Date: Mon Jul 8 20:14:53 2024 -0400 fix commit 92642ea Author: Ankit Jain <radical@gmail.com> Date: Mon Jul 8 19:36:17 2024 -0400 rename commit 4bea9f4 Author: Ankit Jain <radical@gmail.com> Date: Mon Jul 8 19:21:36 2024 -0400 cleanup # Conflicts: # tests/Aspire.EndToEnd.Tests/Aspire.EndToEnd.Tests.csproj # tests/Shared/RepoTesting/Aspire.Testing.Repo.targets
I'm pretty sure because we use aspire/eng/pipelines/templates/BuildAndTest.yml Lines 104 to 109 in 681f2e7
|
Yeah, it's scanning any published artifacts. Part of the issue used to be (maybe still is?) that binskim didn't properly look for binaries to scan. It didn't unpack nupkgs, or deal with binaries that had embedded PDBs, etc. I think this all got fixed though. |
I'm not sure where this leaves us -- @RussKie is that something you think we should change / do you plan to? ie., how do we fix the binskim errors here. |
@joperezr, it looks like the "binskim collect" step runs 4 times, once for each publish of some kind, and code coverage is just the one I happened to see, it's not directly relevant. We don't expect it to find any dll's in the code covearge outputs of course, but it doesn't find them in anything else either. Does this mean we need to explicitly publish dlls, not just nupkg, xml etc?
I think (?) it is getting the nupkg, but still says 0 to scan. @RussKie and I don't know how this fits together, or is normally expected to work. Aside -- when I picked a random newer build from this pipeline, I don't see Binskim at all. What is special about this build that it has binskim collect at all? |
@mmitche could you confirm this looks right, and whether we have any other actions to onboard Aspire and see compliance alerts flowing?
Next I will add to dotnet/extensions and dotnet/aspire-samples -- I see they already exist in sdk, winforms,wpf, runtime, aspnetcore and all seem comparable. @wtgodbe where else might we need these?