Skip to content

Commit

Permalink
Fix issues when uri match is a string
Browse files Browse the repository at this point in the history
If the uri match value is a string, empty or not it will not work.
Though an empty string will cause mobile sync issues.

This commit fixes this by checking the values and if it is a string it will convert it to null.

Signed-off-by: BlackDex <[email protected]>
  • Loading branch information
BlackDex committed Dec 29, 2024
1 parent ed4ad67 commit fe9ae7a
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/db/models/cipher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,14 @@ impl Cipher {
// Set the first element of the Uris array as Uri, this is needed several (mobile) clients.
if self.atype == 1 {
if type_data_json["uris"].is_array() {
// Fix uri match values first, they are only allowed to be a number or null
// If it is a string, convert it to null since all clients do not allow strings anyway
let uri_count = type_data_json["uris"].as_array().unwrap().len();
for n in 0..uri_count {
if type_data_json["uris"][n]["match"].is_string() {
type_data_json["uris"][n]["match"] = Value::Null;
}
}
let uri = type_data_json["uris"][0]["uri"].clone();
type_data_json["uri"] = uri;
} else {
Expand Down

0 comments on commit fe9ae7a

Please sign in to comment.