Add support for specifying Kerberos package on Linux/macOS#72024

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
wfurt merged 1 commit into from
Jul 28, 2022
Merged

Add support for specifying Kerberos package on Linux/macOS #72024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions ...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
internal static partial class NetSecurityNative
{
internal enum PackageType : uint
{
Negotiate = 0,
NTLM = 1,
Kerberos = 2,
}
}
}
14 changes: 7 additions & 7 deletions ...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
[LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
internal static partial Status InitiateCredWithPassword(
out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
SafeGssNameHandle desiredName,
string password,
int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
out Status minorStatus,
SafeGssCredHandle initiatorCredHandle,
ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
SafeGssNameHandle? targetName,
uint reqFlags,
ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
out Status minorStatus,
SafeGssCredHandle initiatorCredHandle,
ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
IntPtr cbt,
int cbtSize,
SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
out Status minorStatus,
SafeGssCredHandle initiatorCredHandle,
ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
SafeGssNameHandle? targetName,
uint reqFlags,
ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
out minorStatus,
initiatorCredHandle,
ref contextHandle,
isNtlmOnly,
packageType,
targetName,
reqFlags,
ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
out Status minorStatus,
SafeGssCredHandle initiatorCredHandle,
ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
IntPtr cbt,
int cbtSize,
SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
out minorStatus,
initiatorCredHandle,
ref contextHandle,
isNtlmOnly,
packageType,
cbt,
cbtSize,
targetName,
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
/// returns the handle for the given credentials.
/// The method returns an invalid handle if the username is null or empty.
/// </summary>
public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
{
if (isNtlmOnly && !s_IsNtlmInstalled.Value)
if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
{
throw new Interop.NetSecurityNative.GssApiException(
Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
}
else
{
status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
}

if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down
48 changes: 34 additions & 14 deletions src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
out byte[]? resultBuffer,
ref ContextFlagsPal outFlags)
{
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

resultBuffer = null;

if (context == null)
{
if (NetEventSource.Log.IsEnabled())
{
string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
string protocol = packageType switch {
Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
_ => "SPNEGO"
};
NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
}

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
credential.GssCredential,
ref contextHandle,
isNtlmOnly,
packageType,
cbtAppData,
cbtAppDataSize,
negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
credential.GssCredential,
ref contextHandle,
isNtlmOnly,
packageType,
negoContext.TargetName,
(uint)inputFlags,
incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
{
if (NetEventSource.Log.IsEnabled())
{
string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
string protocol = packageType switch {
Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
_ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
};
NetEventSource.Info(context, $"actual protocol = {protocol}");
}

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
{
bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
string.IsNullOrWhiteSpace(credential.Password);
bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
if (ntlmOnly && isEmptyCredential && !isServer)
Interop.NetSecurityNative.PackageType packageType;

if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
{
// NTLM authentication is not possible with default credentials which are no-op
throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
packageType = Interop.NetSecurityNative.PackageType.Negotiate;
}

if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
{
packageType = Interop.NetSecurityNative.PackageType.NTLM;
if (isEmptyCredential && !isServer)
{
// NTLM authentication is not possible with default credentials which are no-op
throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
}
}
else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
{
packageType = Interop.NetSecurityNative.PackageType.Kerberos;
}
else
{
// Native shim currently supports only NTLMand Negotiate
// Native shim currently supports only NTLM, Negotiate and Kerberos
throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
}

try
{
return isEmptyCredential ?
new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
}
catch (Exception ex)
{
Expand Down
14 changes: 7 additions & 7 deletions src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
{
private SafeGssCredHandle _credential;
private readonly bool _isNtlmOnly;
private readonly Interop.NetSecurityNative.PackageType _packageType;
private readonly string _userName;
private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
get { return _credential; }
}

// Property represents if Ntlm Protocol is specfied or not.
public bool IsNtlmOnly
// Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
public Interop.NetSecurityNative.PackageType PackageType
{
get { return _isNtlmOnly; }
get { return _packageType; }
}

public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
get { return _isDefault; }
}

public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
: base(IntPtr.Zero, true)
{
Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
}

bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
_userName = username;
_isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
_credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
_credential = SafeGssCredHandle.Create(username, password, packageType);
_credential.DangerousAddRef(ref ignore);
}

Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Net.Security/src/System.Net.Security.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
Link="Common\Interop\Unix\Interop.Errors.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
<Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add support for specifying Kerberos package on Linux/macOS#72024

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

wfurt
merged 1 commit into

from

Jul 28, 2022
 Merged


Add support for specifying Kerberos package on Linux/macOS
#72024
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


17 changes: 17 additions & 0 deletions
...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
 internal static partial class NetSecurityNative
 {
 internal enum PackageType : uint
 {
 Negotiate = 0,
 NTLM = 1,
 Kerberos = 2,
 }
 }
}

14 changes: 7 additions & 7 deletions
...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
 [LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
 internal static partial Status InitiateCredWithPassword(
 out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
 SafeGssNameHandle desiredName,
 string password,
 int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 targetName,
 reqFlags,
 ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbt,
 cbtSize,
 targetName,
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
 /// returns the handle for the given credentials.
 /// The method returns an invalid handle if the username is null or empty.
 /// </summary>
 public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
 public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
 {
 if (isNtlmOnly && !s_IsNtlmInstalled.Value)
 if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
 {
 throw new Interop.NetSecurityNative.GssApiException(
 Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
 }
 else
 {
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 }

 if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down

48 changes: 34 additions & 14 deletions
src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
 out byte[]? resultBuffer,
 ref ContextFlagsPal outFlags)
 {
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

 resultBuffer = null;

 if (context == null)
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => "SPNEGO"
 };
 NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
 }

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbtAppData,
 cbtAppDataSize,
 negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 negoContext.TargetName,
 (uint)inputFlags,
 incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
 };
 NetEventSource.Info(context, $"actual protocol = {protocol}");
 }

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
 {
 bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
 string.IsNullOrWhiteSpace(credential.Password);
 bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
 if (ntlmOnly && isEmptyCredential && !isServer)
 Interop.NetSecurityNative.PackageType packageType;

 if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 packageType = Interop.NetSecurityNative.PackageType.Negotiate;
 }

 if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
 else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.NTLM;
 if (isEmptyCredential && !isServer)
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 }
 }
 else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.Kerberos;
 }
 else
 {
 // Native shim currently supports only NTLMand Negotiate
 // Native shim currently supports only NTLM, Negotiate and Kerberos
 throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
 }

 try
 {
 return isEmptyCredential ?
 new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
 new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
 }
 catch (Exception ex)
 {
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
 internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
 {
 private SafeGssCredHandle _credential;
 private readonly bool _isNtlmOnly;
 private readonly Interop.NetSecurityNative.PackageType _packageType;
 private readonly string _userName;
 private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
 get { return _credential; }
 }

 // Property represents if Ntlm Protocol is specfied or not.
 public bool IsNtlmOnly
 // Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
 public Interop.NetSecurityNative.PackageType PackageType
 {
 get { return _isNtlmOnly; }
 get { return _packageType; }
 }

 public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
 get { return _isDefault; }
 }

 public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
 public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
 : base(IntPtr.Zero, true)
 {
 Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
 }

 bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
 _userName = username;
 _isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
 _credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
 _credential = SafeGssCredHandle.Create(username, password, packageType);
 _credential.DangerousAddRef(ref ignore);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/src/System.Net.Security.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
 Link="Common\Interop\Unix\Interop.Errors.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for specifying Kerberos package on Linux/macOS#72024

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

wfurt
merged 1 commit into

from

Jul 28, 2022
 Merged


Add support for specifying Kerberos package on Linux/macOS
#72024
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


17 changes: 17 additions & 0 deletions
...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
 internal static partial class NetSecurityNative
 {
 internal enum PackageType : uint
 {
 Negotiate = 0,
 NTLM = 1,
 Kerberos = 2,
 }
 }
}

14 changes: 7 additions & 7 deletions
...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
 [LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
 internal static partial Status InitiateCredWithPassword(
 out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
 SafeGssNameHandle desiredName,
 string password,
 int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 targetName,
 reqFlags,
 ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbt,
 cbtSize,
 targetName,
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
 /// returns the handle for the given credentials.
 /// The method returns an invalid handle if the username is null or empty.
 /// </summary>
 public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
 public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
 {
 if (isNtlmOnly && !s_IsNtlmInstalled.Value)
 if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
 {
 throw new Interop.NetSecurityNative.GssApiException(
 Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
 }
 else
 {
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 }

 if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down

48 changes: 34 additions & 14 deletions
src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
 out byte[]? resultBuffer,
 ref ContextFlagsPal outFlags)
 {
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

 resultBuffer = null;

 if (context == null)
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => "SPNEGO"
 };
 NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
 }

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbtAppData,
 cbtAppDataSize,
 negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 negoContext.TargetName,
 (uint)inputFlags,
 incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
 };
 NetEventSource.Info(context, $"actual protocol = {protocol}");
 }

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
 {
 bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
 string.IsNullOrWhiteSpace(credential.Password);
 bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
 if (ntlmOnly && isEmptyCredential && !isServer)
 Interop.NetSecurityNative.PackageType packageType;

 if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 packageType = Interop.NetSecurityNative.PackageType.Negotiate;
 }

 if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
 else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.NTLM;
 if (isEmptyCredential && !isServer)
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 }
 }
 else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.Kerberos;
 }
 else
 {
 // Native shim currently supports only NTLMand Negotiate
 // Native shim currently supports only NTLM, Negotiate and Kerberos
 throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
 }

 try
 {
 return isEmptyCredential ?
 new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
 new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
 }
 catch (Exception ex)
 {
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
 internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
 {
 private SafeGssCredHandle _credential;
 private readonly bool _isNtlmOnly;
 private readonly Interop.NetSecurityNative.PackageType _packageType;
 private readonly string _userName;
 private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
 get { return _credential; }
 }

 // Property represents if Ntlm Protocol is specfied or not.
 public bool IsNtlmOnly
 // Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
 public Interop.NetSecurityNative.PackageType PackageType
 {
 get { return _isNtlmOnly; }
 get { return _packageType; }
 }

 public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
 get { return _isDefault; }
 }

 public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
 public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
 : base(IntPtr.Zero, true)
 {
 Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
 }

 bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
 _userName = username;
 _isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
 _credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
 _credential = SafeGssCredHandle.Create(username, password, packageType);
 _credential.DangerousAddRef(ref ignore);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/src/System.Net.Security.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
 Link="Common\Interop\Unix\Interop.Errors.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for specifying Kerberos package on Linux/macOS#72024

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

