Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[3.1] Credscan second round - #43051

Merged
aik-jahoda merged 7 commits into
dotnet:release/3.1from
aik-jahoda:jajahoda/sredscan3.1-2
Mar 19, 2021
Merged

[3.1] Credscan second round#43051
aik-jahoda merged 7 commits into
dotnet:release/3.1from
aik-jahoda:jajahoda/sredscan3.1-2

Conversation

@aik-jahoda

@aik-jahoda aik-jahoda commented Mar 12, 2021

Copy link
Copy Markdown

Second round of Credscan effort

First we need merge dotnet/runtime-assets#124

@aik-jahoda
aik-jahoda force-pushed the jajahoda/sredscan3.1-2 branch 2 times, most recently from 3e722d2 to 3ac3eb6 Compare March 12, 2021 15:57
@danmoseley
danmoseley requested review from krwq and wfurt March 12, 2021 16:12
@aik-jahoda
aik-jahoda force-pushed the jajahoda/sredscan3.1-2 branch from 3ac3eb6 to 836cc86 Compare March 12, 2021 16:48
@aik-jahoda aik-jahoda changed the title Credscan second round [3.1] Credscan second round Mar 12, 2021

@danmoseley danmoseley left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM if tests pass with the updated cert files.

@aik-jahoda
aik-jahoda requested a review from a team March 12, 2021 17:02
@SamMonoRT

Copy link
Copy Markdown
Member

@aik-jahoda - like the last set of changes, are these going to be ported over to mono\corefx ?

@Anipik

Anipik commented Mar 12, 2021

Copy link
Copy Markdown

Branches got closed yesterday, we might have to wait for the may release to merge this one.

@danmoseley

danmoseley commented Mar 12, 2021

Copy link
Copy Markdown

@SamMonoRT for speed, is it possible for someone on your team to cherry-pick them?

Edit: I mean, I'm sure he would be happy to. I'm just trying to reduce the critical path...

@danmoseley

Copy link
Copy Markdown
Process terminated. Assertion Failed
Certificates cctor threw System.IO.DirectoryNotFoundException: Could not find a part of the path '/root/helix/work/workitem/TestDataCertificates/testservereku.contoso.com.pfx'.
   at Interop.ThrowExceptionForIoErrno(ErrorInfo errorInfo, String path, Boolean isDirectory, Func`2 errorRewriter) in /_/src/System.Private.CoreLib/shared/Interop/Unix/Interop.IOErrors.cs:line 24
   at Microsoft.Win32.SafeHandles.SafeFileHandle.Open(String path, OpenFlags flags, Int32 mode) in /_/src/System.Private.CoreLib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs:line 39
   at System.IO.FileStream.OpenHandle(FileMode mode, FileShare share, FileOptions options) in /_/src/System.Private.CoreLib/shared/System/IO/FileStream.Unix.cs:line 61
   at System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share, Int32 bufferSize, FileOptions options) in /_/src/System.Private.CoreLib/shared/System/IO/FileStream.cs:line 237


Rerunning - hopefully certs have flowed now.

@danmoseley danmoseley closed this Mar 12, 2021
@danmoseley danmoseley reopened this Mar 12, 2021
@SamMonoRT

Copy link
Copy Markdown
Member

@SamMonoRT for speed, is it possible for someone on your team to cherry-pick them?

Edit: I mean, I'm sure he would be happy to. I'm just trying to reduce the critical path...

Yes, that's a possibility. If Jan doesn't get to it, we'll pick it up next week. Some of the issues with those files in mono\corefx had an incorrect tag of NET-CredScan-SpecialInput, which made us add exceptions to many of them, hence checked if these were going to be ported over. I'll make another pass on the mono\corefx issues under DevDiv\Mono early next week and update the tags.

@SamMonoRT

Copy link
Copy Markdown
Member

@aik-jahoda - thank you for making the corresponding changes in mono/corefx via https://github.com/mono/corefx/pull/404/files

@danmoseley danmoseley closed this Mar 15, 2021
@danmoseley danmoseley reopened this Mar 15, 2021
@danmoseley

Copy link
Copy Markdown

Let's try again.

@danmoseley

Copy link
Copy Markdown

@dotnet/ncl could someone please signoff on the networking/URI changes
@bartonjs could you ack the crypto changes

would like to merge this today if we can.

@danmoseley

Copy link
Copy Markdown

Still needs update to runtime-assets version to make tests pass

@aik-jahoda

Copy link
Copy Markdown
Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@danmoseley

Copy link
Copy Markdown

Just needs @bartonjs signoff, then we can merge but with special care to immediately cancel the official build.

@aik-jahoda
aik-jahoda merged commit b3f5ee0 into dotnet:release/3.1 Mar 19, 2021
@aik-jahoda
aik-jahoda deleted the jajahoda/sredscan3.1-2 branch March 19, 2021 22:15
aik-jahoda pushed a commit to aik-jahoda/runtime that referenced this pull request Mar 23, 2021
aik-jahoda pushed a commit to aik-jahoda/runtime that referenced this pull request Mar 24, 2021
danmoseley pushed a commit to dotnet/runtime that referenced this pull request Mar 26, 2021
* Port of dotnet/corefx#43051

* Shrink suppression file

* Update src/libraries/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs

* Bump System.Net.TestData version

* fix setup_certificates.ps1

* Revert casing in connection string

* Update Rfc2898Tests.cs

* Fix connection string case

* Change suppression messages

* Fix typo

* more fixes

* Remove false positive

* fix usersecrets

Co-authored-by: Dan Moseley <danmose@microsoft.com>
danmoseley pushed a commit to dotnet/runtime that referenced this pull request Mar 26, 2021
* Port of dotnet/corefx#43051

* Shrink suppression file

* Fix another bugs

* Bump System.Net.TestData version

* Fix typo

* Revert casing in connection string

* Fix connection string case

* more fixes

* Change suppression messages

* Fix typo

* Remove false positive

* Fix usersecrets

Co-authored-by: Dan Moseley <danmose@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants