From dcd1163806e8736dd758cdef77c862b8b823088b Mon Sep 17 00:00:00 2001
From: Devin Ragotzy <devin.ragotzy@gmail.com>
Date: Tue, 3 Nov 2020 21:20:35 +0100
Subject: [PATCH] All outgoing pdus in Sending must be PduStubs

---
 src/database/sending.rs | 36 ++++++++++++++++++++++++------------
 src/server_server.rs    | 25 +++++++------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/database/sending.rs b/src/database/sending.rs
index c108e7ee..14558e3c 100644
--- a/src/database/sending.rs
+++ b/src/database/sending.rs
@@ -73,7 +73,7 @@ impl Sending {
             loop {
                 select! {
                     Some(server) = futures.next() => {
-                        debug!("response: {:?}", &server);
+                        debug!("sending response: {:?}", &server);
                         match server {
                             Ok((server, _response)) => {
                                 let mut prefix = server.as_bytes().to_vec();
@@ -184,17 +184,29 @@ impl Sending {
         let pdu_jsons = pdu_ids
             .iter()
             .map(|pdu_id| {
-                Ok::<_, (Box<ServerName>, Error)>(PduEvent::convert_to_outgoing_federation_event(
-                    rooms
-                        .get_pdu_json_from_id(pdu_id)
-                        .map_err(|e| (server.clone(), e))?
-                        .ok_or_else(|| {
-                            (
-                                server.clone(),
-                                Error::bad_database("Event in servernamepduids not found in db."),
-                            )
-                        })?,
-                ))
+                Ok::<_, (Box<ServerName>, Error)>(
+                    // TODO: this was a PduStub
+                    // In order for sending to work these actually do have to be
+                    // PduStub but, since they are Raw<..> we can fake it.
+                    serde_json::from_str(
+                        PduEvent::convert_to_outgoing_federation_event(
+                            rooms
+                                .get_pdu_json_from_id(pdu_id)
+                                .map_err(|e| (server.clone(), e))?
+                                .ok_or_else(|| {
+                                    (
+                                        server.clone(),
+                                        Error::bad_database(
+                                            "Event in servernamepduids not found in db.",
+                                        ),
+                                    )
+                                })?,
+                        )
+                        .json()
+                        .get(),
+                    )
+                    .expect("Raw<..> is always valid"),
+                )
             })
             .filter_map(|r| r.ok())
             .collect::<Vec<_>>();
diff --git a/src/server_server.rs b/src/server_server.rs
index 6550b8f0..de24c6d4 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -20,7 +20,7 @@ use ruma::{
         OutgoingRequest,
     },
     directory::{IncomingFilter, IncomingRoomNetwork},
-    EventId, RoomVersionId, ServerName,
+    EventId, RoomId, RoomVersionId, ServerName, UserId,
 };
 use std::{
     collections::BTreeMap,
@@ -412,19 +412,10 @@ pub async fn send_transaction_message_route<'a>(
                 "m.receipt" => {}
                 _ => {}
             },
-            Err(_err) => {
-                log::error!("{}", _err);
-                continue;
-            }
+            Err(_err) => continue,
         }
     }
-    // TODO: For RoomVersion6 we must check that Raw<..> is canonical do we?
-    // SPEC:
-    // Servers MUST strictly enforce the JSON format specified in the appendices.
-    // This translates to a 400 M_BAD_JSON error on most endpoints, or discarding of
-    // events over federation. For example, the Federation API's /send endpoint would
-    // discard the event whereas the Client Server API's /send/{eventType} endpoint
-    // would return a M_BAD_JSON error.
+
     let mut resolved_map = BTreeMap::new();
     for pdu in &body.pdus {
         println!("LOOP");
@@ -437,16 +428,14 @@ pub async fn send_transaction_message_route<'a>(
             if !db.rooms.is_joined(&pdu.sender, &pdu.room_id)? {
                 // TODO: auth rules apply to all events, not only those with a state key
                 log::error!("Unauthorized {}", pdu.kind);
-                return Err(Error::BadRequest(
-                    ruma::api::client::error::ErrorKind::Forbidden,
-                    "Event is not authorized",
-                ));
+
+                resolved_map.insert(event_id, Err("User is not in this room".into()));
+                continue;
             }
 
             // TODO: We should be doing the same get_closest_parent thing here too?
             // same as for state events ~100 lines down
             let count = db.globals.next_count()?;
-
             let mut pdu_id = pdu.room_id.as_bytes().to_vec();
             pdu_id.push(0xff);
             pdu_id.extend_from_slice(&count.to_be_bytes());
@@ -677,7 +666,7 @@ pub async fn send_transaction_message_route<'a>(
         };
     }
 
-    Ok(send_transaction_message::v1::Response { pdus: resolved_map }.into())
+    Ok(dbg!(send_transaction_message::v1::Response { pdus: resolved_map }).into())
 }
 
 #[cfg_attr(