per feedback

Author: twsouthwick

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

@@ -437,14 +437,14 @@ internal void Connect(ServerInfo serverInfo,
 
             _connHandler.pendingSQLDNSObject = null;
 
-            string[] serverSpn = null;
+            string[] serverSpns = null;
 
             // AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server
             _physicalStateObj.CreatePhysicalSNIHandle(
                 serverInfo.ExtendedServerName,
                 timeout,
                 out instanceName,
-                ref serverSpn,
+                ref serverSpns,
                 false,
                 true,
                 fParallel,
@@ -542,7 +542,7 @@ internal void Connect(ServerInfo serverInfo,
                     serverInfo.ExtendedServerName,
                     timeout,
                     out instanceName,
-                    ref serverSpn,
+                    ref serverSpns,
                     true,
                     true,
                     fParallel,
@@ -593,7 +593,7 @@ internal void Connect(ServerInfo serverInfo,
             }
             SqlClientEventSource.Log.TryTraceEvent("<sc.TdsParser.Connect|SEC> Prelogin handshake successful");
 
-            _authenticationProvider?.Initialize(serverInfo, _physicalStateObj, this, serverSpn);
+            _authenticationProvider?.Initialize(serverInfo, _physicalStateObj, this, serverSpns);
 
             if (_fMARS && marsCapable)
             {

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSspiContextProvider.cs

@@ -19,7 +19,7 @@ protected override bool GenerateSspiClientContext(ReadOnlySpan<byte> incomingBlo
 
             _negotiateAuth ??= new(new NegotiateAuthenticationClientOptions { Package = "Negotiate", TargetName = authParams.Resource });
 
-            Debug.Assert(_negotiateAuth.TargetName == authParams.Resource, "SSPI resource does not match TargetName");
+            Debug.Assert(_negotiateAuth.TargetName == authParams.Resource, "SSPI resource does not match TargetName. SspiContextProvider should ensure that once a target is established it will only call with that.");
 
             var sendBuff = _negotiateAuth.GetOutgoingBlob(incomingBlob, out statusCode)!;
 

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
@@ -12,10 +13,8 @@ internal abstract class SspiContextProvider
         private TdsParser _parser = null!;
         private ServerInfo _serverInfo = null!;
 
-        // This is used to store either a single or multiple SspiAuthenticationParameters. Since we initially have potentially
-        // multiple SPNs, we'll start with that. However, once we've succeeded creating an SSPI context, we'll consider that
-        // to be the correct SPN going forward
-        private object? _authParamValue;
+        private List<SspiAuthenticationParameters>? _authParams;
+        private SspiAuthenticationParameters? _authParam;
 
         private protected TdsParserStateObject _physicalStateObj = null!;
 
@@ -35,9 +34,9 @@ string[] serverSpns
             _serverInfo = serverInfo;
 
 #if NETFRAMEWORK
-            _authParamValue = CreateAuthParams(serverSpn);
+            _authParam = CreateAuthParams(serverSpn);
 #else
-            _authParamValue = serverSpns.Select(CreateAuthParams).ToArray();
+            _authParams = [.. serverSpns.Select(CreateAuthParams)];
 #endif
             Initialize();
         }
@@ -52,25 +51,41 @@ internal void WriteSSPIContext(ReadOnlySpan<byte> receivedBuff, IBufferWriter<by
         {
             using var _ = TrySNIEventScope.Create(nameof(SspiContextProvider));
 
-            if (_authParamValue is SspiAuthenticationParameters authParam && RunGenerateSspiClientContext(receivedBuff, outgoingBlobWriter, authParam))
+            if (TryRunSingle(receivedBuff, outgoingBlobWriter) || TryRunMultiple(receivedBuff, outgoingBlobWriter))
             {
-                return;
+                // If we've hit here, the SSPI context provider implementation failed to generate the SSPI context.
+                SSPIError(SQLMessage.SSPIGenerateError(), TdsEnums.GEN_CLIENT_CONTEXT);
             }
-            else if (_authParamValue is SspiAuthenticationParameters[] authParams)
+        }
+
+        /// <summary>
+        /// If we only have a single auth param, we know it's the correct one to use.
+        /// </summary>
+        private bool TryRunSingle(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outgoingBlobWriter)
+        {
+            return _authParam is { } && RunGenerateSspiClientContext(receivedBuff, outgoingBlobWriter, _authParam);
+        }
+
+        /// <summary>
+        /// If we have multiple, we need to loop through them, and then identify the correct one for future use.
+        /// </summary>
+        private bool TryRunMultiple(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outgoingBlobWriter)
+        {
+            if (_authParams is { })
             {
-                foreach (var p in authParams)
+                foreach (var authParam in _authParams)
                 {
-                    if (RunGenerateSspiClientContext(receivedBuff, outgoingBlobWriter, p))
+                    if (RunGenerateSspiClientContext(receivedBuff, outgoingBlobWriter, authParam))
                     {
                         // Reset the _authParams to only have a single one going forward to always call the context with that one
-                        _authParamValue = p;
-                        return;
+                        _authParam = authParam;
+                        _authParams = null;
+                        return true;
                     }
                 }
             }
 
-            // If we've hit here, the SSPI context provider implementation failed to generate the SSPI context.
-            SSPIError(SQLMessage.SSPIGenerateError(), TdsEnums.GEN_CLIENT_CONTEXT);
+            return false;
         }
 
         private SspiAuthenticationParameters CreateAuthParams(string serverSpn)