[auth] Add id_token field to UberToken and validate nonce claim#274
Merged
partha-uber merged 9 commits intoJun 25, 2026
Conversation
This was referenced Jun 17, 2026
partha-uber
force-pushed
the
sirker-auth-nonce-idtoken
branch
from
0685a42 to
17d60b3
Compare
lalwani
reviewed
Jun 23, 2026
lalwani
reviewed
Jun 23, 2026
- Treat null state as a mismatch (a malicious callback omitting state should not bypass CSRF validation since the SDK always sends it) - Replace em dash with plain hyphen in INVALID_STATE message Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
lalwani
reviewed
Jun 25, 2026
| @@ -49,5 +49,11 @@ sealed class AuthException(override val message: String) : RuntimeException(mess | |||
| internal const val UNKNOWN = "Unknown error occurred" | |||
|
|
|||
| internal const val INVALID_STATE = "State parameter mismatch — possible CSRF attack" | |||
Collaborator
There was a problem hiding this comment.
probably didn't rebase? there's still a hyphen in the Invalid_state string
lalwani
approved these changes
Jun 25, 2026
[auth] Add state (CSRF) parameter to OAuth flow
Summary: - SDK now auto-generates a cryptographically secure `nonce` parameter (SecureRandom, 32 bytes, base64url) when `AuthContext.nonce` is null - `effectiveNonce = authContext.nonce ?: generateSecureToken()` ensures nonce is always present in SSO query params for replay attack prevention - Callers that supply their own nonce (for backend binding) are unaffected - `@VisibleForTesting effectiveNonce` field exposed for assertions This is step 2/3 of iOS parity (PR #337 in uber-ios-sdk).
Summary: - Verify PKCE flow also forwards the auto-generated nonce - Verify two different AuthProvider instances produce distinct nonces (randomness sanity check) - Verify effectiveNonce field is stable on repeated reads
Summary: - `UberToken` gains `@Json(name = "id_token") val idToken: String?` for OIDC id_token deserialization - `AuthException.NONCE_MISMATCH` constant added for replay-attack detection - `performPkce` validates the `nonce` claim in `id_token` against `effectiveNonce`; returns `NONCE_MISMATCH` error on mismatch - `extractNonceFromIdToken` decodes the JWT payload (base64url) and extracts the `nonce` claim via `org.json.JSONObject` — no extra libs - Validation is skipped when server returns no `id_token` (backward compat) This is step 3/3 of iOS parity (PR #337 in uber-ios-sdk).
- extractNonceFromIdToken returning null now triggers ID_TOKEN_PARSE_FAILED instead of the misleading NONCE_MISMATCH error - Use import for android.util.Base64 instead of fully qualified name - Remove em dash from NONCE_MISMATCH message (plain ASCII) - Add test for malformed id_token parse failure Co-Authored-By: Claude <noreply@anthropic.com>
partha-uber
force-pushed
the
sirker-auth-nonce-idtoken
branch
from
e07fb86 to
e6143e4
Compare
partha-uber
merged commit ef23990
into
sirker-auth-nonce-autogen
12 of 13 checks passed
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
2 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.
Summary
UberTokengains@Json(name = "id_token") val idToken: String?forOIDC id_token deserialization
AuthException.NONCE_MISMATCHconstant added for replay-attack detectionperformPkcevalidates thenonceclaim inid_tokenagainsteffectiveNonce; returnsNONCE_MISMATCHerror on mismatchextractNonceFromIdTokendecodes the JWT payload (base64url) andextracts the
nonceclaim viaorg.json.JSONObject— no extra libsid_token(backward compat)This is step 3/3 of iOS parity (PR #337 in uber-ios-sdk).
Test Plan
Issues
Stack