[6.1] Ensure correct SPN when calling SspiContextProvider (#3347) #3478
+193
−101
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Reset negotiateAuth if SNI doesn't work This change also adds some book keeping to ensure we're only using the spn that has previously generated a context once one has been created. * initialization only after success * move serverSpn to be local
There was a problem hiding this comment.
Pull Request Overview
This PR ports changes from #3347 to the release/6.1 branch to ensure correct SPN (Service Principal Name) handling when calling SspiContextProvider. The changes improve SPN management by introducing a new data structure to hold primary and secondary SPNs and refactoring the authentication flow to use this improved approach.
- Refactors SPN handling from string arrays to a new
ResolvedServerSpnstruct that holds primary and secondary SPNs - Updates
SspiContextProviderto pre-initialize authentication parameters with correct SPNs instead of passing them at call time - Adds proper disposal pattern for
NegotiateSspiContextProviderto manage resources correctly
Reviewed Changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| ResolvedServerSpn.cs | New struct to encapsulate primary and secondary SPN values with detailed documentation |
| SspiContextProvider.cs | Refactored to store authentication parameters during initialization and simplified API methods |
| NegotiateSspiContextProvider.cs | Added IDisposable implementation and SPN validation logic |
| TdsParser.cs (both versions) | Updated to use new SPN resolution approach and moved authentication provider initialization |
| SniProxy.netcore.cs | Changed return type from string array to ResolvedServerSpn struct |
| InstanceNameTest.cs | Updated test to work with new SPN resolution API |
| SqlClientEventSource.cs | Added new overload for three-parameter state dump events |
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs
Show resolved
Hide resolved
paulmedynski
approved these changes
Jul 15, 2025
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release/6.1 #3478 +/- ##
===============================================
- Coverage 68.87% 64.71% -4.17%
===============================================
Files 280 281 +1
Lines 62322 62354 +32
===============================================
- Hits 42927 40351 -2576
- Misses 19395 22003 +2608
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Ports #3347 to release/6.1