Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4ac2501
WIP: Add implementation of NegotiateAuthentication
filipnavara Jun 3, 2022
c7a6bce
WIP: Update error code mapping
filipnavara Jun 4, 2022
5d5c61f
Spanify input of GetOutgoingBlob
filipnavara Jun 4, 2022
d0d1bba
Update comments
filipnavara Jun 4, 2022
982e7c3
Move NegotiateStreamPal.Encrypt/Decrypt to shared sources. Unix imple…
filipnavara Jun 4, 2022
cbd24a2
Revert accidental change
filipnavara Jun 4, 2022
9d4d557
Build fixes.
filipnavara Jun 4, 2022
c371515
Fix error handling condition
filipnavara Jun 4, 2022
3306c67
Update error mapping based on HttpListener usage.
filipnavara Jun 4, 2022
065d87c
WIP: HttpListener test
filipnavara Jun 7, 2022
447020a
Move workaround from HttpListener to low-level SSPI code
filipnavara Jun 7, 2022
bed08fa
Fix build
filipnavara Jun 14, 2022
318ca06
Clean up
filipnavara Jun 14, 2022
5474811
Revert "WIP: HttpListener test"
filipnavara Jun 14, 2022
4cdb8af
Convert System.Net.Http.FunctionalTests to use NegotiateAuthenticatio…
filipnavara Jun 14, 2022
34e47c4
Dispose the identity along NegotiateAuthentication
filipnavara Jun 14, 2022
73ac446
Modify unit tests to use the new API
filipnavara Jun 14, 2022
7e85f10
Add exceptions for invalid inputs/states
filipnavara Jun 14, 2022
7c870bd
Remove tvOS unsupported marker, managed NTLM is used on tvOS
filipnavara Jun 16, 2022
1bd0cde
Apply suggestions from code review
filipnavara Jun 14, 2022
e93f073
Fix typo
filipnavara Jun 14, 2022
5aae44d
Remove reference equality checks from IsNTLM/IsKerberos
filipnavara Jun 16, 2022
b746590
Remove NTAuthentication.AssociatedName to make it more obvious which …
filipnavara Jun 16, 2022
dd7dd9a
Add comment
filipnavara Jun 16, 2022
39a43b2
Add more tests, handle unsupported protocols
filipnavara Jun 16, 2022
9a4ccdf
Handle NotSupportedException from NTAuthentication constructor
filipnavara Jun 16, 2022
e86ce79
Add workaround for linker issue
filipnavara Jun 17, 2022
ffed0be
Apply suggestions from code review
filipnavara Jun 20, 2022
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
Prev Previous commit
Next Next commit
Add exceptions for invalid inputs/states
  • Loading branch information
filipnavara authored Jun 16, 2022
commit 7e85f10db1f3f27e63395d9c250aa17e340cc966
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public sealed class NegotiateAuthentication : IDisposable
/// <param name="clientOptions">The property bag for the authentication options.</param>
public NegotiateAuthentication(NegotiateAuthenticationClientOptions clientOptions)
{
ArgumentNullException.ThrowIfNull(clientOptions);

ContextFlagsPal contextFlags = ContextFlagsPal.Connection | clientOptions.RequiredProtectionLevel switch
{
ProtectionLevel.Sign => ContextFlagsPal.InitIntegrity,
Expand All @@ -47,6 +49,8 @@ public NegotiateAuthentication(NegotiateAuthenticationClientOptions clientOption
/// <param name="serverOptions">The property bag for the authentication options.</param>
public NegotiateAuthentication(NegotiateAuthenticationServerOptions serverOptions)
{
ArgumentNullException.ThrowIfNull(serverOptions);

ContextFlagsPal contextFlags = ContextFlagsPal.Connection | serverOptions.RequiredProtectionLevel switch
{
ProtectionLevel.Sign => ContextFlagsPal.AcceptIntegrity,
Expand Down Expand Up @@ -162,6 +166,10 @@ public IIdentity RemoteIdentity
IIdentity? identity = _remoteIdentity;
if (identity is null)
{
if (!IsAuthenticated)
{
throw new InvalidOperationException(SR.net_auth_noauth);
}
if (IsServer)
{
// Server authentication is not supported on tvOS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@ public class NegotiateAuthenticationTests
private static NetworkCredential s_testCredentialWrong = new NetworkCredential("rightusername", "wrongpassword");
private static readonly byte[] s_Hello = "Hello"u8.ToArray();

[Fact]
public void Constructor_Overloads_Validation()
{
AssertExtensions.Throws<ArgumentNullException>("clientOptions", () => { new NegotiateAuthentication((NegotiateAuthenticationClientOptions)null); });
AssertExtensions.Throws<ArgumentNullException>("serverOptions", () => { new NegotiateAuthentication((NegotiateAuthenticationServerOptions)null); });
}

// TODO: Currently fails both on Linux (proceeds with Negotiate) and managed implementation (throws PlatformNotSupportedException)
/*[Fact]
public void Unsupported_Package()
{
NegotiateAuthenticationClientOptions clientOptions = new NegotiateAuthenticationClientOptions { Package = "INVALID", Credential = s_testCredentialRight, TargetName = "HTTP/foo" };
NegotiateAuthentication negotiateAuthentication = new NegotiateAuthentication(clientOptions);
NegotiateAuthenticationStatusCode statusCode;
negotiateAuthentication.GetOutgoingBlob((byte[]?)null, out statusCode);
Assert.Equal(NegotiateAuthenticationStatusCode.Unsupported, statusCode);
}*/

[Fact]
public void NtlmProtocolExampleTest()
{
Expand Down