diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-01-05 18:12:37 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-01-13 16:41:42 +0000 |
| commit | 93afb40cd4413008c40f6bdde032ccf5f1cefd9f (patch) | |
| tree | 8450163d53161c9ab2b0ffa7d59408a37405669c /synapse/handlers/message.py | |
| parent | Merge pull request #476 from koobs/patch-1 (diff) | |
| download | synapse-93afb40cd4413008c40f6bdde032ccf5f1cefd9f.tar.xz | |
Skip, rather than erroring, invalid guest requests
Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index a1bed9b0dc..5805190ce8 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014, 2015 OpenMarket Ltd +# Copyright 2014 - 2016 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -685,7 +685,7 @@ class MessageHandler(BaseHandler): ).addErrback(unwrapFirstError) messages = yield self._filter_events_for_client( - user_id, messages, is_guest=is_guest, require_all_visible_for_guests=False + user_id, messages, is_guest=is_guest, ) start_token = now_token.copy_and_replace("room_key", token[0]) |