pierre/MatrixGW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pierre:master
Branches Tags
pierre:master
pierre:v1.0.0
..
compare: pierre:3b332c1123d7bcba74e86c540e3c691a8dc6785e
Branches Tags
pierre:master
pierre:v1.0.0

1 Commits
master ... 3b332c1123

Author SHA1 Message Date
Renovate Bot
3b332c1123 Update Rust crate actix-web to 4.11.0
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details
2025-05-16 00:16:06 +00:00
7 changed files with 47 additions and 62 deletions
Expand all files Collapse all files

73
Cargo.lock generated
View File

@ -719,9 +719,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.41"
version = "4.5.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
dependencies = [
"clap_builder",
"clap_derive",
@ -729,9 +729,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.41"
version = "4.5.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
dependencies = [
"anstream",
"anstyle",
@ -741,9 +741,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "4.5.41"
version = "4.5.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
dependencies = [
"heck",
"proc-macro2",
@ -928,9 +928,9 @@ dependencies = [
[[package]]
name = "crypto-common"
version = "0.2.0-rc.3"
version = "0.2.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be"
checksum = "170d71b5b14dec99db7739f6fc7d6ec2db80b78c3acb77db48392ccc3d8a9ea0"
dependencies = [
"hybrid-array",
]
@ -1033,13 +1033,13 @@ dependencies = [
[[package]]
name = "digest"
version = "0.11.0-rc.0"
version = "0.11.0-pre.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b"
checksum = "6c478574b20020306f98d61c8ca3322d762e1ff08117422ac6106438605ea516"
dependencies = [
"block-buffer 0.11.0-rc.4",
"const-oid 0.10.0",
"crypto-common 0.2.0-rc.3",
"crypto-common 0.2.0-rc.2",
]
[[package]]
@ -1808,17 +1808,6 @@ dependencies = [
"generic-array",
]
[[package]]
name = "io-uring"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
dependencies = [
"bitflags",
"cfg-if",
"libc",
]
[[package]]
name = "ipnet"
version = "2.11.0"
@ -2081,7 +2070,7 @@ dependencies = [
"rust-s3",
"serde",
"serde_json",
"sha2 0.11.0-rc.0",
"sha2 0.11.0-pre.5",
"thiserror 2.0.12",
"tokio",
"urlencoding",
@ -2750,9 +2739,9 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.12.5"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1d47e42b7dea75a468dea63a230f51331c58d690ca018ea1c6ac782ea98880c"
checksum = "c64fdaae631940eda62844a8a3026aba2ba84c22588c888ebec44861ba4d0c18"
dependencies = [
"assign",
"js_int",
@ -2788,9 +2777,9 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.20.4"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a9e9c613cfda4923b851c5d8bc442305905bee4f0c2b924564b00e71636c8d4"
checksum = "b9a89ac03a0f4451f946ed9aed6fdd16ef5a78a3a2849e87af4b2474a176b2fb"
dependencies = [
"as_variant",
"assign",
@ -2812,9 +2801,9 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.15.4"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "387e1898e868d32ff7b205e7db327361d5dcf635c00a8ae5865068607595a9cf"
checksum = "6b75da013b362664c3e161662902e5da3f77e990525681b59c6035bac27e87b4"
dependencies = [
"as_variant",
"base64 0.22.1",
@ -2844,9 +2833,9 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.30.4"
version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cdc7abec9bc2a9ca0b4831cc26ce97a6a8c39a0bde44a19281a719e861b4293"
checksum = "6c100eb6c7691ef010f18d9af315f486fc4da621b7203c431e88352148e84551"
dependencies = [
"as_variant",
"indexmap",
@ -2878,9 +2867,9 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.15.2"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ff13fbd6045a7278533390826de316d6116d8582ed828352661337b0c422e1c"
checksum = "c1182e83ee5cd10121974f163337b16af68a93eedfc7cdbdbd52307ac7e1d743"
dependencies = [
"cfg-if",
"proc-macro-crate",
@ -3217,13 +3206,13 @@ dependencies = [
[[package]]
name = "sha2"
version = "0.11.0-rc.0"
version = "0.11.0-pre.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59"
checksum = "19b4241d1a56954dce82cecda5c8e9c794eef6f53abe5e5216bac0a0ea71ffa7"
dependencies = [
"cfg-if",
"cpufeatures",
"digest 0.11.0-rc.0",
"digest 0.11.0-pre.10",
]
[[package]]
@ -3487,19 +3476,17 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.46.1"
version = "1.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
dependencies = [
"backtrace",
"bytes",
"io-uring",
"libc",
"mio",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"slab",
"socket2",
"tokio-macros",
"windows-sys 0.52.0",
@ -3769,14 +3756,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "1.17.0"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
dependencies = [
"getrandom 0.3.1",
"js-sys",
"serde",
"wasm-bindgen",
]
[[package]]

10
Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
log = "0.4.27"
env_logger = "0.11.8"
clap = { version = "4.5.41", features = ["derive", "env"] }
clap = { version = "4.5.38", features = ["derive", "env"] }
lazy_static = "1.5.0"
anyhow = "1.0.98"
serde = { version = "1.0.219", features = ["derive"] }
@ -21,15 +21,15 @@ rust-embed = "8.7.2"
mime_guess = "2.0.5"
askama = "0.14.0"
urlencoding = "2.1.3"
uuid = { version = "1.17.0", features = ["v4", "serde"] }
uuid = { version = "1.16.0", features = ["v4", "serde"] }
ipnet = { version = "2.11.0", features = ["serde"] }
chrono = "0.4.41"
futures-util = { version = "0.3.31", features = ["sink"] }
jwt-simple = { version = "0.12.12", default-features = false, features = ["pure-rust"] }
actix-remote-ip = "0.1.0"
bytes = "1.10.1"
sha2 = "0.11.0-rc.0"
sha2 = "0.11.0-pre.5"
base16ct = "0.2.0"
ruma = { version = "0.12.5", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
ruma = { version = "0.12.2", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
actix-ws = "0.3.0"
tokio = { version = "1.46.1", features = ["rt", "time", "macros", "rt-multi-thread"] }
tokio = { version = "1.45.0", features = ["rt", "time", "macros", "rt-multi-thread"] }

2
src/broadcast_messages.rs
View File

@ -42,5 +42,5 @@ pub enum BroadcastMessage {
/// Stop a client with a given client ID
StopSyncClient(SyncClientID),
/// Propagate a new sync event
SyncEvent(UserID, Box<SyncEvent>),
SyncEvent(UserID, SyncEvent),
}

6
src/server/api/ws.rs
View File

@ -34,7 +34,7 @@ pub async fn ws(
if let Err(e) = tx.send(BroadcastMessage::StartSyncTaskForUser(
auth.user.user_id.clone(),
)) {
log::error!("Failed to send StartSyncTaskForUser: {e}");
log::error!("Failed to send StartSyncTaskForUser: {}", e);
}
let rx = tx.subscribe();
@ -94,9 +94,9 @@ pub async fn ws_handler(
}
// Send the message to the websocket
if let Ok(msg) = serde_json::to_string(&WsMessage::Sync(*event)) {
if let Ok(msg) = serde_json::to_string(&WsMessage::Sync(event)) {
if let Err(e) = session.text(msg).await {
log::error!("Failed to send SyncEvent: {e}");
log::error!("Failed to send SyncEvent: {}", e);
}
}
}

8
src/server/web_ui.rs
View File

@ -105,12 +105,12 @@ pub async fn home(
// Close sync task
if let Err(e) = tx.send(BroadcastMessage::StopSyncTaskForUser(user.id.clone())) {
log::error!("Failed to send StopSyncClientForUser: {e}");
log::error!("Failed to send StopSyncClientForUser: {}", e);
}
// Invalidate all Ws connections
if let Err(e) = tx.send(BroadcastMessage::CloseAllUserSessions(user.id.clone())) {
log::error!("Failed to send CloseAllUserSessions: {e}");
log::error!("Failed to send CloseAllUserSessions: {}", e);
}
}
}
@ -145,7 +145,7 @@ pub async fn home(
success_message = Some("The client was successfully deleted!".to_string());
if let Err(e) = tx.send(BroadcastMessage::CloseClientSession(delete_client_id)) {
log::error!("Failed to send CloseClientSession: {e}");
log::error!("Failed to send CloseClientSession: {}", e);
}
}
}
@ -215,7 +215,7 @@ pub async fn oidc_cb(session: Session, query: web::Query<AuthCallbackQuery>) ->
name: user.name.unwrap_or("no_name".to_string()),
email: user.email.unwrap_or("no@mail.com".to_string()),
};
log::info!("Successful authentication as {user:?}");
log::info!("Successful authentication as {:?}", user);
session.insert(USER_SESSION_KEY, user)?;
Ok(HttpResponse::Found()

8
src/sync_client.rs
View File

@ -28,7 +28,7 @@ pub async fn sync_client_manager(tx: broadcast::Sender<BroadcastMessage>) -> ! {
continue;
}
log::info!("Start sync task for user {user_id:?}");
log::info!("Start sync task for user {:?}", user_id);
let task_id = SyncClientID(uuid::Uuid::new_v4());
running_tasks.insert(user_id.clone(), task_id.clone());
@ -41,7 +41,7 @@ pub async fn sync_client_manager(tx: broadcast::Sender<BroadcastMessage>) -> ! {
BroadcastMessage::StopSyncTaskForUser(user_id) => {
// Check if a task is running for this user
if let Some(task_id) = running_tasks.remove(&user_id) {
log::info!("Stop sync task for user {user_id:?}");
log::info!("Stop sync task for user {:?}", user_id);
tx.send(BroadcastMessage::StopSyncClient(task_id)).unwrap();
} else {
log::info!("Not stopping sync task for user {user_id:?}: not running");
@ -122,12 +122,12 @@ async fn sync_task(
match msg_stream {
Ok(Some(msg)) => {
log::debug!("Received new message from Matrix: {msg:#?}");
if let Err(e) = tx.send(BroadcastMessage::SyncEvent(user_id.clone(), Box::new(SyncEvent {
if let Err(e) = tx.send(BroadcastMessage::SyncEvent(user_id.clone(), SyncEvent {
rooms: msg.rooms,presence: msg.presence,
account_data: msg.account_data,
to_device: msg.to_device,
device_lists: msg.device_lists,
}))) {
})) {
log::error!("Failed to propagate event! {e}");
}
}

2
src/user.rs
View File

@ -147,7 +147,7 @@ impl UserConfig {
log::warn!("The bucket does not seem to exists, trying to create it!")
}
Err(e) => {
log::error!("Got unexpected error when querying bucket info: {e}");
log::error!("Got unexpected error when querying bucket info: {}", e);
return Err(e.into());
}
}