wfurt
merged 1 commit into

from

Jul 28, 2022
 Merged


Add support for specifying Kerberos package on Linux/macOS
#72024
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


17 changes: 17 additions & 0 deletions
...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
 internal static partial class NetSecurityNative
 {
 internal enum PackageType : uint
 {
 Negotiate = 0,
 NTLM = 1,
 Kerberos = 2,
 }
 }
}

14 changes: 7 additions & 7 deletions
...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
 [LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
 internal static partial Status InitiateCredWithPassword(
 out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
 SafeGssNameHandle desiredName,
 string password,
 int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 targetName,
 reqFlags,
 ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbt,
 cbtSize,
 targetName,
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
 /// returns the handle for the given credentials.
 /// The method returns an invalid handle if the username is null or empty.
 /// </summary>
 public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
 public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
 {
 if (isNtlmOnly && !s_IsNtlmInstalled.Value)
 if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
 {
 throw new Interop.NetSecurityNative.GssApiException(
 Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
 }
 else
 {
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 }

 if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down

48 changes: 34 additions & 14 deletions
src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
 out byte[]? resultBuffer,
 ref ContextFlagsPal outFlags)
 {
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

 resultBuffer = null;

 if (context == null)
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => "SPNEGO"
 };
 NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
 }

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbtAppData,
 cbtAppDataSize,
 negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 negoContext.TargetName,
 (uint)inputFlags,
 incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
 };
 NetEventSource.Info(context, $"actual protocol = {protocol}");
 }

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
 {
 bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
 string.IsNullOrWhiteSpace(credential.Password);
 bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
 if (ntlmOnly && isEmptyCredential && !isServer)
 Interop.NetSecurityNative.PackageType packageType;

 if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 packageType = Interop.NetSecurityNative.PackageType.Negotiate;
 }

 if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
 else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.NTLM;
 if (isEmptyCredential && !isServer)
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 }
 }
 else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.Kerberos;
 }
 else
 {
 // Native shim currently supports only NTLMand Negotiate
 // Native shim currently supports only NTLM, Negotiate and Kerberos
 throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
 }

 try
 {
 return isEmptyCredential ?
 new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
 new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
 }
 catch (Exception ex)
 {
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
 internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
 {
 private SafeGssCredHandle _credential;
 private readonly bool _isNtlmOnly;
 private readonly Interop.NetSecurityNative.PackageType _packageType;
 private readonly string _userName;
 private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
 get { return _credential; }
 }

 // Property represents if Ntlm Protocol is specfied or not.
 public bool IsNtlmOnly
 // Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
 public Interop.NetSecurityNative.PackageType PackageType
 {
 get { return _isNtlmOnly; }
 get { return _packageType; }
 }

 public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
 get { return _isDefault; }
 }

 public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
 public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
 : base(IntPtr.Zero, true)
 {
 Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
 }

 bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
 _userName = username;
 _isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
 _credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
 _credential = SafeGssCredHandle.Create(username, password, packageType);
 _credential.DangerousAddRef(ref ignore);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/src/System.Net.Security.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
 Link="Common\Interop\Unix\Interop.Errors.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add support for specifying Kerberos package on Linux/macOS#72024

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

