fix: use transaction context in OIDC/LDAP SetAuthToken#21741
Draft
harry-anderson wants to merge 1 commit intodevelopfrom
Draft
fix: use transaction context in OIDC/LDAP SetAuthToken#21741harry-anderson wants to merge 1 commit intodevelopfrom
harry-anderson wants to merge 1 commit intodevelopfrom
Conversation
Contributor
|
I see you updated files related to
|
Contributor
|
✅ No conflicts with other open PRs targeting |
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Fixes two bugs in
SetAuthTokenfor both OIDC and LDAP authentication:Transaction bypass: SQL operations inside
sqlutil.TransactDataSourcewere using the outeroi.ds/l.dsdatasource instead of thetxtransaction parameter. This means DELETE and INSERT run outside the transaction, so a failed INSERT leaves the old token deleted with no replacement.OIDC SQL column mismatch: The INSERT statement specified 6 columns but the VALUES clause had 7 entries (
$1through$6plusnow()). With only 5 Go arguments provided,$5receiveshashedSecretand$6is unbound. PostgreSQL rejects this with a parameter count error.Changes
core/sessions/oidcauth/oidc.go
oi.ds.ExecContext->tx.ExecContextfor DELETE and INSERT inSetAuthToken$1, $2, $3, $4, $5, $6, now()->$1, $2, $3, $4, $5, now()(5 placeholders for 5 args + now() for 6 columns)core/sessions/ldapauth/ldap.go
l.ds.QueryRowxContext->tx.QueryRowxContextfor SELECT inSetAuthTokenl.ds.ExecContext->tx.ExecContextfor DELETE and INSERT inSetAuthTokenTest plan
SetAuthTokensucceeds for OIDC users (was always failing due to SQL error)SetAuthTokenrolls back cleanly on INSERT failure (transaction integrity)