Fix the etcd PKCE AuthCode deserialization #1908
Merged
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
Signed-off-by: Benjamin Ullian <[email protected]>
Signed-off-by: Benjamin Ullian <[email protected]>
Contributor
Author
|
CC @HEllRZA @sagikazarmark as participants in the original PKCE implementation over in #1784 |
xtremerui
pushed a commit
to concourse/dex
that referenced
this pull request
Mar 16, 2021
The official docker release for this release can be pulled from ``` ghcr.io/dexidp/dex:v2.28.0 ``` **Features:** - Add c_hash to id_token, issued on /auth endpoint, when in hybrid flow (dexidp#1773, @HEllRZA) - Allow configuration of returned auth proxy header (dexidp#1839, @seuf) - Allow to disable os.ExpandEnv for storage + connector configs by env variable DEX_EXPAND_ENV = false (dexidp#1902, @heidemn-faro) - Added the possibility to activate lowercase for UPN-Strings (dexidp#1888, @VF-mbrauer) - Add "Cache-control: no-store" and "Pragma: no-cache" headers to token responses (dexidp#1948, @nabokihms) - Add gomplate to the docker image (dexidp#1893, @nabokihms) - Graceful shutdown (dexidp#1963, @nabokihms) - Allow public clients created with API to have no client_secret (dexidp#1871, @spohner) **Bugfixes:** - Fix the etcd PKCE AuthCode deserialization (dexidp#1908, @bnu0) - Fix garbage collection logging of device codes and device request (dexidp#1918, @nabokihms) - Discovery endpoint contains updated claims and auth methods (dexidp#1951, @nabokihms) - Return invalid_grant error if auth code is invalid or expired (dexidp#1952, @nabokihms) - Return an error to auth requests with the "request" parameter (dexidp#1956, @nabokihms) **Minor changes:** - Change default themes to light/dark (dexidp#1858, @nabokihms) - Various developer experience improvements - Dependency upgrades - Tons of small fixes and changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Overview
This change fixes a bug in the PKCE implementation when using
etcdas the storage engine. As of v2.27.0, this combination is broken and acode_verifiercannot be used to request a token.Specifically, you will get an errant error
No PKCE flow started. Cannot check code_verifiererror when requesting/tokendespite the fact that acode_challengeandcode_challenge_methodwere indeed provided to/auth.This PR also adds a PKCE AuthCode round-trip check to the storage conformance tests. Indeed that test fails on v2.27, and now it passes 🙏 .
What this PR does / why we need it
CreateAuthCode, the etcd storage implementation usesfromStorageAuthCode()to convert astorage.AuthCodeinto the etcd variant.GetAuthCode, however, the implementation attempts to directly unmarshal the json into thestorage.AuthCodewithout the etcd intermediate.AuthCodestruct, but is nested in thestorage.AuthCodestruct.CodeChallengeis always the empty string.handlers.go:820always getscodeChallengeFromStorage = ""and falls into the error condition.toStorageAuthCodeequivalent to correctly deserialize, and uses it.Special notes for your reviewer
Enjoy! 💖
Does this PR introduce a user-facing change?