wfurt
merged 1 commit into

from

Jul 28, 2022
 Merged


Add support for specifying Kerberos package on Linux/macOS
#72024
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


17 changes: 17 additions & 0 deletions
...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
 internal static partial class NetSecurityNative
 {
 internal enum PackageType : uint
 {
 Negotiate = 0,
 NTLM = 1,
 Kerberos = 2,
 }
 }
}

14 changes: 7 additions & 7 deletions
...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
 [LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
 internal static partial Status InitiateCredWithPassword(
 out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
 SafeGssNameHandle desiredName,
 string password,
 int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 targetName,
 reqFlags,
 ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbt,
 cbtSize,
 targetName,
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
 /// returns the handle for the given credentials.
 /// The method returns an invalid handle if the username is null or empty.
 /// </summary>
 public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
 public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
 {
 if (isNtlmOnly && !s_IsNtlmInstalled.Value)
 if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
 {
 throw new Interop.NetSecurityNative.GssApiException(
 Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
 }
 else
 {
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 }

 if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down

48 changes: 34 additions & 14 deletions
src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
 out byte[]? resultBuffer,
 ref ContextFlagsPal outFlags)
 {
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

 resultBuffer = null;

 if (context == null)
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => "SPNEGO"
 };
 NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
 }

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbtAppData,
 cbtAppDataSize,
 negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 negoContext.TargetName,
 (uint)inputFlags,
 incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
 };
 NetEventSource.Info(context, $"actual protocol = {protocol}");
 }

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
 {
 bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
 string.IsNullOrWhiteSpace(credential.Password);
 bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
 if (ntlmOnly && isEmptyCredential && !isServer)
 Interop.NetSecurityNative.PackageType packageType;

 if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 packageType = Interop.NetSecurityNative.PackageType.Negotiate;
 }

 if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
 else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.NTLM;
 if (isEmptyCredential && !isServer)
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 }
 }
 else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.Kerberos;
 }
 else
 {
 // Native shim currently supports only NTLMand Negotiate
 // Native shim currently supports only NTLM, Negotiate and Kerberos
 throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
 }

 try
 {
 return isEmptyCredential ?
 new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
 new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
 }
 catch (Exception ex)
 {
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
 internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
 {
 private SafeGssCredHandle _credential;
 private readonly bool _isNtlmOnly;
 private readonly Interop.NetSecurityNative.PackageType _packageType;
 private readonly string _userName;
 private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
 get { return _credential; }
 }

 // Property represents if Ntlm Protocol is specfied or not.
 public bool IsNtlmOnly
 // Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
 public Interop.NetSecurityNative.PackageType PackageType
 {
 get { return _isNtlmOnly; }
 get { return _packageType; }
 }

 public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
 get { return _isDefault; }
 }

 public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
 public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
 : base(IntPtr.Zero, true)
 {
 Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
 }

 bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
 _userName = username;
 _isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
 _credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
 _credential = SafeGssCredHandle.Create(username, password, packageType);
 _credential.DangerousAddRef(ref ignore);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/src/System.Net.Security.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
 Link="Common\Interop\Unix\Interop.Errors.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for specifying Kerberos package on Linux/macOS#72024

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

