[WIP] Security work While on holiday
This commit is contained in:
parent
a81ac4efca
commit
7f0231e3f1
SSH key fingerprint:
SHA256:D1+Ub8o0v4K5y1JNivW8IxEOelqLSvPmUzBbDIoZkRQ
109 changed files with 19694 additions and 5210 deletions
|
|
@ -1,9 +1,12 @@
|
|||
use mtp_codec::CommunicationValue;
|
||||
#[cfg(feature = "pipes")]
|
||||
use mtp_codec::TypeMap;
|
||||
use mtp_common::CommunicationError;
|
||||
use mtp_transport::Receiver;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::{Mutex, mpsc};
|
||||
use tokio::time::{Duration, Instant};
|
||||
|
||||
#[cfg(feature = "pipes")]
|
||||
use mtp_codec::{CommunicationType, DataType, DataValue};
|
||||
|
|
@ -72,22 +75,50 @@ impl PipeRequest {
|
|||
pending.insert(self.pipe_id, pipe_tx);
|
||||
}
|
||||
|
||||
let resp = CommunicationValue::new(CommunicationType::PipeResponse)
|
||||
.with_id(self.pipe_id)
|
||||
.add_typed_default(DataType::Accepted, DataValue::BoolTrue);
|
||||
self.sender.send(&resp).await.map_err(PipeError::from)?;
|
||||
let resp = CommunicationValue::new_with_type_map(
|
||||
CommunicationType::PipeResponse,
|
||||
&self.dispatcher.type_map,
|
||||
)
|
||||
.with_id(self.pipe_id)
|
||||
.add_typed_default(DataType::Accepted, DataValue::BoolTrue);
|
||||
if let Err(error) = self.sender.send(&resp).await {
|
||||
self.dispatcher
|
||||
.pending_pipes
|
||||
.lock()
|
||||
.await
|
||||
.remove(&self.pipe_id);
|
||||
return Err(PipeError::from(error));
|
||||
}
|
||||
|
||||
let timeout = self.dispatcher.policy.read_timeout;
|
||||
tokio::time::timeout(timeout, pipe_rx)
|
||||
.await
|
||||
.map_err(|_| PipeError::HandshakeTimeout)?
|
||||
.map_err(|_| PipeError::StreamClosed)
|
||||
match tokio::time::timeout(timeout, pipe_rx).await {
|
||||
Ok(Ok(reader)) => Ok(reader),
|
||||
Ok(Err(_)) => {
|
||||
self.dispatcher
|
||||
.pending_pipes
|
||||
.lock()
|
||||
.await
|
||||
.remove(&self.pipe_id);
|
||||
Err(PipeError::StreamClosed)
|
||||
}
|
||||
Err(_) => {
|
||||
self.dispatcher
|
||||
.pending_pipes
|
||||
.lock()
|
||||
.await
|
||||
.remove(&self.pipe_id);
|
||||
Err(PipeError::HandshakeTimeout)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn deny(self) -> Result<(), PipeError> {
|
||||
let resp = CommunicationValue::new(CommunicationType::PipeResponse)
|
||||
.with_id(self.pipe_id)
|
||||
.add_typed_default(DataType::Accepted, DataValue::BoolFalse);
|
||||
let resp = CommunicationValue::new_with_type_map(
|
||||
CommunicationType::PipeResponse,
|
||||
&self.dispatcher.type_map,
|
||||
)
|
||||
.with_id(self.pipe_id)
|
||||
.add_typed_default(DataType::Accepted, DataValue::BoolFalse);
|
||||
self.sender.send(&resp).await.map_err(PipeError::from)?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -100,6 +131,9 @@ pub(crate) struct PendingRequest {
|
|||
|
||||
pub(crate) struct PipeDispatcher {
|
||||
pub(crate) pending_requests: Mutex<HashMap<u32, PendingRequest>>,
|
||||
pub(crate) expired_requests: Mutex<HashMap<u32, Instant>>,
|
||||
#[cfg(feature = "pipes")]
|
||||
pub(crate) type_map: TypeMap,
|
||||
#[cfg(feature = "pipes")]
|
||||
pub(crate) pending_creations:
|
||||
Mutex<HashMap<u32, tokio::sync::oneshot::Sender<Result<bool, PipeError>>>>,
|
||||
|
|
@ -115,14 +149,27 @@ pub(crate) async fn route_message(
|
|||
app_tx: &mpsc::Sender<Result<CommunicationValue, CommunicationError>>,
|
||||
dispatcher: &PipeDispatcher,
|
||||
) -> bool {
|
||||
let pending = dispatcher
|
||||
.pending_requests
|
||||
.lock()
|
||||
.await
|
||||
.remove(&msg.get_id());
|
||||
if let Some(tx) = pending {
|
||||
let _ = tx.sender.send(Ok(msg));
|
||||
return true;
|
||||
if !matches!(msg.id(), Some(id) if id != 0)
|
||||
&& msg
|
||||
.get_type_name()
|
||||
.is_some_and(|name| name.ends_with("Response"))
|
||||
{
|
||||
return app_tx
|
||||
.send(Err(CommunicationError::Other(
|
||||
"response frame must contain a non-zero id".into(),
|
||||
)))
|
||||
.await
|
||||
.is_ok();
|
||||
}
|
||||
if let Some(id) = msg.id() {
|
||||
let pending = dispatcher.pending_requests.lock().await.remove(&id);
|
||||
if let Some(tx) = pending {
|
||||
let _ = tx.sender.send(Ok(msg));
|
||||
return true;
|
||||
}
|
||||
if consume_expired_request(dispatcher, id).await {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
app_tx.send(Ok(msg)).await.is_ok()
|
||||
|
|
@ -135,6 +182,44 @@ pub(crate) async fn fail_pending_requests(dispatcher: &PipeDispatcher, error: Co
|
|||
}
|
||||
}
|
||||
|
||||
const EXPIRED_REQUEST_TOMBSTONE_TTL: Duration = Duration::from_secs(60);
|
||||
const MAX_EXPIRED_REQUEST_TOMBSTONES: usize = 1024;
|
||||
|
||||
pub(crate) async fn expire_pending_request(
|
||||
dispatcher: &PipeDispatcher,
|
||||
request_id: u32,
|
||||
token: &Arc<()>,
|
||||
) {
|
||||
let mut pending = dispatcher.pending_requests.lock().await;
|
||||
if pending
|
||||
.get(&request_id)
|
||||
.is_some_and(|entry| Arc::ptr_eq(&entry.token, token))
|
||||
{
|
||||
pending.remove(&request_id);
|
||||
drop(pending);
|
||||
let mut expired = dispatcher.expired_requests.lock().await;
|
||||
let now = Instant::now();
|
||||
expired.retain(|_, expires_at| *expires_at > now);
|
||||
if expired.len() >= MAX_EXPIRED_REQUEST_TOMBSTONES {
|
||||
if let Some(oldest) = expired
|
||||
.iter()
|
||||
.min_by_key(|(_, expires_at)| **expires_at)
|
||||
.map(|(id, _)| *id)
|
||||
{
|
||||
expired.remove(&oldest);
|
||||
}
|
||||
}
|
||||
expired.insert(request_id, now + EXPIRED_REQUEST_TOMBSTONE_TTL);
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn is_expired_request(dispatcher: &PipeDispatcher, request_id: u32) -> bool {
|
||||
let mut expired = dispatcher.expired_requests.lock().await;
|
||||
let now = Instant::now();
|
||||
expired.retain(|_, expires_at| *expires_at > now);
|
||||
expired.contains_key(&request_id)
|
||||
}
|
||||
|
||||
pub(crate) async fn remove_pending_request(
|
||||
dispatcher: &PipeDispatcher,
|
||||
request_id: u32,
|
||||
|
|
@ -149,6 +234,13 @@ pub(crate) async fn remove_pending_request(
|
|||
}
|
||||
}
|
||||
|
||||
async fn consume_expired_request(dispatcher: &PipeDispatcher, request_id: u32) -> bool {
|
||||
let mut expired = dispatcher.expired_requests.lock().await;
|
||||
let now = Instant::now();
|
||||
expired.retain(|_, expires_at| *expires_at > now);
|
||||
expired.remove(&request_id).is_some()
|
||||
}
|
||||
|
||||
#[cfg(feature = "pipes")]
|
||||
pub(crate) async fn run_dispatcher(
|
||||
receiver: Receiver,
|
||||
|
|
@ -157,14 +249,19 @@ pub(crate) async fn run_dispatcher(
|
|||
pipe_req_tx: mpsc::Sender<PipeRequest>,
|
||||
dispatcher: Arc<PipeDispatcher>,
|
||||
) {
|
||||
let pipe_req_type = CommunicationType::PipeRequest.try_to_id(&mtp_codec::TypeMap::latest());
|
||||
let pipe_resp_type = CommunicationType::PipeResponse.try_to_id(&mtp_codec::TypeMap::latest());
|
||||
|
||||
loop {
|
||||
match receiver.receive_event().await {
|
||||
Ok(mtp_transport::TransportEvent::Message(msg)) => {
|
||||
if Some(msg.get_type()) == pipe_req_type {
|
||||
let pipe_id = msg.get_id();
|
||||
if msg.is_type(CommunicationType::PipeRequest) {
|
||||
let Some(pipe_id) = msg.id().filter(|id| *id != 0) else {
|
||||
let error = CommunicationError::Other(
|
||||
"PipeRequest frame must contain a non-zero id".into(),
|
||||
);
|
||||
if app_tx.send(Err(error)).await.is_err() {
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
};
|
||||
let description = msg.get_str(DataType::Description).unwrap_or("").to_string();
|
||||
let req = PipeRequest {
|
||||
pipe_id,
|
||||
|
|
@ -176,8 +273,16 @@ pub(crate) async fn run_dispatcher(
|
|||
continue;
|
||||
}
|
||||
|
||||
if Some(msg.get_type()) == pipe_resp_type {
|
||||
let pipe_id = msg.get_id();
|
||||
if msg.is_type(CommunicationType::PipeResponse) {
|
||||
let Some(pipe_id) = msg.id().filter(|id| *id != 0) else {
|
||||
let error = CommunicationError::Other(
|
||||
"PipeResponse frame must contain a non-zero id".into(),
|
||||
);
|
||||
if app_tx.send(Err(error)).await.is_err() {
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
};
|
||||
let accepted = msg.get_bool(DataType::Accepted).unwrap_or(false);
|
||||
let mut pending = dispatcher.pending_creations.lock().await;
|
||||
if let Some(tx) = pending.remove(&pipe_id) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue