-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Use managed ntlm on linux-bionic #95274
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d79ebf5
Use managed ntlm on linux-bionic
rzikm 415c61a
Fix failing unit test
rzikm ddf00d4
Fix compilation
rzikm 6b21cb1
Enable more tests on ubuntu-bionic
rzikm 82c1136
Change runtime identifier check to regex
rzikm 19dd5ed
Revert "Change runtime identifier check to regex"
rzikm c837778
add hyphen to startswith
rzikm 1ede567
Update src/libraries/Common/tests/System/Net/Capability.Security.Unix.cs
rzikm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 8 additions & 3 deletions
11
src/libraries/Common/tests/System/Net/Capability.Security.Unix.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,20 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Runtime.InteropServices; | ||
|
|
||
| namespace System.Net.Test.Common | ||
| { | ||
| public static partial class Capability | ||
| { | ||
| public static bool IsNtlmInstalled() | ||
| { | ||
| // GSS on Linux does not work with OpenSSL 3.0. Fix was submitted to gss-ntlm but it will take a while to make to | ||
| // all supported distributions. The second part of the check should be removed when it does. | ||
| return Interop.NetSecurityNative.IsNtlmInstalled() && (!PlatformDetection.IsOpenSslSupported || PlatformDetection.OpenSslVersion.Major < 3); | ||
| return | ||
| // Linux bionic uses managed NTLM implementation | ||
| (OperatingSystem.IsLinux() && RuntimeInformation.RuntimeIdentifier.StartsWith("linux-bionic-", StringComparison.Ordinal)) || | ||
| // GSS on Linux does not work with OpenSSL 3.0. Fix was submitted to gss-ntlm but it will take a while to make to | ||
| // all supported distributions. The second part of the check should be removed when it does. | ||
| Interop.NetSecurityNative.IsNtlmInstalled() && (!PlatformDetection.IsOpenSslSupported || PlatformDetection.OpenSslVersion.Major < 3); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,6 @@ public void Constructor_Overloads_Validation() | |
| } | ||
|
|
||
| [Fact] | ||
| [SkipOnPlatform(TestPlatforms.LinuxBionic, "https://github.com/dotnet/runtime/issues/93104")] | ||
| public void RemoteIdentity_ThrowsOnUnauthenticated() | ||
| { | ||
| NegotiateAuthenticationClientOptions clientOptions = new NegotiateAuthenticationClientOptions { Credential = s_testCredentialRight, TargetName = "HTTP/foo" }; | ||
|
|
@@ -66,7 +65,6 @@ public void RemoteIdentity_ThrowsOnDisposed() | |
| } | ||
|
|
||
| [Fact] | ||
| [SkipOnPlatform(TestPlatforms.LinuxBionic, "https://github.com/dotnet/runtime/issues/93104")] | ||
| public void Package_Unsupported() | ||
| { | ||
| NegotiateAuthenticationClientOptions clientOptions = new NegotiateAuthenticationClientOptions { Package = "INVALID", Credential = s_testCredentialRight, TargetName = "HTTP/foo" }; | ||
|
|
@@ -98,7 +96,6 @@ public void Package_Unsupported_NTLM() | |
|
|
||
| [Fact] | ||
| [SkipOnPlatform(TestPlatforms.Windows, "The test is specific to GSSAPI / Managed implementations of NegotiateAuthentication")] | ||
| [SkipOnPlatform(TestPlatforms.LinuxBionic, "https://github.com/dotnet/runtime/issues/93104")] | ||
| public void DefaultNetworkCredentials_NTLM_DoesNotThrow() | ||
| { | ||
| NegotiateAuthenticationClientOptions clientOptions = new NegotiateAuthenticationClientOptions { Package = "NTLM", Credential = CredentialCache.DefaultNetworkCredentials, TargetName = "HTTP/foo" }; | ||
|
|
@@ -169,7 +166,7 @@ public static IEnumerable<object[]> TestCredentials() | |
| yield return new object[] { new NetworkCredential("rightusername", "rightpassword") }; | ||
| yield return new object[] { new NetworkCredential("rightusername", "rightpassword", "rightdomain") }; | ||
| yield return new object[] { new NetworkCredential("[email protected]", "rightpassword") }; | ||
| } | ||
| } | ||
|
|
||
| [ConditionalTheory(nameof(IsNtlmAvailable))] | ||
| [MemberData(nameof(TestCredentials))] | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.