wfurt
merged 1 commit into

from

Jul 28, 2022
 Merged


Add support for specifying Kerberos package on Linux/macOS
#72024
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


17 changes: 17 additions & 0 deletions
...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
 internal static partial class NetSecurityNative
 {
 internal enum PackageType : uint
 {
 Negotiate = 0,
 NTLM = 1,
 Kerberos = 2,
 }
 }
}

14 changes: 7 additions & 7 deletions
...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
 [LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
 internal static partial Status InitiateCredWithPassword(
 out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
 SafeGssNameHandle desiredName,
 string password,
 int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 targetName,
 reqFlags,
 ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbt,
 cbtSize,
 targetName,
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
 /// returns the handle for the given credentials.
 /// The method returns an invalid handle if the username is null or empty.
 /// </summary>
 public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
 public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
 {
 if (isNtlmOnly && !s_IsNtlmInstalled.Value)
 if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
 {
 throw new Interop.NetSecurityNative.GssApiException(
 Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
 }
 else
 {
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 }

 if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down

48 changes: 34 additions & 14 deletions
src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
 out byte[]? resultBuffer,
 ref ContextFlagsPal outFlags)
 {
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

 resultBuffer = null;

 if (context == null)
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => "SPNEGO"
 };
 NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
 }

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbtAppData,
 cbtAppDataSize,
 negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 negoContext.TargetName,
 (uint)inputFlags,
 incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
 };
 NetEventSource.Info(context, $"actual protocol = {protocol}");
 }

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
 {
 bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
 string.IsNullOrWhiteSpace(credential.Password);
 bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
 if (ntlmOnly && isEmptyCredential && !isServer)
 Interop.NetSecurityNative.PackageType packageType;

 if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 packageType = Interop.NetSecurityNative.PackageType.Negotiate;
 }

 if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
 else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.NTLM;
 if (isEmptyCredential && !isServer)
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 }
 }
 else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.Kerberos;
 }
 else
 {
 // Native shim currently supports only NTLMand Negotiate
 // Native shim currently supports only NTLM, Negotiate and Kerberos
 throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
 }

 try
 {
 return isEmptyCredential ?
 new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
 new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
 }
 catch (Exception ex)
 {
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
 internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
 {
 private SafeGssCredHandle _credential;
 private readonly bool _isNtlmOnly;
 private readonly Interop.NetSecurityNative.PackageType _packageType;
 private readonly string _userName;
 private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
 get { return _credential; }
 }

 // Property represents if Ntlm Protocol is specfied or not.
 public bool IsNtlmOnly
 // Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
 public Interop.NetSecurityNative.PackageType PackageType
 {
 get { return _isNtlmOnly; }
 get { return _packageType; }
 }

 public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
 get { return _isDefault; }
 }

 public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
 public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
 : base(IntPtr.Zero, true)
 {
 Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
 }

 bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
 _userName = username;
 _isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
 _credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
 _credential = SafeGssCredHandle.Create(username, password, packageType);
 _credential.DangerousAddRef(ref ignore);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/src/System.Net.Security.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
 Link="Common\Interop\Unix\Interop.Errors.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for specifying Kerberos package on Linux/macOS#72024

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

