[PR #5982] [MERGED] Improve CXF message handling #54423

Closed
opened 2026-05-01 19:54:28 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5982
Author: @SaintPatrck
Created: 10/7/2025
Status: Merged
Merged: 10/7/2025
Merged by: @SaintPatrck

Base: mainHead: cxf/app/integration-fixes


📝 Commits (1)

  • 8919d3c Improve CXF message handling

📊 Changes

15 files changed (+604 additions, -76 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/CredentialExchangeImportManagerImpl.kt (+110 -44)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt (+3 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt (+5 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/CredentialExchangeImportManagerTest.kt (+234 -16)
📝 cxf/build.gradle.kts (+2 -0)
📝 cxf/consumer-rules.pro (+4 -0)
📝 cxf/src/main/kotlin/com/bitwarden/cxf/importer/CredentialExchangeImporterImpl.kt (+11 -1)
📝 cxf/src/main/kotlin/com/bitwarden/cxf/manager/CredentialExchangeCompletionManagerImpl.kt (+62 -5)
📝 cxf/src/main/kotlin/com/bitwarden/cxf/manager/dsl/CredentialExchangeCompletionManagerBuilder.kt (+34 -6)
📝 cxf/src/main/kotlin/com/bitwarden/cxf/manager/model/ExportCredentialsResult.kt (+4 -0)
cxf/src/main/kotlin/com/bitwarden/cxf/model/CredentialExchangeExportResponse.kt (+55 -0)
cxf/src/main/kotlin/com/bitwarden/cxf/model/CredentialExchangeProtocolMessage.kt (+30 -0)
cxf/src/main/kotlin/com/bitwarden/cxf/model/CredentialExchangeVersion.kt (+25 -0)
📝 cxf/src/test/kotlin/com/bitwarden/cxf/importer/CredentialExchangeImporterTest.kt (+7 -1)
📝 cxf/src/test/kotlin/com/bitwarden/cxf/manager/CredentialExchangeCompletionManagerTest.kt (+18 -2)

📄 Description

🎟️ Tracking

PM-26599

📔 Objective

Improve handling of the FIDO Credential Exchange (CXF) message formats.

It introduces the necessary data models for the CXF protocol, including CredentialExchangeProtocolMessage, CredentialExchangeExportResponse, and CredentialExchangeVersion.

The CredentialExchangeCompletionManager is updated to build and encode the export response according to the CXF specification, including the header and base64-encoded payload. The import logic in CredentialExchangeImportManager is also updated to parse this new format, validate versioning, and decode the payload before processing.

📸 Screenshots

Import to Bitwarden

https://github.com/user-attachments/assets/0efcfd50-f6f6-404b-bc37-9745be3fe99f

Import from Bitwarden

https://github.com/user-attachments/assets/1bcbb31a-e970-40a2-b31e-3b7ef30bbf10

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/5982 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 10/7/2025 **Status:** ✅ Merged **Merged:** 10/7/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `cxf/app/integration-fixes` --- ### 📝 Commits (1) - [`8919d3c`](https://github.com/bitwarden/android/commit/8919d3c09fe14ffa8595ac4f7decf67de1a5a6fb) Improve CXF message handling ### 📊 Changes **15 files changed** (+604 additions, -76 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/CredentialExchangeImportManagerImpl.kt` (+110 -44) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt` (+3 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt` (+5 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/CredentialExchangeImportManagerTest.kt` (+234 -16) 📝 `cxf/build.gradle.kts` (+2 -0) 📝 `cxf/consumer-rules.pro` (+4 -0) 📝 `cxf/src/main/kotlin/com/bitwarden/cxf/importer/CredentialExchangeImporterImpl.kt` (+11 -1) 📝 `cxf/src/main/kotlin/com/bitwarden/cxf/manager/CredentialExchangeCompletionManagerImpl.kt` (+62 -5) 📝 `cxf/src/main/kotlin/com/bitwarden/cxf/manager/dsl/CredentialExchangeCompletionManagerBuilder.kt` (+34 -6) 📝 `cxf/src/main/kotlin/com/bitwarden/cxf/manager/model/ExportCredentialsResult.kt` (+4 -0) ➕ `cxf/src/main/kotlin/com/bitwarden/cxf/model/CredentialExchangeExportResponse.kt` (+55 -0) ➕ `cxf/src/main/kotlin/com/bitwarden/cxf/model/CredentialExchangeProtocolMessage.kt` (+30 -0) ➕ `cxf/src/main/kotlin/com/bitwarden/cxf/model/CredentialExchangeVersion.kt` (+25 -0) 📝 `cxf/src/test/kotlin/com/bitwarden/cxf/importer/CredentialExchangeImporterTest.kt` (+7 -1) 📝 `cxf/src/test/kotlin/com/bitwarden/cxf/manager/CredentialExchangeCompletionManagerTest.kt` (+18 -2) </details> ### 📄 Description ## 🎟️ Tracking PM-26599 ## 📔 Objective Improve handling of the FIDO Credential Exchange (CXF) message formats. It introduces the necessary data models for the CXF protocol, including `CredentialExchangeProtocolMessage`, `CredentialExchangeExportResponse`, and `CredentialExchangeVersion`. The `CredentialExchangeCompletionManager` is updated to build and encode the export response according to the CXF specification, including the header and base64-encoded payload. The import logic in `CredentialExchangeImportManager` is also updated to parse this new format, validate versioning, and decode the payload before processing. ## 📸 Screenshots ### Import to Bitwarden https://github.com/user-attachments/assets/0efcfd50-f6f6-404b-bc37-9745be3fe99f ### Import from Bitwarden https://github.com/user-attachments/assets/1bcbb31a-e970-40a2-b31e-3b7ef30bbf10 ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-01 19:54:28 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#54423