fix up server name passing

Author: twsouthwick

src/Microsoft.Data.SqlClient/netcore/src/Common/src/System/Net/Security/NegotiateStreamPal.Windows.cs

@@ -71,7 +71,7 @@ internal static string QueryContextAuthenticationPackage(SafeDeleteContext secur
         internal static SecurityStatusPal InitializeSecurityContext(
             SafeFreeCredentials credentialsHandle,
             ref SafeDeleteContext securityContext,
-            string[] spn,
+            string spn,
             ContextFlagsPal requestedContextFlags,
             SecurityBuffer[] inSecurityBufferArray,
             SecurityBuffer outSecurityBuffer,
@@ -82,7 +82,7 @@ internal static SecurityStatusPal InitializeSecurityContext(
                 GlobalSSPI.SSPIAuth,
                 credentialsHandle,
                 ref securityContext,
-                spn[0],
+                spn,
                 ContextFlagsAdapterPal.GetInteropFromContextFlagsPal(requestedContextFlags),
                 Interop.SspiCli.Endianness.SECURITY_NETWORK_DREP,
                 inSecurityBufferArray,

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIProxy.cs

@@ -34,9 +34,9 @@ internal class SNIProxy
         /// <param name="sspiClientContextStatus">SSPI client context status</param>
         /// <param name="receivedBuff">Receive buffer</param>
         /// <param name="sendWriter">Writer for send buffer</param>
-        /// <param name="serverNames">Service Principal Name buffer</param>
+        /// <param name="spn">Service Principal Name</param>
         /// <returns>SNI error code</returns>
-        internal static void GenSspiClientContext(SspiClientContextStatus sspiClientContextStatus, ReadOnlyMemory<byte> receivedBuff, IBufferWriter<byte> sendWriter, string[] serverNames)
+        internal static void GenSspiClientContext(SspiClientContextStatus sspiClientContextStatus, ReadOnlyMemory<byte> receivedBuff, IBufferWriter<byte> sendWriter, string spn)
         {
             // TODO: this should use ReadOnlyMemory all the way through
             byte[] array = null;
@@ -47,10 +47,10 @@ internal static void GenSspiClientContext(SspiClientContextStatus sspiClientCont
                 receivedBuff.CopyTo(array);
             }
 
-            GenSspiClientContext(sspiClientContextStatus, array, sendWriter, serverNames);
+            GenSspiClientContext(sspiClientContextStatus, array, sendWriter, spn);
         }
 
-        private static void GenSspiClientContext(SspiClientContextStatus sspiClientContextStatus, byte[] receivedBuff, IBufferWriter<byte> sendWriter, string[] serverSPNs)
+        private static void GenSspiClientContext(SspiClientContextStatus sspiClientContextStatus, byte[] receivedBuff, IBufferWriter<byte> sendWriter, string spn)
         {
             SafeDeleteContext securityContext = sspiClientContextStatus.SecurityContext;
             ContextFlagsPal contextFlags = sspiClientContextStatus.ContextFlags;
@@ -85,7 +85,7 @@ private static void GenSspiClientContext(SspiClientContextStatus sspiClientConte
             SecurityStatusPal statusCode = NegotiateStreamPal.InitializeSecurityContext(
                        credentialsHandle,
                        ref securityContext,
-                       serverSPNs,
+                       spn,
                        requestedContextFlags,
                        inSecurityBufferArray,
                        outSecurityBuffer,

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

@@ -16,7 +16,7 @@ protected override void GenerateSspiClientContext(ReadOnlyMemory<byte> incomingB
         {
             _sspiClientContextStatus ??= new SspiClientContextStatus();
 
-            SNIProxy.GenSspiClientContext(_sspiClientContextStatus, incomingBlob, outgoingBlobWriter, new[] { AuthenticationParameters.ServerName });
+            SNIProxy.GenSspiClientContext(_sspiClientContextStatus, incomingBlob, outgoingBlobWriter, AuthenticationParameters.ServerName);
             SqlClientEventSource.Log.TryTraceEvent("TdsParserStateObjectManaged.GenerateSspiClientContext | Info | Session Id {0}", _physicalStateObj.SessionId);
         }
     }

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

@@ -27,22 +27,33 @@ internal void Initialize(ServerInfo serverInfo, TdsParserStateObject physicalSta
             _physicalStateObj = physicalStateObj;
             _serverInfo = serverInfo;
 
-            var options = parser.Connection.ConnectionOptions;
-
-            _parameters = new SqlAuthenticationParameters.Builder(
-                           authenticationMethod: parser.Connection.ConnectionOptions.Authentication,
-                           resource: null,
-                           authority: null,
-                           serverName: serverName,
-                           databaseName: options.InitialCatalog)
-                       .WithConnectionId(parser.Connection.ClientConnectionId)
-                       .WithConnectionTimeout(options.ConnectTimeout)
-                       .WithUserId(options.UserID)
-                       .WithPassword(options.Password);
+            _parameters = InitializeAuthenticationParameters(parser.Connection, serverName);
 
             Initialize();
         }
 
+        private SqlAuthenticationParameters InitializeAuthenticationParameters(SqlInternalConnectionTds connection, string serverName)
+        {
+            var auth = new SqlAuthenticationParameters.Builder(
+                authenticationMethod: connection.ConnectionOptions.Authentication,
+                resource: null,
+                authority: null,
+                serverName: serverName,
+                connection.ConnectionOptions.InitialCatalog);
+
+            if (connection.ConnectionOptions.UserID is { } userId)
+            {
+                auth.WithUserId(userId);
+            }
+
+            if (connection.ConnectionOptions.Password is { } password)
+            {
+                auth.WithPassword(password);
+            }
+
+            return auth;
+        }
+
         private protected virtual void Initialize()
         {
         }