wfurt
merged 1 commit into

from

Jul 28, 2022
 Merged


Add support for specifying Kerberos package on Linux/macOS
#72024
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


17 changes: 17 additions & 0 deletions
...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
 internal static partial class NetSecurityNative
 {
 internal enum PackageType : uint
 {
 Negotiate = 0,
 NTLM = 1,
 Kerberos = 2,
 }
 }
}

14 changes: 7 additions & 7 deletions
...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
 [LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
 internal static partial Status InitiateCredWithPassword(
 out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
 SafeGssNameHandle desiredName,
 string password,
 int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 targetName,
 reqFlags,
 ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbt,
 cbtSize,
 targetName,
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
 /// returns the handle for the given credentials.
 /// The method returns an invalid handle if the username is null or empty.
 /// </summary>
 public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
 public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
 {
 if (isNtlmOnly && !s_IsNtlmInstalled.Value)
 if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
 {
 throw new Interop.NetSecurityNative.GssApiException(
 Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
 }
 else
 {
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 }

 if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down

48 changes: 34 additions & 14 deletions
src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
 out byte[]? resultBuffer,
 ref ContextFlagsPal outFlags)
 {
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

 resultBuffer = null;

 if (context == null)
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => "SPNEGO"
 };
 NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
 }

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbtAppData,
 cbtAppDataSize,
 negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 negoContext.TargetName,
 (uint)inputFlags,
 incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
 };
 NetEventSource.Info(context, $"actual protocol = {protocol}");
 }

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
 {
 bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
 string.IsNullOrWhiteSpace(credential.Password);
 bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
 if (ntlmOnly && isEmptyCredential && !isServer)
 Interop.NetSecurityNative.PackageType packageType;

 if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 packageType = Interop.NetSecurityNative.PackageType.Negotiate;
 }

 if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
 else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.NTLM;
 if (isEmptyCredential && !isServer)
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 }
 }
 else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.Kerberos;
 }
 else
 {
 // Native shim currently supports only NTLMand Negotiate
 // Native shim currently supports only NTLM, Negotiate and Kerberos
 throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
 }

 try
 {
 return isEmptyCredential ?
 new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
 new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
 }
 catch (Exception ex)
 {
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
 internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
 {
 private SafeGssCredHandle _credential;
 private readonly bool _isNtlmOnly;
 private readonly Interop.NetSecurityNative.PackageType _packageType;
 private readonly string _userName;
 private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
 get { return _credential; }
 }

 // Property represents if Ntlm Protocol is specfied or not.
 public bool IsNtlmOnly
 // Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
 public Interop.NetSecurityNative.PackageType PackageType
 {
 get { return _isNtlmOnly; }
 get { return _packageType; }
 }

 public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
 get { return _isDefault; }
 }

 public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
 public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
 : base(IntPtr.Zero, true)
 {
 Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
 }

 bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
 _userName = username;
 _isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
 _credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
 _credential = SafeGssCredHandle.Create(username, password, packageType);
 _credential.DangerousAddRef(ref ignore);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/src/System.Net.Security.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
 Link="Common\Interop\Unix\Interop.Errors.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add support for specifying Kerberos package on Linux/macOS#72024

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

