Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various cleanups after merging ACI/PNI #298

Merged
merged 5 commits into from
Apr 13, 2024
Merged

Various cleanups after merging ACI/PNI #298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11a19de
Various cleanups after merging ACI/PNI
gferon Apr 2, 2024
1fad0f3
Integrate logic to count signed_pre_keys and kyber_pre_keys
gferon Apr 12, 2024
5af3bef
Fix warnings
gferon Apr 12, 2024
d68ec14
Format
gferon Apr 12, 2024
b7db52a
Hide function again
gferon Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions libsignal-service/src/account_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use libsignal_protocol::{
kem, GenericSignedPreKey, IdentityKey, IdentityKeyStore, KeyPair,
KyberPreKeyRecord, PrivateKey, ProtocolStore, PublicKey, SenderKeyStore,
SignalProtocolError, SignedPreKeyRecord,
SignedPreKeyRecord,
};
use prost::Message;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -64,20 +64,6 @@
ProfileCipherError(#[from] ProfileCipherError),
}

#[derive(thiserror::Error, Debug)]
pub enum LinkError {
#[error(transparent)]
ServiceError(#[from] ServiceError),
#[error("TsUrl has an invalid UUID field")]
InvalidUuid,
#[error("TsUrl has an invalid pub_key field")]
InvalidPublicKey,
#[error("Protocol error {0}")]
ProtocolError(#[from] SignalProtocolError),
#[error(transparent)]
ProvisioningError(#[from] ProvisioningError),
}

#[derive(Debug, Default, Serialize, Deserialize, Clone)]
pub struct Profile {
pub name: Option<ProfileName<String>>,
Expand Down Expand Up @@ -186,7 +172,7 @@
.transpose()?
};

let identity_key = *identity_key_pair.identity_key().public_key();
let identity_key = *identity_key_pair.identity_key();

let pre_keys: Vec<_> = pre_keys
.into_iter()
Expand Down Expand Up @@ -289,16 +275,18 @@
aci_identity_store: &dyn IdentityKeyStore,
pni_identity_store: &dyn IdentityKeyStore,
credentials: ServiceCredentials,
) -> Result<(), LinkError> {
) -> Result<(), ProvisioningError> {
let query: HashMap<_, _> = url.query_pairs().collect();
let ephemeral_id = query.get("uuid").ok_or(LinkError::InvalidUuid)?;
let pub_key =
query.get("pub_key").ok_or(LinkError::InvalidPublicKey)?;
let ephemeral_id =
query.get("uuid").ok_or(ProvisioningError::MissingUuid)?;
let pub_key = query
.get("pub_key")
.ok_or(ProvisioningError::MissingPublicKey)?;
let pub_key = BASE64_RELAXED
.decode(&**pub_key)
.map_err(|_e| LinkError::InvalidPublicKey)?;
.map_err(|e| ProvisioningError::InvalidPublicKey(e.into()))?;
let pub_key = PublicKey::deserialize(&pub_key)
.map_err(|_e| LinkError::InvalidPublicKey)?;
.map_err(|e| ProvisioningError::InvalidPublicKey(e.into()))?;

let aci_identity_key_pair =
aci_identity_store.get_identity_key_pair().await?;
Expand Down Expand Up @@ -361,7 +349,7 @@
aci_protocol_store: &mut Aci,
pni_protocol_store: &mut Pni,
skip_device_transfer: bool,
) -> Result<VerifyAccountResponse, LinkError> {
) -> Result<VerifyAccountResponse, ProvisioningError> {
let aci_identity_key_pair = aci_protocol_store
.get_identity_key_pair()
.instrument(tracing::trace_span!("get ACI identity key pair"))
Expand Down Expand Up @@ -421,8 +409,8 @@
registration_method,
account_attributes,
skip_device_transfer,
*aci_identity_key,
*pni_identity_key,
aci_identity_key,
pni_identity_key,
dar,
)
.await?;
Expand Down Expand Up @@ -724,10 +712,10 @@
} else {
loop {
let regid = generate_registration_id(csprng);
if pni_registration_ids
.iter()
.find(|(_k, v)| **v == regid)
.is_none()

Check warning on line 718 in libsignal-service/src/account_manager.rs

View workflow job for this annotation

GitHub Actions / clippy

called `is_none()` after searching an `Iterator` with `find` 

warning: called `is_none()` after searching an `Iterator` with `find`
   --> libsignal-service/src/account_manager.rs:715:24
    |
715 |                       if pni_registration_ids
    |  ________________________^
716 | |                         .iter()
717 | |                         .find(|(_k, v)| **v == regid)
718 | |                         .is_none()
    | |__________________________________^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#search_is_some
    = note: `#[warn(clippy::search_is_some)]` on by default
help: consider using
    |
715 ~                     if !pni_registration_ids
716 +                         .iter().any(|(_k, v)| **v == regid)
    |
{
break regid;
}
Expand Down
9 changes: 2 additions & 7 deletions libsignal-service/src/cipher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@
use uuid::Uuid;

use crate::{
content::{Content, Metadata},
envelope::Envelope,
push_service::ServiceError,
sender::OutgoingPushMessage,
utils::BASE64_RELAXED,
ServiceAddress,
content::{Content, Metadata}, envelope::Envelope, push_service::ServiceError, sender::OutgoingPushMessage, session_store::SessionStoreExt, utils::BASE64_RELAXED, ServiceAddress
};
/// Decrypts incoming messages and encrypts outgoing messages.
///
Expand Down Expand Up @@ -75,7 +70,7 @@

impl<S, R> ServiceCipher<S, R>
where
S: ProtocolStore + KyberPreKeyStore + SenderKeyStore + Clone,
S: ProtocolStore + SenderKeyStore + SessionStoreExt + Clone,
R: Rng + CryptoRng,
{
pub fn new(
Expand Down Expand Up @@ -181,7 +176,7 @@
&mut self.protocol_store.clone(),
&mut self.protocol_store.clone(),
&mut self.protocol_store.clone(),
&mut self.protocol_store.clone(),

Check warning on line 179 in libsignal-service/src/cipher.rs

View workflow job for this annotation

GitHub Actions / clippy

the function `message_decrypt_prekey` doesn't need a mutable reference 

warning: the function `message_decrypt_prekey` doesn't need a mutable reference
   --> libsignal-service/src/cipher.rs:179:21
    |
179 |                     &mut self.protocol_store.clone(),
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_mut_passed
    = note: `#[warn(clippy::unnecessary_mut_passed)]` on by default
&mut self.protocol_store.clone(),
&mut self.csprng,
)
Expand Down
1 change: 1 addition & 0 deletions libsignal-service/src/groups_v2/manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ pub fn decrypt_group(
fn current_days_seconds() -> (u64, u64) {
let days_seconds = |date: NaiveDate| {
date.and_time(NaiveTime::from_hms_opt(0, 0, 0).unwrap())
.and_utc()
.timestamp() as u64
};

Expand Down
5 changes: 2 additions & 3 deletions libsignal-service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ pub mod utils;
pub mod websocket;

pub use crate::account_manager::{
decrypt_device_name, AccountManager, LinkError, Profile,
ProfileManagerError,
decrypt_device_name, AccountManager, Profile, ProfileManagerError,
};
pub use crate::service_address::*;

Expand Down Expand Up @@ -96,7 +95,7 @@ pub mod prelude {
profiles::ProfileKey,
};

pub use libsignal_protocol::DeviceId;
pub use libsignal_protocol::{IdentityKeyStore, DeviceId};
}

pub use libsignal_protocol as protocol;
Expand Down
20 changes: 10 additions & 10 deletions libsignal-service/src/pre_keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use std::{convert::TryFrom, time::SystemTime};

use crate::utils::{serde_base64, serde_public_key};
use crate::utils::{serde_base64, serde_identity_key};
use async_trait::async_trait;
use libsignal_protocol::{
error::SignalProtocolError, kem, GenericSignedPreKey, IdentityKeyPair,
IdentityKeyStore, KeyPair, KyberPreKeyId, KyberPreKeyRecord,
KyberPreKeyStore, PreKeyRecord, PreKeyStore, PublicKey, SignedPreKeyRecord,
SignedPreKeyStore,
error::SignalProtocolError, kem, GenericSignedPreKey, IdentityKey,
IdentityKeyPair, IdentityKeyStore, KeyPair, KyberPreKeyId,
KyberPreKeyRecord, KyberPreKeyStore, PreKeyRecord, PreKeyStore,
SignedPreKeyRecord, SignedPreKeyStore,
};

use serde::{Deserialize, Serialize};
Expand All @@ -16,7 +16,7 @@ use tracing::Instrument;
/// Additional methods for the Kyber pre key store
///
/// Analogue of Android's ServiceKyberPreKeyStore
pub trait ServiceKyberPreKeyStore: KyberPreKeyStore {
pub trait KyberPreKeyStoreExt: KyberPreKeyStore {
async fn store_last_resort_kyber_pre_key(
&mut self,
kyber_prekey_id: KyberPreKeyId,
Expand Down Expand Up @@ -55,7 +55,7 @@ pub trait PreKeysStore:
+ IdentityKeyStore
+ SignedPreKeyStore
+ KyberPreKeyStore
+ ServiceKyberPreKeyStore
+ KyberPreKeyStoreExt
{
/// ID of the next pre key
async fn next_pre_key_id(&self) -> Result<u32, SignalProtocolError>;
Expand Down Expand Up @@ -169,8 +169,8 @@ impl TryFrom<KyberPreKeyRecord> for KyberPreKeyEntity {
pub struct PreKeyState {
pub pre_keys: Vec<PreKeyEntity>,
pub signed_pre_key: SignedPreKeyEntity,
#[serde(with = "serde_public_key")]
pub identity_key: PublicKey,
#[serde(with = "serde_identity_key")]
pub identity_key: IdentityKey,
#[serde(skip_serializing_if = "Option::is_none")]
pub pq_last_resort_key: Option<KyberPreKeyEntity>,
pub pq_pre_keys: Vec<KyberPreKeyEntity>,
Expand All @@ -180,7 +180,7 @@ pub(crate) const PRE_KEY_MINIMUM: u32 = 10;
pub(crate) const PRE_KEY_BATCH_SIZE: u32 = 100;
pub(crate) const PRE_KEY_MEDIUM_MAX_VALUE: u32 = 0xFFFFFF;

pub(crate) async fn replenish_pre_keys<
pub async fn replenish_pre_keys<
R: rand::Rng + rand::CryptoRng,
gferon marked this conversation as resolved.
Show resolved Hide resolved
P: PreKeysStore,
>(
Expand Down
12 changes: 3 additions & 9 deletions libsignal-service/src/provisioning/cipher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,7 @@ impl ProvisioningCipher {
.body
.expect("no body in ProvisionMessage");
if body[0] != VERSION {
return Err(ProvisioningError::InvalidData {
reason: "Bad version number".into(),
});
return Err(ProvisioningError::BadVersionNumber);
}

let iv = &body[IV_OFFSET..(IV_LENGTH + IV_OFFSET)];
Expand All @@ -166,9 +164,7 @@ impl ProvisioningCipher {
let our_mac = verifier.finalize().into_bytes();
debug_assert_eq!(our_mac.len(), mac.len());
if &our_mac[..32] != mac {
return Err(ProvisioningError::InvalidData {
reason: "wrong MAC".into(),
});
return Err(ProvisioningError::MismatchedMac);
}

// libsignal-service-java uses Pkcs5,
Expand All @@ -177,9 +173,7 @@ impl ProvisioningCipher {
let cipher = cbc::Decryptor::<Aes256>::new(parts1.into(), iv.into());
let input = cipher
.decrypt_padded_vec_mut::<Pkcs7>(cipher_text)
.map_err(|e| ProvisioningError::InvalidData {
reason: format!("CBC/Padding error: {:?}", e).into(),
})?;
.map_err(ProvisioningError::AesPaddingError)?;

Ok(prost::Message::decode(Bytes::from(input))?)
}
Expand Down
Loading
Loading