rename to SspiContextProvider

twsouthwick · twsouthwick · commit a813d22e70d6 · 2025-05-01T09:53:26.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -656,11 +656,11 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
       <Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
+      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
+      <Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
     </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
       <Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
@@ -892,8 +892,8 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs">
       <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
+      <Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
     </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
       <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs</Link>
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -44,7 +44,7 @@ internal sealed partial class TdsParser
         private static int _objectTypeCount; // EventSource counter
         private readonly SqlClientLogger _logger = new SqlClientLogger();
 
-        private SSPIContextProvider _authenticationProvider;
+        private SspiContextProvider _authenticationProvider;
 
         internal readonly int _objectID = Interlocked.Increment(ref _objectTypeCount);
         internal int ObjectID => _objectID;
@@ -413,7 +413,7 @@ internal void Connect(ServerInfo serverInfo,
             // AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server
             if (integratedSecurity || authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
             {
-                _authenticationProvider = _physicalStateObj.CreateSSPIContextProvider();
+                _authenticationProvider = _physicalStateObj.CreateSspiContextProvider();
                 SqlClientEventSource.Log.TryTraceEvent("TdsParser.Connect | SEC | SSPI or Active Directory Authentication Library loaded for SQL Server based integrated authentication");
             }
 
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs
@@ -75,7 +75,7 @@ internal TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalCon
         ////////////////
         internal abstract uint DisableSsl();
 
-        internal abstract SSPIContextProvider CreateSSPIContextProvider();
+        internal abstract SspiContextProvider CreateSspiContextProvider();
 
         internal abstract uint EnableMars(ref uint info);
 
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectManaged.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectManaged.cs
@@ -407,7 +407,7 @@ private SNIHandle GetSessionSNIHandleHandleOrThrow()
         [MethodImpl(MethodImplOptions.NoInlining)] // this forces the exception throwing code not to be inlined for performance
         private void ThrowClosedConnection() => throw ADP.ClosedConnectionError();
 
-        internal override SSPIContextProvider CreateSSPIContextProvider()
-            => new NegotiateSSPIContextProvider();
+        internal override SspiContextProvider CreateSspiContextProvider()
+            => new NegotiateSspiContextProvider();
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
@@ -449,7 +449,7 @@ internal override void DisposePacketCache()
             }
         }
 