wfurt
merged 1 commit into

from

Jul 28, 2022
 Merged


Add support for specifying Kerberos package on Linux/macOS
#72024
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


17 changes: 17 additions & 0 deletions
...mmon/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.PackageType.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;

internal static partial class Interop
{
 internal static partial class NetSecurityNative
 {
 internal enum PackageType : uint
 {
 Negotiate = 0,
 NTLM = 1,
 Kerberos = 2,
 }
 }
}

14 changes: 7 additions & 7 deletions
...libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ internal static partial Status InitiateCredSpNego(
 [LibraryImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_InitiateCredWithPassword", StringMarshalling = StringMarshalling.Utf8)]
 internal static partial Status InitiateCredWithPassword(
 out Status minorStatus,
[MarshalAs(UnmanagedType.Bool)] bool isNtlm,
PackageType packageType,
 SafeGssNameHandle desiredName,
 string password,
 int passwordLen,
Expand All@@ -77,7 +77,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ref byte inputBytes,
Expand All@@ -91,7 +91,7 @@ private static partial Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
[MarshalAs(UnmanagedType.Bool)] bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -106,7 +106,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 SafeGssNameHandle? targetName,
 uint reqFlags,
 ReadOnlySpan<byte> inputBytes,
Expand All@@ -118,7 +118,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 targetName,
 reqFlags,
 ref MemoryMarshal.GetReference(inputBytes),
Expand All@@ -132,7 +132,7 @@ internal static Status InitSecContext(
 out Status minorStatus,
 SafeGssCredHandle initiatorCredHandle,
 ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
PackageType packageType,
 IntPtr cbt,
 int cbtSize,
 SafeGssNameHandle? targetName,
Expand All@@ -146,7 +146,7 @@ internal static Status InitSecContext(
 out minorStatus,
 initiatorCredHandle,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbt,
 cbtSize,
 targetName,
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,9 +91,9 @@ public static SafeGssCredHandle CreateAcceptor()
 /// returns the handle for the given credentials.
 /// The method returns an invalid handle if the username is null or empty.
 /// </summary>
 public static SafeGssCredHandle Create(string username, string password, bool isNtlmOnly)
 public static SafeGssCredHandle Create(string username, string password, Interop.NetSecurityNative.PackageType packageType)
 {
 if (isNtlmOnly && !s_IsNtlmInstalled.Value)
 if (packageType == Interop.NetSecurityNative.PackageType.NTLM && !s_IsNtlmInstalled.Value)
 {
 throw new Interop.NetSecurityNative.GssApiException(
 Interop.NetSecurityNative.Status.GSS_S_BAD_MECH,
Expand All@@ -117,7 +117,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
 }
 else
 {
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, isNtlmOnly, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 status = Interop.NetSecurityNative.InitiateCredWithPassword(out minorStatus, packageType, userHandle, password, Encoding.UTF8.GetByteCount(password), out retHandle);
 }

 if (status != Interop.NetSecurityNative.Status.GSS_S_COMPLETE)
Expand Down

48 changes: 34 additions & 14 deletions
src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,15 +134,19 @@ private static SecurityStatusPal EstablishSecurityContext(
 out byte[]? resultBuffer,
 ref ContextFlagsPal outFlags)
 {
bool isNtlmOnly = credential.IsNtlmOnly;
Interop.NetSecurityNative.PackageType packageType = credential.PackageType;

 resultBuffer = null;

 if (context == null)
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : "SPNEGO";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => "SPNEGO"
 };
 NetEventSource.Info(context, $"requested protocol = {protocol}, target = {targetName}");
 }

Expand DownExpand Up@@ -172,7 +176,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 cbtAppData,
 cbtAppDataSize,
 negoContext.TargetName,
Expand All@@ -187,7 +191,7 @@ private static SecurityStatusPal EstablishSecurityContext(
 status = Interop.NetSecurityNative.InitSecContext(out minorStatus,
 credential.GssCredential,
 ref contextHandle,
isNtlmOnly,
packageType,
 negoContext.TargetName,
 (uint)inputFlags,
 incomingBlob,
Expand DownExpand Up@@ -216,7 +220,11 @@ private static SecurityStatusPal EstablishSecurityContext(
 {
 if (NetEventSource.Log.IsEnabled())
 {
 string protocol = isNtlmOnly ? "NTLM" : isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos";
 string protocol = packageType switch {
 Interop.NetSecurityNative.PackageType.NTLM => "NTLM",
 Interop.NetSecurityNative.PackageType.Kerberos => "Kerberos",
 _ => isNtlmUsed ? "SPNEGO-NTLM" : "SPNEGO-Kerberos"
 };
 NetEventSource.Info(context, $"actual protocol = {protocol}");
 }

Expand DownExpand Up@@ -441,24 +449,36 @@ internal static SafeFreeCredentials AcquireCredentialsHandle(string package, boo
 {
 bool isEmptyCredential = string.IsNullOrWhiteSpace(credential.UserName) ||
 string.IsNullOrWhiteSpace(credential.Password);
 bool ntlmOnly = string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase);
 if (ntlmOnly && isEmptyCredential && !isServer)
 Interop.NetSecurityNative.PackageType packageType;

 if (string.Equals(package, NegotiationInfoClass.Negotiate, StringComparison.OrdinalIgnoreCase))
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 packageType = Interop.NetSecurityNative.PackageType.Negotiate;
 }

 if (!ntlmOnly && !string.Equals(package, NegotiationInfoClass.Negotiate))
 else if (string.Equals(package, NegotiationInfoClass.NTLM, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.NTLM;
 if (isEmptyCredential && !isServer)
 {
 // NTLM authentication is not possible with default credentials which are no-op
 throw new PlatformNotSupportedException(SR.net_ntlm_not_possible_default_cred);
 }
 }
 else if (string.Equals(package, NegotiationInfoClass.Kerberos, StringComparison.OrdinalIgnoreCase))
 {
 packageType = Interop.NetSecurityNative.PackageType.Kerberos;
 }
 else
 {
 // Native shim currently supports only NTLMand Negotiate
 // Native shim currently supports only NTLM, Negotiate and Kerberos
 throw new PlatformNotSupportedException(SR.net_securitypackagesupport);
 }

 try
 {
 return isEmptyCredential ?
 new SafeFreeNegoCredentials(ntlmOnly, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(ntlmOnly, credential.UserName, credential.Password, credential.Domain);
 new SafeFreeNegoCredentials(packageType, string.Empty, string.Empty, string.Empty) :
 new SafeFreeNegoCredentials(packageType, credential.UserName, credential.Password, credential.Domain);
 }
 catch (Exception ex)
 {
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ namespace System.Net.Security
 internal sealed class SafeFreeNegoCredentials : SafeFreeCredentials
 {
 private SafeGssCredHandle _credential;
 private readonly bool _isNtlmOnly;
 private readonly Interop.NetSecurityNative.PackageType _packageType;
 private readonly string _userName;
 private readonly bool _isDefault;

Expand All@@ -21,10 +21,10 @@ public SafeGssCredHandle GssCredential
 get { return _credential; }
 }

 // Property represents if Ntlm Protocol is specfied or not.
 public bool IsNtlmOnly
 // Property represents which protocol is specfied (Negotiate, Ntlm or Kerberos).
 public Interop.NetSecurityNative.PackageType PackageType
 {
 get { return _isNtlmOnly; }
 get { return _packageType; }
 }

 public string UserName
Expand All@@ -37,7 +37,7 @@ public bool IsDefault
 get { return _isDefault; }
 }

 public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password, string domain)
 public SafeFreeNegoCredentials(Interop.NetSecurityNative.PackageType packageType, string username, string password, string domain)
 : base(IntPtr.Zero, true)
 {
 Debug.Assert(username != null && password != null, "Username and Password can not be null");
Expand DownExpand Up@@ -66,10 +66,10 @@ public SafeFreeNegoCredentials(bool isNtlmOnly, string username, string password
 }

 bool ignore = false;
_isNtlmOnly = isNtlmOnly;
_packageType = packageType;
 _userName = username;
 _isDefault = string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password);
 _credential = SafeGssCredHandle.Create(username, password, isNtlmOnly);
 _credential = SafeGssCredHandle.Create(username, password, packageType);
 _credential.DangerousAddRef(ref ignore);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/src/System.Net.Security.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,8 @@
 Link="Common\Interop\Unix\Interop.Errors.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,8 @@
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.GssFlags.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.PackageType.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs"
 Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Status.cs" />
 <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs"
Expand Down
Loading