Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable the ability to GET individualy messages. We need to think about the correct API to do this, as the current one doesn't make much sense.

This commit is contained in:
Erik Johnston 2014-08-18 10:59:04 +01:00
parent 7f5c7ddea9
commit dccb2f57be
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/handlers/room.py
View File

@ -59,12 +59,14 @@ class MessageHandler(BaseHandler):
yield self.auth.check_joined_room(room_id, user_id) yield self.auth.check_joined_room(room_id, user_id)
# Pull out the message from the db # Pull out the message from the db
msg = yield self.store.get_message(room_id=room_id, # msg = yield self.store.get_message(
msg_id=msg_id, # room_id=room_id,
user_id=sender_id) # msg_id=msg_id,
# user_id=sender_id
# )
# TODO (erikj): Once we work out the correct c-s api we need to think on how to do this.
if msg:
defer.returnValue(msg)
defer.returnValue(None) defer.returnValue(None)
@defer.inlineCallbacks @defer.inlineCallbacks

72
tests/rest/test_rooms.py
View File

@ -104,36 +104,36 @@ class RoomPermissionsTestCase(RestTestCase):
def tearDown(self): def tearDown(self):
pass pass
@defer.inlineCallbacks # @defer.inlineCallbacks
def test_get_message(self): # def test_get_message(self):
# get message in uncreated room, expect 403 # # get message in uncreated room, expect 403
(code, response) = yield self.mock_server.trigger_get( # (code, response) = yield self.mock_server.trigger_get(
"/rooms/noroom/messages/someid/m1") # "/rooms/noroom/messages/someid/m1")
self.assertEquals(403, code, msg=str(response)) # self.assertEquals(403, code, msg=str(response))
#
# get message in created room not joined (no state), expect 403 # # get message in created room not joined (no state), expect 403
(code, response) = yield self.mock_server.trigger_get( # (code, response) = yield self.mock_server.trigger_get(
self.created_rmid_msg_path) # self.created_rmid_msg_path)
self.assertEquals(403, code, msg=str(response)) # self.assertEquals(403, code, msg=str(response))
#
# get message in created room and invited, expect 403 # # get message in created room and invited, expect 403
yield self.invite(room=self.created_rmid, src=self.rmcreator_id, # yield self.invite(room=self.created_rmid, src=self.rmcreator_id,
targ=self.user_id) # targ=self.user_id)
(code, response) = yield self.mock_server.trigger_get( # (code, response) = yield self.mock_server.trigger_get(
self.created_rmid_msg_path) # self.created_rmid_msg_path)
self.assertEquals(403, code, msg=str(response)) # self.assertEquals(403, code, msg=str(response))
#
# get message in created room and joined, expect 200 # # get message in created room and joined, expect 200
yield self.join(room=self.created_rmid, user=self.user_id) # yield self.join(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger_get( # (code, response) = yield self.mock_server.trigger_get(
self.created_rmid_msg_path) # self.created_rmid_msg_path)
self.assertEquals(200, code, msg=str(response)) # self.assertEquals(200, code, msg=str(response))
#
# get message in created room and left, expect 403 # # get message in created room and left, expect 403
yield self.leave(room=self.created_rmid, user=self.user_id) # yield self.leave(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger_get( # (code, response) = yield self.mock_server.trigger_get(
self.created_rmid_msg_path) # self.created_rmid_msg_path)
self.assertEquals(403, code, msg=str(response)) # self.assertEquals(403, code, msg=str(response))
@defer.inlineCallbacks @defer.inlineCallbacks
def test_send_message(self): def test_send_message(self):
@ -913,9 +913,9 @@ class RoomMessagesTestCase(RestTestCase):
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_server.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("GET", path, None) # (code, response) = yield self.mock_server.trigger("GET", path, None)
self.assertEquals(200, code, msg=str(response)) # self.assertEquals(200, code, msg=str(response))
self.assert_dict(json.loads(content), response) # self.assert_dict(json.loads(content), response)
# m.text message type # m.text message type
path = "/rooms/%s/messages/%s/mid2" % ( path = "/rooms/%s/messages/%s/mid2" % (
@ -925,9 +925,9 @@ class RoomMessagesTestCase(RestTestCase):
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_server.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("GET", path, None) # (code, response) = yield self.mock_server.trigger("GET", path, None)
self.assertEquals(200, code, msg=str(response)) # self.assertEquals(200, code, msg=str(response))
self.assert_dict(json.loads(content), response) # self.assert_dict(json.loads(content), response)
# trying to send message in different user path # trying to send message in different user path
path = "/rooms/%s/messages/%s/mid2" % ( path = "/rooms/%s/messages/%s/mid2" % (