also add auth_public_rooms option to require auth for CS API /publicRooms

1 files changed, 10 insertions, 0 deletions

diff --git a/synapse/config/server.py b/synapse/config/server.py
index 028695591f..ea84245907 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -75,6 +75,11 @@ class ServerConfig(Config):
         # endpoints via CS API. this is a workaround in advance of MSC1301 landing
         self.auth_profile_reqs = config.get("auth_profile_reqs", False)
 
+        # whether to require users to authenticate in order to query /publicRooms
+        # endpoints via CS API. this is a workaround in advance of
+        # https://github.com/matrix-org/matrix-doc/issues/612 beinig solved
+        self.auth_public_rooms = config.get("auth_public_rooms", False)
+
         # whether to enable search. If disabled, new entries will not be inserted
         # into the search tables and they will not be indexed. Users will receive
         # errors when attempting to search for messages.
@@ -326,6 +331,11 @@ class ServerConfig(Config):
         # endpoints via CS API. this is a workaround in advance of MSC1301 landing
         #auth_profile_reqs: false
 
+        # whether to require users to authenticate in order to query /publicRooms
+        # endpoints via CS API. this is a workaround in advance of
+        # https://github.com/matrix-org/matrix-doc/issues/612 beinig solved
+        #auth_public_rooms: false
+
         # The GC threshold parameters to pass to `gc.set_threshold`, if defined
         #
         #gc_thresholds: [700, 10, 10]