summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-13 13:48:13 +0100
committerErik Johnston <erik@matrix.org>2015-07-13 13:48:13 +0100
commit016c089f13853408d17e49130b3c34bc5d79cd1c (patch)
tree143d7635a669c4b8220f02c3895e096859714f82 /synapse/api
parentSanitize power level checks (diff)
parentMerge pull request #196 from matrix-org/erikj/room_history (diff)
downloadsynapse-016c089f13853408d17e49130b3c34bc5d79cd1c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py3
-rw-r--r--synapse/api/constants.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index ee52ff66d4..487be7ce9c 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
 
 AuthEventTypes = (
     EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,
-    EventTypes.JoinRules,
+    EventTypes.JoinRules, EventTypes.RoomHistoryVisibility,
 )
 
 
@@ -578,6 +578,7 @@ class Auth(object):
         levels_to_check = [
             ("users_default", None),
             ("events_default", None),
+            ("state_default", None),
             ("ban", None),
             ("redact", None),
             ("kick", None),
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index d8a18ee87b..3e15e8a9d7 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -75,6 +75,8 @@ class EventTypes(object):
     Redaction = "m.room.redaction"
     Feedback = "m.room.message.feedback"
 
+    RoomHistoryVisibility = "m.room.history_visibility"
+
     # These are used for validation
     Message = "m.room.message"
     Topic = "m.room.topic"