[PECOBLR-2089] fix(rust/oauth): Test suite fixes from final validation by vikrantpuppala · Pull Request #324 · adbc-drivers/databricks

vikrantpuppala · 2026-03-08T06:08:15Z

🥞 Stacked PR

Use this link to review incremental changes.

stack/oauth-u2m-m2m-design [Files changed]
- stack/pr-oauth-foundation [Files changed]
  - stack/pr-database-config [Files changed]
    - stack/pr-u2m-provider [Files changed]
      - stack/pr-integration-tests [Files changed]
        
        stack/pr-final-validation [Files changed]

Summary

Minor fixes discovered while running the full test suite:

Fixed callback server HTML response formatting
Fixed M2M provider error handling edge case
Updated database.rs auth provider creation to use AuthConfig consistently
Removed E2E OAuth test instructions from CLAUDE.md

Design for OAuth 2.0 authentication in the Rust ADBC driver covering Authorization Code + PKCE (U2M) and Client Credentials (M2M) flows, including token refresh state machine, file-based caching, and OIDC discovery. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Use oauth2 crate for PKCE, token exchange, client credentials, and refresh token flows. Eliminates hand-rolled pkce.rs module. - Reuse DatabricksHttpClient for token endpoint calls via execute_without_auth(), giving unified retry/timeout/pooling. - Two-phase initialization: HTTP client created first, auth provider set later via OnceLock (matching SeaClient's reader_factory pattern). - OAuth providers route token requests through the shared HTTP client with a custom oauth2 HTTP function adapter. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Add AuthMechanism enum: 0=Pat, 11=OAuth (matches ODBC AuthMech) - Add AuthFlow enum: 0=TokenPassthrough, 1=ClientCredentials, 2=Browser (matches ODBC Auth_Flow) - Both mechanism and flow are mandatory, no auto-detection - Accept numeric values only, parsed via TryFrom - Use unified DatabricksHttpClient with two-phase init - Adopt oauth2 crate for protocol-level operations Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Fixes: - databricks.oauth.token_endpoint -> databricks.auth.token_endpoint - Config type Int/String -> Int (numeric only) - Clarify oauth2 HTTP adapter needs thin conversion layer - Architecture diagram shows M2M/U2M using execute_without_auth() - Token passthrough (flow=0) documents no auto-refresh - Stale threshold uses initial_TTL computed once at acquisition - Deduplicate http.rs changes (reference Concurrency section) Test strategy additions: - Wiremock integration tests for full M2M flow with mocked HTTP - Database config validation tests for enum parsing and new_connection - HTTP client two-phase init tests for OnceLock lifecycle Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

3-task breakdown covering foundation + HTTP client changes, M2M provider, and U2M provider with full test coverage. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…-1.1-oauth-token-struct

…ache

…D: task-1.4-token-store

vikrantpuppala · 2026-03-08T11:11:20Z

rust/src/auth/oauth/cache.rs

+    scopes: Vec<String>,
+}
+
+#[allow(dead_code)] // Used in Phase 3 (U2M)


why this? i think this is used now? we should fix all such instances across

vikrantpuppala · 2026-03-08T11:14:13Z

rust/src/auth/oauth/callback.rs

+        <p>You can close this tab and return to your application.</p>
+    </div>
+</body>
+</html>"#;


let's make this page simpler, no need for fancy fonts colours, check marks, etc.

vikrantpuppala · 2026-03-08T11:14:45Z

rust/src/auth/oauth/callback.rs

+        <p>An error occurred during authentication. You can close this tab and try again.</p>
+    </div>
+</body>
+</html>"#;


use simple pages

vikrantpuppala · 2026-03-08T11:18:31Z

rust/src/auth/oauth/m2m.rs

