methanium/mtp
Watch
3
0
Fork
You've already forked mtp
 0
Code Issues Pull requests 3 Projects Releases 22 Packages Wiki Activity Actions

[Fix] Wasm & Webserver
Some checks failed
CI / checks (push) Failing after 2m27s
Details

Browse source
This commit is contained in:
Alex Emmet 2026-07-19 19:36:17 +02:00
commit 67eb367464
5 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mtp-webserver/src/transport.rs
View file

@ -277,7 +277,7 @@ async fn accept_web_connection_inner(
if send_pongs {
receiver.respond_to_pings(sender.clone()).await;
}
let connection = mtp_host::MTPConnection::from_transport_parts(
let connection: WebMTPConnection = mtp_host::MTPConnection::from_transport_parts(
negotiated,
codec,
sender,
@ -401,7 +401,22 @@ async fn accept_web_connection_inner(
.map_err(AcceptError::Send)?;
tracing::debug!(elapsed = ?send_challenge_started.elapsed(), "web authentication handshake: send challenge");
let receive_proof_started = Instant::now();
let proof = connection.receive().await.map_err(AcceptError::Receive)?;
let proof = {
#[cfg(feature = "pipes")]
{
connection.receive().await.map_err(AcceptError::Receive)?
}
#[cfg(not(feature = "pipes"))]
{
let mut proof = connection
.receiver
.receive()
.await
.map_err(AcceptError::Receive)?;
proof.set_type_map(connection.codec.type_map());
proof
}
};
tracing::debug!(elapsed = ?receive_proof_started.elapsed(), "web authentication handshake: receive client proof");
if Some(proof.get_type()) != mtp_codec::CommunicationType::ChallengeResponse.try_to_id(&tm)
{
@ -410,7 +425,7 @@ async fn accept_web_connection_inner(
));
}
let nonce = match proof.get_data(DataType::ClientNonce) {
DataValue::UnsignedNumber(n) => *n,
DataValue::UnsignedNumber(n) => n.to_owned(),
_ => {
return Err(AcceptError::AuthenticationFailed(
"missing client nonce".into(),
@ -444,7 +459,7 @@ async fn accept_web_connection_inner(
auth::login_proof_payload(&version.to_string(), client_id, server_challenge, nonce)
};
let verify_proof_started = Instant::now();
if verify_ed25519(&client_bundle.sig_cl_public_key, &payload, signature).is_err() {
if verify_ed25519(&client_bundle.sig_cl_public_key, &payload, &signature).is_err() {
return Err(AcceptError::AuthenticationFailed(
"client proof signature invalid".into(),
));