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.

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

Fix sending SyncMessage to self #263

Merged
merged 5 commits into from
Nov 19, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Reset line
gferon committed Nov 19, 2023
commit d53df2a3350b663e7da5579ef3a94fed3b664282
3 changes: 1 addition & 2 deletions libsignal-service/src/websocket.rs
Original file line number Diff line number Diff line change
@@ -227,8 +227,7 @@ impl<WS: WebSocketService> SignalWebSocketProcess<WS> {
self.ws.send_message(buffer.into()).await?
}
Some(WebSocketStreamItem::KeepAliveRequest) => {
log::trace!("keep-alive is disabled");
continue;
log::trace!("keep alive is disabled: ignoring request");
}
None => {
return Err(ServiceError::WsError {

Unchanged files with check annotations Beta

self.create_encrypted_message(
recipient,
unidentified_access,
device_id.into(),

Check warning on line 644 in libsignal-service/src/sender.rs

GitHub Actions / clippy

useless conversion to the same type: `libsignal_protocol::DeviceId`

warning: useless conversion to the same type: `libsignal_protocol::DeviceId` --> libsignal-service/src/sender.rs:644:21 | 644 | device_id.into(), | ^^^^^^^^^^^^^^^^ help: consider removing `.into()`: `device_id` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#useless_conversion = note: `#[warn(clippy::useless_conversion)]` on by default
content,
)
.await?,
use sha2::Sha256;
pub use crate::proto::{
ProvisionEnvelope, ProvisionMessage, ProvisioningVersion,

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

GitHub Actions / Build (libsignal-service-hyper, Rust beta)

unused import: `ProvisioningVersion`

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

GitHub Actions / Build (libsignal-service-hyper, Rust beta)

unused import: `ProvisioningVersion`

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

GitHub Actions / Build (libsignal-service-actix, Rust beta)

unused import: `ProvisioningVersion`

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

GitHub Actions / Build (libsignal-service-actix, Rust beta)

unused import: `ProvisioningVersion`

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

GitHub Actions / Build (libsignal-service-hyper, Rust nightly)

unused import: `ProvisioningVersion`

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

GitHub Actions / Build (libsignal-service-hyper, Rust nightly)

unused import: `ProvisioningVersion`

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

GitHub Actions / Build (libsignal-service-actix, Rust nightly)

unused import: `ProvisioningVersion`

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

GitHub Actions / Build (libsignal-service-actix, Rust nightly)

unused import: `ProvisioningVersion`
};
use crate::{
use url::Url;
pub use crate::proto::{
ProvisionEnvelope, ProvisionMessage, ProvisioningVersion,

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-hyper, Rust beta)

unused import: `ProvisioningVersion`

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-hyper, Rust beta)

unused import: `ProvisioningVersion`

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-actix, Rust beta)

unused import: `ProvisioningVersion`

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-actix, Rust beta)

unused import: `ProvisioningVersion`

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-hyper, Rust nightly)

unused import: `ProvisioningVersion`

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-hyper, Rust nightly)

unused import: `ProvisioningVersion`

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-actix, Rust nightly)

unused import: `ProvisioningVersion`

Check warning on line 12 in libsignal-service/src/provisioning/pipe.rs

GitHub Actions / Build (libsignal-service-actix, Rust nightly)

unused import: `ProvisioningVersion`
};
use crate::{