[PR #5339] [MERGED] Refactor the uri match fix and fix ssh-key sync #3603

New issue

Closed

opened 2026-03-03 10:04:56 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 10:04:56 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/5339
Author: @BlackDex
Created: 1/1/2025
Status: ✅ Merged
Merged: 1/4/2025
Merged by: @dani-garcia

Base: main ← Head: refactor-match-fix

📝 Commits (2)

ac6fe5c Refactor the uri match change
dc7ff7b Fix ssh-key sync issues

📊 Changes

1 file changed (+28 additions, -12 deletions)

View changed files

📝 src/db/models/cipher.rs (+28 -12)

📄 Description

Refactor uri match

Refactored the uri match fix to also convert numbers within a string to an int. If it fails it will be null.

Fix ssh-key sync

If any of the mandatory ssh-key json data values are not a string or are an empty string, this will break the mobile clients.
This commit fixes this by checking if any of the values are missing or invalid and converts the json data to null.
It will ensure the clients can sync and show the vault.

Fixes https://github.com/dani-garcia/vaultwarden/issues/5343
Fixes https://github.com/dani-garcia/vaultwarden/issues/5322

_{🔄 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/dani-garcia/vaultwarden/pull/5339 **Author:** [@BlackDex](https://github.com/BlackDex) **Created:** 1/1/2025 **Status:** ✅ Merged **Merged:** 1/4/2025 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `refactor-match-fix` --- ### 📝 Commits (2) - [`ac6fe5c`](https://github.com/dani-garcia/vaultwarden/commit/ac6fe5c85e10970c06465ea2dd6c65663671d870) Refactor the uri match change - [`dc7ff7b`](https://github.com/dani-garcia/vaultwarden/commit/dc7ff7b38ca7f87a646960de6720e0f37a6fbac3) Fix ssh-key sync issues ### 📊 Changes **1 file changed** (+28 additions, -12 deletions) <details> <summary>View changed files</summary> 📝 `src/db/models/cipher.rs` (+28 -12) </details> ### 📄 Description ## Refactor uri match Refactored the uri match fix to also convert numbers within a string to an int. If it fails it will be null. ## Fix ssh-key sync If any of the mandatory ssh-key json data values are not a string or are an empty string, this will break the mobile clients. This commit fixes this by checking if any of the values are missing or invalid and converts the json data to `null`. It will ensure the clients can sync and show the vault. Fixes https://github.com/dani-garcia/vaultwarden/issues/5343 Fixes https://github.com/dani-garcia/vaultwarden/issues/5322 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>