c059c9fea5
Merge branch 'develop' into application-services
...
Conflicts:
synapse/handlers/__init__.py
synapse/storage/__init__.py
2015-02-02 15:57:59 +00:00
1bd540ef79
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/schema/im.sql
2015-01-30 15:16:38 +00:00
e97f756a05
Use 'in' to test if the key exists, remove unused _filters_for_user
2015-01-30 14:54:06 +00:00
a70a801184
Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.
2015-01-30 13:34:01 +00:00
c562f237f6
Unused import
2015-01-30 11:43:00 +00:00
2ebf795c0a
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
2015-01-30 11:10:37 +00:00
93ed31dda2
Create a separate filter object to do the actual filtering, so that we can
...
split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event
2015-01-29 17:45:07 +00:00
295322048d
Merge branch 'develop' into client_v2_filter
2015-01-29 16:18:34 +00:00
acb68a39e0
Code style fixes.
2015-01-29 16:12:40 +00:00
9150a0d62e
Fix code-style
2015-01-29 16:01:14 +00:00
9d8f798a3f
Merge changes from develop
2015-01-29 14:55:27 +00:00
83172487b0
Add basic filtering public API unit tests. Use defers in the right places.
2015-01-29 12:20:59 +00:00
777d9914b5
Implement filter algorithm. Add basic event type unit tests to assert it works.
2015-01-29 11:38:06 +00:00
50de1eaad9
Add filtering public API; outline filtering algorithm.
2015-01-29 10:24:57 +00:00
2a4fda7b88
Add filtering.filter_events function, with stub passes_filter function.
2015-01-29 09:27:16 +00:00
26c8fff19e
Merge pull request #36 from matrix-org/device_id_from_access_token
...
Extract the device id and token id from the access token when autheniticating users
2015-01-28 17:19:28 +00:00
3cca61e006
Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier
2015-01-28 17:16:12 +00:00
c18e551640
Add a : to the doc string after the type of the return value
2015-01-28 17:08:53 +00:00
388581e087
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
2015-01-28 16:58:23 +00:00
c23e3db544
Add filter JSON sanity checks.
2015-01-28 16:45:18 +00:00
0ef5bfd6a9
Start implementing auth conflict res
2015-01-28 16:16:53 +00:00
c59bcabf0b
Return the device_id from get_auth_by_req
2015-01-28 15:43:41 +00:00
c291a4d522
Merge branch 'develop' into pushers
...
Conflicts:
synapse/handlers/events.py
synapse/server.py
2015-01-28 12:51:05 +00:00
54e513b4e6
Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests
2015-01-27 17:48:13 +00:00
059651efa1
Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely
2015-01-27 16:17:56 +00:00
05c7cba73a
Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
2015-01-27 14:28:56 +00:00
fa8e6ff900
Add stub application services REST API.
2015-01-27 14:01:51 +00:00
7b814d3f7f
Add client v2_alpha resource to synapse server resource tree
2015-01-23 18:55:19 +00:00
5759bec43c
Replace hs.parse_userid with UserID.from_string
2015-01-23 11:47:15 +00:00
49fe31792b
Add slightly pedantic trailing slash error.
2015-01-23 11:19:02 +00:00
f87586e661
right super() param
2015-01-23 10:32:40 +00:00
8a850573c9
As yet fairly untested GET API for push rules
2015-01-22 19:32:17 +00:00
ede491b4e0
Oops: second part of commit dc938606
2015-01-22 17:38:53 +00:00
c06a9063e1
Merge branch 'develop' into pushers
2015-01-13 13:15:51 +00:00
4c68460392
SYN-154: Tweak how the m.room.create check is done.
...
Don't perform the check in auth.is_host_in_room but instead do it in _do_join
and also assert that there are no m.room.members in the room before doing so.
2015-01-07 16:09:00 +00:00
9cb4f75d53
SYN-154: Better error messages when joining an unknown room by ID.
...
The simple fix doesn't work here because room creation also involves
unknown room IDs. The check relies on the presence of m.room.create for
rooms being created, whereas bogus room IDs have no state events at all.
2015-01-07 15:21:48 +00:00
adb04b1e57
Update copyright notices
2015-01-06 13:21:39 +00:00
b56730bb6e
Merge branch 'develop' into pushers
...
Conflicts:
synapse/api/errors.py
synapse/server.py
synapse/storage/__init__.py
2014-12-18 15:15:22 +00:00
3c77d13aa5
Kill off synapse.api.events.*
2014-12-16 11:29:05 +00:00
fc409096ac
Make auth module use EventTypes constants
2014-12-12 16:31:50 +00:00
63810c777d
Validate message, topic and name event contents
2014-12-12 11:01:09 +00:00
fa4b610ae3
Fix stream test. Make sure we add join to auth_events for invitiations
2014-12-12 10:42:27 +00:00
cde840a82c
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
...
Conflicts:
setup.py
2014-12-11 17:48:48 +00:00
d80d505b1f
Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server
2014-12-11 14:19:32 +00:00
61fc37e467
Merge branch 'develop' into media_repository
2014-12-10 16:14:17 +00:00
008303b245
PEP8
2014-12-09 14:49:11 +00:00
ba3d1e2fc0
Remove unused import
2014-12-08 12:01:25 +00:00
d044121168
Various typos and bug fixes.
2014-12-08 09:08:26 +00:00
6630e1b579
Start making more things use EventContext rather than event.*
2014-12-05 16:20:48 +00:00
5d7c9ab789
Begin converting things to use the new Event structure
2014-12-04 11:27:59 +00:00
Kegan Dougal