+            // Use block_in_place to avoid blocking the runtime if we're in one,
+            // and get the handle to block_on the async operation
+            tokio::task::block_in_place(|| {
+                tokio::runtime::Handle::current().block_on(async {


shouldn't this happen async? check all instances and see if we're handling this correctly

vikrantpuppala · 2026-03-08T11:22:27Z

rust/src/auth/oauth.rs.old

should we just remove this?

vikrantpuppala · 2026-03-08T11:23:37Z

rust/src/database.rs

+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u8)]
+pub enum AuthMechanism {
+    /// Personal access token (no OAuth). Config value: 0
+    Pat = 0,
+    /// OAuth 2.0 -- requires AuthFlow to select the specific flow. Config value: 11
+    OAuth = 11,
+}
+
+impl TryFrom<i64> for AuthMechanism {
+    type Error = crate::error::Error;
+
+    fn try_from(value: i64) -> std::result::Result<Self, Self::Error> {
+        match value {
+            0 => Ok(AuthMechanism::Pat),
+            11 => Ok(AuthMechanism::OAuth),
+            _ => Err(DatabricksErrorHelper::invalid_argument().message(format!(
+                "Invalid auth mechanism value: {}. Valid values are 0 (PAT) or 11 (OAuth)",
+                value
+            ))),
+        }
+    }
+}
+
+/// OAuth authentication flow -- selects the specific OAuth grant type.
+/// Config values match the ODBC driver's Auth_Flow numeric codes.
+/// Only applicable when AuthMechanism is OAuth.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u8)]
+pub enum AuthFlow {
+    /// Use a pre-obtained OAuth access token directly. Config value: 0
+    TokenPassthrough = 0,
+    /// M2M: client credentials grant for service principals. Config value: 1
+    ClientCredentials = 1,
+    /// U2M: browser-based authorization code + PKCE. Config value: 2
+    Browser = 2,
+}
+
+impl TryFrom<i64> for AuthFlow {
+    type Error = crate::error::Error;
+
+    fn try_from(value: i64) -> std::result::Result<Self, Self::Error> {
+        match value {
+            0 => Ok(AuthFlow::TokenPassthrough),
+            1 => Ok(AuthFlow::ClientCredentials),
+            2 => Ok(AuthFlow::Browser),
+            _ => Err(DatabricksErrorHelper::invalid_argument().message(format!(
+                "Invalid auth flow value: {}. Valid values are 0 (token passthrough), 1 (client credentials), or 2 (browser)",
+                value
+            ))),
+        }
+    }
+}
+


is this the right place to define this? seems like database is becoming bloated?

vikrantpuppala · 2026-03-08T11:25:14Z

rust/src/database.rs

overall would be great if we can abstract out the auth related stuff in this file so that it is less bloated

vikrantpuppala · 2026-03-08T11:25:53Z

rust/CLAUDE.md

 - Test names: `test_<function>_<scenario>`
+- E2E tests that require real Databricks connection should be marked with `#[ignore]`
+
+#### Running E2E OAuth Tests


don't think we need this section

…task-1.5-oauth-module-setup

…2.1-auth-enums

…: task-2.2-database-config-fields

…2.3-database-validation

…1-callback-server

…sk-3.2-u2m-provider

…3-database-integration

…task-4.1-wiremock-u2m-refresh

…sk ID: task-4.2-m2m-database-integration

…end-tests

…alidation

vikrantpuppala and others added 9 commits March 7, 2026 08:48

docs: add OAuth implementation sprint plan

cf7d895

3-task breakdown covering foundation + HTTP client changes, M2M provider, and U2M provider with full test coverage. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Create OAuthToken struct with expiry and stale logic\n\nTask ID: task…

37ca144

…-1.1-oauth-token-struct

Implement OIDC endpoint discovery\n\nTask ID: task-1.2-oidc-discovery

c761ce3

Implement file-based token cache for U2M\n\nTask ID: task-1.3-token-c…

2e86909

…ache

Implement TokenStore with FRESH/STALE/EXPIRED state machine\n\nTask I…

4506a9d

…D: task-1.4-token-store

vikrantpuppala force-pushed the stack/pr-final-validation branch from 727b177 to 0e69f4a Compare March 8, 2026 07:01

vikrantpuppala commented Mar 9, 2026

View reviewed changes

vikrantpuppala force-pushed the stack/pr-final-validation branch from 0e69f4a to 13f8c28 Compare March 9, 2026 05:18

vikrantpuppala changed the title ~~Run full test suite and fix any failures\n\nTask ID: task-5.1-final-validation~~ [PECOBLR-2089] fix(rust/oauth): Test suite fixes from final validation Mar 9, 2026

vikrantpuppala added 11 commits March 9, 2026 09:41

Set up oauth directory module and add Cargo dependencies\n\nTask ID: …

fe4a411

…task-1.5-oauth-module-setup

Add AuthMechanism and AuthFlow enums to database.rs\n\nTask ID: task-…

dbc4455

…2.1-auth-enums

Add OAuth config fields and set_option parsing to Database\n\nTask ID…

f2c6aa0

…: task-2.2-database-config-fields

Add config validation to Database::new_connection()\n\nTask ID: task-…

57e82e4

…2.3-database-validation

Implement CallbackServer for U2M browser redirect\n\nTask ID: task-3.…

abc1fd8

…1-callback-server

Implement AuthorizationCodeProvider for U2M OAuth flow\n\nTask ID: ta…

314ac70

…sk-3.2-u2m-provider

Wire U2M provider into Database::new_connection()\n\nTask ID: task-3.…

634c028

…3-database-integration

Add wiremock integration test for U2M refresh token flow\n\nTask ID: …

c01bc5f

…task-4.1-wiremock-u2m-refresh

Complete M2M provider database integration and add config tests\n\nTa…

4a09a3e

…sk ID: task-4.2-m2m-database-integration

Add end-to-end OAuth tests (M2M and U2M)\n\nTask ID: task-4.3-end-to-…

4e111ed

…end-tests

Run full test suite and fix any failures\n\nTask ID: task-5.1-final-v…

f87df69

…alidation

vikrantpuppala force-pushed the stack/pr-final-validation branch from 13f8c28 to f87df69 Compare March 9, 2026 09:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PECOBLR-2089] fix(rust/oauth): Test suite fixes from final validation#324

[PECOBLR-2089] fix(rust/oauth): Test suite fixes from final validation#324
vikrantpuppala wants to merge 20 commits intoadbc-drivers:mainfrom
vikrantpuppala:stack/pr-final-validation

vikrantpuppala commented Mar 8, 2026 •

edited

Loading

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

vikrantpuppala Mar 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

vikrantpuppala commented Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🥞 Stacked PR

Summary

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

vikrantpuppala commented Mar 8, 2026 •

edited

Loading