oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-06-27 16:35:59 +00:00
Code Wiki Activity

Merge branch 'release-0.10.2' into 'next'

Browse source 
Release 0.10.2

Closes #500

See merge request famedly/conduit!748
This commit is contained in:
Matthias Ahouansou 2025-05-11 11:39:33 +00:00
commit d0fe2f42f5
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -460,7 +460,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]] [[package]]
name = "conduit" name = "conduit"
version = "0.10.1" version = "0.10.2"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",

2
Cargo.toml
View file

@ -16,7 +16,7 @@ license = "Apache-2.0"
name = "conduit" name = "conduit"
readme = "README.md" readme = "README.md"
repository = "https://gitlab.com/famedly/conduit" repository = "https://gitlab.com/famedly/conduit"
version = "0.10.1" version = "0.10.2"
# See also `rust-toolchain.toml` # See also `rust-toolchain.toml`
rust-version = "1.83.0" rust-version = "1.83.0"

3
src/database/key_value/users.rs
View file

@ -406,11 +406,12 @@ impl service::users::Data for KeyValueDatabase {
self.onetimekeyid_onetimekeys self.onetimekeyid_onetimekeys
.scan_prefix(userdeviceid) .scan_prefix(userdeviceid)
.map(|(bytes, _)| { .map(|(bytes, _)| {
serde_json::from_slice::<OneTimeKeyAlgorithm>( serde_json::from_slice::<OwnedOneTimeKeyId>(
bytes.rsplit(|&b| b == 0xff).next().ok_or_else(|| { bytes.rsplit(|&b| b == 0xff).next().ok_or_else(|| {
Error::bad_database("OneTimeKey ID in db is invalid.") Error::bad_database("OneTimeKey ID in db is invalid.")
})?, })?,
) )
.map(|key_id| key_id.algorithm())
.map_err(|_| Error::bad_database("DeviceKeyId in db is invalid.")) .map_err(|_| Error::bad_database("DeviceKeyId in db is invalid."))
}) })
{ {