summary refs log tree commit diff
path: root/synapse/api/auth.py
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/auth.py
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/auth.py')
-rw-r--r--synapse/api/auth.py3
1 files changed, 2 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),