-        internal override SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();
+        internal override SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();
 
         internal sealed class WritePacketCache : IDisposable
         {
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -354,14 +354,14 @@
     <Compile Include="$(CommonSourceRoot)Resources\ResCategoryAttribute.cs">
       <Link>Resources\ResCategoryAttribute.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs">
+      <Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSSPIContextProvider.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
+      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SSPIContextProvider.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
+      <Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
     </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
       <Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -44,7 +44,7 @@ internal sealed partial class TdsParser
         private static int _objectTypeCount; // EventSource counter
         private readonly SqlClientLogger _logger = new SqlClientLogger();
 
-        private SSPIContextProvider _authenticationProvider;
+        private SspiContextProvider _authenticationProvider;
 
         internal readonly int _objectID = Interlocked.Increment(ref _objectTypeCount);
         internal int ObjectID => _objectID;
@@ -411,7 +411,7 @@ internal void Connect(ServerInfo serverInfo,
             // AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server
             if (integratedSecurity || authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
             {
-                _authenticationProvider = _physicalStateObj.CreateSSPIContextProvider();
+                _authenticationProvider = _physicalStateObj.CreateSspiContextProvider();
 
                 if (!string.IsNullOrEmpty(serverInfo.ServerSPN))
                 {
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs
@@ -98,7 +98,7 @@ internal TdsParserStateObject(TdsParser parser, SNIHandle physicalConnection, bo
             _lastSuccessfulIOTimer = parser._physicalStateObj._lastSuccessfulIOTimer;
         }
 
-        internal SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();
+        internal SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();
 
         ////////////////
         // Properties //
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    internal sealed class NativeSSPIContextProvider : SSPIContextProvider
+    internal sealed class NativeSspiContextProvider : SspiContextProvider
     {
         private static readonly object s_tdsParserLock = new();
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSspiContextProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NegotiateSspiContextProvider.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    internal sealed class NegotiateSSPIContextProvider : SSPIContextProvider
+    internal sealed class NegotiateSspiContextProvider : SspiContextProvider
     {
         private NegotiateAuthentication? _negotiateAuth = null;
 
@@ -20,7 +20,7 @@ protected override bool GenerateSspiClientContext(ReadOnlySpan<byte> incomingBlo
             var sendBuff = _negotiateAuth.GetOutgoingBlob(incomingBlob, out statusCode)!;
 
             // Log session id, status code and the actual SPN used in the negotiation
-            SqlClientEventSource.Log.TryTraceEvent("{0}.{1} | Info | Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSSPIContextProvider),
+            SqlClientEventSource.Log.TryTraceEvent("{0}.{1} | Info | Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSspiContextProvider),
                 nameof(GenerateSspiClientContext), _physicalStateObj.SessionId, statusCode, _negotiateAuth.TargetName);
 
             if (statusCode == NegotiateAuthenticationStatusCode.Completed || statusCode == NegotiateAuthenticationStatusCode.ContinueNeeded)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    internal abstract class SSPIContextProvider
+    internal abstract class SspiContextProvider
     {
         private TdsParser _parser = null!;
         private ServerInfo _serverInfo = null!;
@@ -29,7 +29,7 @@ private protected virtual void Initialize()
 
         internal void SSPIData(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outgoingBlobWriter, string serverSpn)
         {
-            using var _ = TrySNIEventScope.Create(nameof(SSPIContextProvider));
+            using var _ = TrySNIEventScope.Create(nameof(SspiContextProvider));
 
             if (!RunGenerateSspiClientContext(receivedBuff, outgoingBlobWriter, serverSpn))
             {
@@ -40,7 +40,7 @@ internal void SSPIData(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outg
 
         internal void SSPIData(ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> outgoingBlobWriter, ReadOnlySpan<string> serverSpns)
         {
-            using var _ = TrySNIEventScope.Create(nameof(SSPIContextProvider));
+            using var _ = TrySNIEventScope.Create(nameof(SspiContextProvider));
 
             foreach (var serverSpn in serverSpns)
             {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ internal sealed partial class TdsParser`
`44`	`44`	`private static int _objectTypeCount; // EventSource counter`
`45`	`45`	`private readonly SqlClientLogger _logger = new SqlClientLogger();`
`46`	`46`
`47`		`- private SSPIContextProvider _authenticationProvider;`
	`47`	`+ private SspiContextProvider _authenticationProvider;`
`48`	`48`
`49`	`49`	`internal readonly int _objectID = Interlocked.Increment(ref _objectTypeCount);`
`50`	`50`	`internal int ObjectID => _objectID;`
`@@ -413,7 +413,7 @@ internal void Connect(ServerInfo serverInfo,`
`413`	`413`	`// AD Integrated behaves like Windows integrated when connecting to a non-fedAuth server`
`414`	`414`	`if (integratedSecurity \|\| authType == SqlAuthenticationMethod.ActiveDirectoryIntegrated)`
`415`	`415`	`{`
`416`		`- _authenticationProvider = _physicalStateObj.CreateSSPIContextProvider();`
	`416`	`+ _authenticationProvider = _physicalStateObj.CreateSspiContextProvider();`
`417`	`417`	`SqlClientEventSource.Log.TryTraceEvent("TdsParser.Connect \| SEC \| SSPI or Active Directory Authentication Library loaded for SQL Server based integrated authentication");`
`418`	`418`	`}`
`419`	`419`
Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ private SNIHandle GetSessionSNIHandleHandleOrThrow()`
`407`	`407`	`[MethodImpl(MethodImplOptions.NoInlining)] // this forces the exception throwing code not to be inlined for performance`
`408`	`408`	`private void ThrowClosedConnection() => throw ADP.ClosedConnectionError();`
`409`	`409`
`410`		`- internal override SSPIContextProvider CreateSSPIContextProvider()`
`411`		`- => new NegotiateSSPIContextProvider();`
	`410`	`+ internal override SspiContextProvider CreateSspiContextProvider()`
	`411`	`+ => new NegotiateSspiContextProvider();`
`412`	`412`	`}`
`413`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ internal override void DisposePacketCache()`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
`452`		`- internal override SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();`
	`452`	`+ internal override SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();`
`453`	`453`
`454`	`454`	`internal sealed class WritePacketCache : IDisposable`
`455`	`455`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ internal TdsParserStateObject(TdsParser parser, SNIHandle physicalConnection, bo`
`98`	`98`	`_lastSuccessfulIOTimer = parser._physicalStateObj._lastSuccessfulIOTimer;`
`99`	`99`	`}`
`100`	`100`
`101`		`- internal SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();`
	`101`	`+ internal SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();`
`102`	`102`
`103`	`103`	`////////////////`
`104`	`104`	`// Properties //`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.Data.SqlClient`
`8`	`8`	`{`
`9`		`- internal sealed class NativeSSPIContextProvider : SSPIContextProvider`
	`9`	`+ internal sealed class NativeSspiContextProvider : SspiContextProvider`
`10`	`10`	`{`
`11`	`11`	`private static readonly object s_tdsParserLock = new();`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace Microsoft.Data.SqlClient`
`10`	`10`	`{`
`11`		`- internal sealed class NegotiateSSPIContextProvider : SSPIContextProvider`
	`11`	`+ internal sealed class NegotiateSspiContextProvider : SspiContextProvider`
`12`	`12`	`{`
`13`	`13`	`private NegotiateAuthentication? _negotiateAuth = null;`
`14`	`14`
`@@ -20,7 +20,7 @@ protected override bool GenerateSspiClientContext(ReadOnlySpan<byte> incomingBlo`
`20`	`20`	`var sendBuff = _negotiateAuth.GetOutgoingBlob(incomingBlob, out statusCode)!;`
`21`	`21`
`22`	`22`	`// Log session id, status code and the actual SPN used in the negotiation`
`23`		`- SqlClientEventSource.Log.TryTraceEvent("{0}.{1} \| Info \| Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSSPIContextProvider),`
	`23`	`+ SqlClientEventSource.Log.TryTraceEvent("{0}.{1} \| Info \| Session Id {2}, StatusCode={3}, SPN={4}", nameof(NegotiateSspiContextProvider),`
`24`	`24`	`nameof(GenerateSspiClientContext), _physicalStateObj.SessionId, statusCode, _negotiateAuth.TargetName);`
`25`	`25`
`26`	`26`	`if (statusCode == NegotiateAuthenticationStatusCode.Completed \|\| statusCode == NegotiateAuthenticationStatusCode.ContinueNeeded)`