From 636db8cfaaedf60ff535acdfc545ffcfa26bb364 Mon Sep 17 00:00:00 2001
From: Nyaaori <+@nyaaori.cat>
Date: Fri, 24 Sep 2021 22:44:26 +0000
Subject: [PATCH 1/2] Make allow_encryption work again, fixing #115

---
 src/client_server/message.rs | 8 ++++++++
 src/client_server/state.rs   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/client_server/message.rs b/src/client_server/message.rs
index 93ead2c7..25964cc2 100644
--- a/src/client_server/message.rs
+++ b/src/client_server/message.rs
@@ -45,6 +45,14 @@ pub async fn send_message_event_route(
     );
     let state_lock = mutex_state.lock().await;
 
+    // Forbid m.room.encrypted if encryption is disabled
+    if &body.event_type == "m.room.encrypted" && !db.globals.allow_encryption() {
+        return Err(Error::BadRequest(
+            ErrorKind::Forbidden,
+            "Encryption has been disabled",
+        ));
+    }
+
     // Check if this is a new transaction id
     if let Some(response) =
         db.transaction_ids
diff --git a/src/client_server/state.rs b/src/client_server/state.rs
index 24cc2a18..7618dcc4 100644
--- a/src/client_server/state.rs
+++ b/src/client_server/state.rs
@@ -73,6 +73,14 @@ pub async fn send_state_event_for_empty_key_route(
 ) -> ConduitResult<send_state_event::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
+    // Forbid m.room.encryption if encryption is disabled
+    if &body.event_type == "m.room.encryption" && !db.globals.allow_encryption() {
+        return Err(Error::BadRequest(
+            ErrorKind::Forbidden,
+            "Encryption has been disabled",
+        ));
+    }
+
     let event_id = send_state_event_for_key_helper(
         &db,
         sender_user,

From 484a044b504dc3458799ee2eca87cd034f0ef8d5 Mon Sep 17 00:00:00 2001
From: Nyaaori <+@nyaaori.cat>
Date: Fri, 15 Oct 2021 23:17:08 +0000
Subject: [PATCH 2/2] Remove device_one_time_keys_count from is_empty() sync
 checks, fixing sync issue as reported by Nekron

---
 src/client_server/sync.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client_server/sync.rs b/src/client_server/sync.rs
index d98d759f..65c07bc9 100644
--- a/src/client_server/sync.rs
+++ b/src/client_server/sync.rs
@@ -769,7 +769,6 @@ async fn sync_helper(
         && response.presence.is_empty()
         && response.account_data.is_empty()
         && response.device_lists.is_empty()
-        && response.device_one_time_keys_count.is_empty()
         && response.to_device.is_empty()
     {
         // Hang a few seconds so requests are not spammed