From dd8a6ede09103b52bb4f22684b6c656449f539c7 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Thu, 21 Dec 2023 21:39:49 -0500
Subject: [PATCH] dont allow guest registration if registration disabled with
 token configured

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 src/api/client_server/account.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/client_server/account.rs b/src/api/client_server/account.rs
index ea45a8ca..1e64e5c7 100644
--- a/src/api/client_server/account.rs
+++ b/src/api/client_server/account.rs
@@ -89,9 +89,10 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 
     if is_guest
         && (!services().globals.allow_guest_registration()
-            || !services().globals.allow_registration())
+            || (!services().globals.allow_registration()
+                && services().globals.config.registration_token.is_some()))
     {
-        info!("Guest registration disabled / registration fully disabled, rejecting guest registration, initial device name: {:?}", body.initial_device_display_name);
+        info!("Guest registration disabled / registration disabled with token configured, rejecting guest registration, initial device name: {:?}", body.initial_device_display_name);
         return Err(Error::BadRequest(
             ErrorKind::GuestAccessForbidden,
             "Guest registration is disabled.",