Mark Haines
|
22dd1cde2d
|
Filter the recent events before applying the limit when doing an incremental sync with a gap
|
2015-01-30 11:32:35 +00:00 |
Mark Haines
|
365a186729
|
Add basic filtering support
|
2015-01-29 18:11:28 +00:00 |
Mark Haines
|
7ceda8bf3d
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 18:04:07 +00:00 |
Mark Haines
|
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 |
David Baker
|
4bdfce30d7
|
Renumber priority classes so we can use 0 for defaults.
|
2015-01-29 17:12:11 +00:00 |
David Baker
|
e0d2c6889b
|
Allow kind to be set to null to delete a pusher.
|
2015-01-29 17:05:00 +00:00 |
Mark Haines
|
722b65f461
|
Move typing notifs to an "emphermal" event list on the room object
|
2015-01-29 16:41:21 +00:00 |
Mark Haines
|
8e571cbed8
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 16:18:59 +00:00 |
Mark Haines
|
295322048d
|
Merge branch 'develop' into client_v2_filter
|
2015-01-29 16:18:34 +00:00 |
Mark Haines
|
acb68a39e0
|
Code style fixes.
|
2015-01-29 16:12:40 +00:00 |
Mark Haines
|
cf7c54ec93
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 15:55:58 +00:00 |
Mark Haines
|
33391db5f8
|
Merge in auth changes from develop
|
2015-01-29 15:54:54 +00:00 |
Mark Haines
|
396a67a09a
|
Merge branch 'client_v2_filter' into client_v2_sync
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
|
2015-01-29 14:58:00 +00:00 |
Mark Haines
|
9d8f798a3f
|
Merge changes from develop
|
2015-01-29 14:55:27 +00:00 |
Mark Haines
|
3dbce6f4a5
|
Add typing notifications to sync
|
2015-01-29 03:33:51 +00:00 |
Mark Haines
|
b9c442c85c
|
Include transaction ids in unsigned section of events in the sync results for the clients that made those requests
|
2015-01-29 02:46:00 +00:00 |
David Baker
|
8552ed8df2
|
Change uses of get_user_by_req because it returns a tuple now.
|
2015-01-28 18:04:40 +00:00 |
Mark Haines
|
c81a19552f
|
Add ports back to demo/start.sh
|
2015-01-28 17:32:49 +00:00 |
Mark Haines
|
9c61556504
|
Merge branch 'develop' into client_v2_sync
|
2015-01-28 17:29:30 +00:00 |
Mark Haines
|
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 |
Mark Haines
|
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 |
Kegan Dougal
|
c23e3db544
|
Add filter JSON sanity checks.
|
2015-01-28 16:45:18 +00:00 |
Mark Haines
|
c59bcabf0b
|
Return the device_id from get_auth_by_req
|
2015-01-28 15:43:41 +00:00 |
David Baker
|
2cfdfee572
|
spaces
|
2015-01-28 14:41:51 +00:00 |
David Baker
|
289a249874
|
Unnecessary newlines.
|
2015-01-28 14:39:03 +00:00 |
David Baker
|
3cb5b73c0d
|
Unnecessary newline.
|
2015-01-28 14:37:55 +00:00 |
David Baker
|
8807f4170e
|
Better style
|
2015-01-28 14:35:00 +00:00 |
David Baker
|
032f8d4ed3
|
Another superfluous newline
|
2015-01-28 14:33:15 +00:00 |
David Baker
|
d93ce29a86
|
Ah, the comma of doom.
|
2015-01-28 14:27:01 +00:00 |
David Baker
|
6741c3dbd9
|
Brackets are nicer
|
2015-01-28 14:26:03 +00:00 |
David Baker
|
4fbf2328c2
|
Unnecessary new line
|
2015-01-28 14:24:28 +00:00 |
David Baker
|
20c47383dc
|
Oops, bad merge: needed to change the base class of the rest servlets too.
|
2015-01-28 14:10:46 +00:00 |
David Baker
|
c291a4d522
|
Merge branch 'develop' into pushers
Conflicts:
synapse/handlers/events.py
synapse/server.py
|
2015-01-28 12:51:05 +00:00 |
Kegan Dougal
|
42876969b9
|
Add basic application_services SQL, and hook up parts of the appservice store to read from it.
|
2015-01-28 11:59:38 +00:00 |
Mark Haines
|
e020574d65
|
Fix Formatting
|
2015-01-27 20:19:36 +00:00 |
Kegan Dougal
|
ec3719b583
|
Use ApplicationService when registering.
|
2015-01-27 17:15:06 +00:00 |
Paul "LeoNerd" Evans
|
059651efa1
|
Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely
|
2015-01-27 16:17:56 +00:00 |
Kegan Dougal
|
51449e0665
|
Add appservice handler and store. Glue together rest > handler > store.
|
2015-01-27 15:50:28 +00:00 |
Kegan Dougal
|
6efdc11cc8
|
Parse /register and /unregister request JSON.
|
2015-01-27 15:03:19 +00:00 |
Paul "LeoNerd" Evans
|
05c7cba73a
|
Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
|
2015-01-27 14:28:56 +00:00 |
Kegan Dougal
|
fa8e6ff900
|
Add stub application services REST API.
|
2015-01-27 14:01:51 +00:00 |
Paul "LeoNerd" Evans
|
0484d7f6e9
|
Merge branch 'develop' into client_v2_filter
|
2015-01-27 13:11:03 +00:00 |
Mark Haines
|
436513068d
|
Start implementing the non-incremental sync portion of the v2 /sync API
|
2015-01-26 18:53:31 +00:00 |
Mark Haines
|
3186c5bdbc
|
Merge branch 'develop' into client_v2_sync
|
2015-01-26 16:32:40 +00:00 |
Mark Haines
|
7f6f3f9d62
|
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
|
2015-01-26 16:11:28 +00:00 |
Paul "LeoNerd" Evans
|
8d7accb28f
|
Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no actual filter implementation
|
2015-01-26 14:33:30 +00:00 |
Mark Haines
|
7b814d3f7f
|
Add client v2_alpha resource to synapse server resource tree
|
2015-01-23 18:55:19 +00:00 |
Mark Haines
|
e26340cee7
|
Start implementing the v2_alpha sync API
|
2015-01-23 18:48:17 +00:00 |
David Baker
|
5f84ba8ea1
|
Add API to delete push rules.
|
2015-01-23 17:49:37 +00:00 |
David Baker
|
f21f9fa3c5
|
Use push settings!
|
2015-01-23 17:07:06 +00:00 |
Mark Haines
|
4be637cb12
|
Extract the client v1 base RestServlet to a separate class
|
2015-01-23 14:09:51 +00:00 |
David Baker
|
b3f66ea6fb
|
more pep8
|
2015-01-23 13:28:00 +00:00 |
David Baker
|
d3e72b4d87
|
Make string format tuple an actual tuple
|
2015-01-23 13:25:58 +00:00 |
David Baker
|
98e1080555
|
redundant parens
|
2015-01-23 13:25:36 +00:00 |
David Baker
|
54c689c819
|
stray space
|
2015-01-23 13:25:14 +00:00 |
David Baker
|
6188c4f69c
|
make per-device rules work
|
2015-01-23 13:23:10 +00:00 |
Mark Haines
|
ada711504e
|
Replace hs.parse_roomalias with RoomAlias.from_string
|
2015-01-23 13:21:58 +00:00 |
Mark Haines
|
1c06c48ce2
|
Replace hs.parse_roomid with RoomID.from_string
|
2015-01-23 11:55:12 +00:00 |
Mark Haines
|
5759bec43c
|
Replace hs.parse_userid with UserID.from_string
|
2015-01-23 11:47:15 +00:00 |
David Baker
|
49fe31792b
|
Add slightly pedantic trailing slash error.
|
2015-01-23 11:19:02 +00:00 |
Mark Haines
|
7256def8e4
|
Merge rest servlets into the client json resource object
|
2015-01-23 10:37:38 +00:00 |
David Baker
|
bcd48b9636
|
Fix adding rules without before/after & add the rule that we couldn't find to the error
|
2015-01-23 10:28:25 +00:00 |
David Baker
|
6927b6b197
|
This really serves me right for ever making a map called 'map'.
|
2015-01-23 10:21:47 +00:00 |
David Baker
|
8a850573c9
|
As yet fairly untested GET API for push rules
|
2015-01-22 19:32:17 +00:00 |
David Baker
|
5c6189ea3e
|
Merge branch 'develop' into pushers
Conflicts:
synapse/rest/__init__.py
|
2015-01-22 17:46:16 +00:00 |
David Baker
|
ede491b4e0
|
Oops: second part of commit dc938606
|
2015-01-22 17:38:53 +00:00 |
David Baker
|
dc93860619
|
Add rest API & store for creating push rules
Also make unrecognised request error look more like synapse errors
because it makes it easier to throw them from within rest classes.
|
2015-01-22 17:37:12 +00:00 |
Mark Haines
|
97c68c508d
|
Move rest APIs back under the rest directory
|
2015-01-22 16:10:07 +00:00 |
Mark Haines
|
1d2016b4a8
|
Move client v1 api rest servlets into a "client/v1" directory
|
2015-01-22 14:59:08 +00:00 |
David Baker
|
afb714f7be
|
add instance_handles to pushers so we have a way to refer to them even if the push token changes.
|
2015-01-20 11:49:48 +00:00 |
David Baker
|
2d2953cf5f
|
Require device language when adding a pusher.
Because this seems like it might be useful to do sooner rather
than later.
|
2015-01-16 11:24:10 +00:00 |
Paul "LeoNerd" Evans
|
34a5fbe2b7
|
Have /join/:room_id return the room ID in response anyway, for consistency of clients (SYN-234)
|
2015-01-13 17:29:24 +00:00 |
David Baker
|
c06a9063e1
|
Merge branch 'develop' into pushers
|
2015-01-13 13:15:51 +00:00 |
Kegan Dougal
|
b5924cae04
|
Add raw query param for scrollback.
|
2015-01-08 14:37:55 +00:00 |
Kegan Dougal
|
edb557b2ad
|
Return the raw federation event rather than adding extra keys for federation data.
|
2015-01-08 14:28:08 +00:00 |
Kegan Dougal
|
5720ab59e0
|
Add 'raw' query parameter to expose the event graph and signatures to savvy clients.
|
2015-01-08 13:57:40 +00:00 |
Mark Haines
|
adb04b1e57
|
Update copyright notices
|
2015-01-06 13:21:39 +00:00 |
David Baker
|
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 |
David Baker
|
0a6664493a
|
Merge branch 'master' into pushers
|
2014-12-18 15:06:11 +00:00 |
David Baker
|
9728c305a3
|
after a few rethinks, a working implementation of pushers.
|
2014-12-18 14:49:22 +00:00 |
Mark Haines
|
3c7857e49b
|
clean up coding style a bit
|
2014-12-16 15:24:03 +00:00 |
Erik Johnston
|
3c77d13aa5
|
Kill off synapse.api.events.*
|
2014-12-16 11:29:05 +00:00 |
Erik Johnston
|
cf6e5f1dbf
|
Rename MessageHandler.handle_event. Add a few comments.
|
2014-12-15 17:01:12 +00:00 |
Erik Johnston
|
57e0e619f3
|
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts:
tests/handlers/test_room.py
|
2014-12-15 14:45:59 +00:00 |
Erik Johnston
|
23c7cb6220
|
Remove unused imports
|
2014-12-12 16:31:59 +00:00 |
Erik Johnston
|
7b43a503f3
|
Consistently url decode and decode as utf 8 the URL parts
|
2014-12-12 15:05:37 +00:00 |
Paul "LeoNerd" Evans
|
0ca072b3b6
|
Initial tiny hack at REST API for setting room typing notification status
|
2014-12-11 10:55:36 +00:00 |
Erik Johnston
|
cabead6194
|
Actually fix bug when uploading state with empty state_key
|
2014-12-10 14:49:52 +00:00 |
Erik Johnston
|
02db7eb209
|
Fix bug when uploading state with empty state_key
|
2014-12-10 14:02:48 +00:00 |
Erik Johnston
|
aae8a37e63
|
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
|
2014-12-10 13:18:40 +00:00 |
Erik Johnston
|
a295a3c691
|
Fix registration
|
2014-12-08 09:24:37 +00:00 |
Matthew Hodgson
|
aed62a3583
|
track replication destination health, and perform exponential back-off when sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover.
|
2014-12-07 02:26:07 +00:00 |
Erik Johnston
|
c31dba86ec
|
Convert rest and handlers to use new event structure
|
2014-12-04 15:50:01 +00:00 |
David Baker
|
88af58d41d
|
Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.
|
2014-12-03 13:37:02 +00:00 |
Erik Johnston
|
6941a19715
|
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
|
2014-12-03 11:56:49 +00:00 |
Paul "LeoNerd" Evans
|
afb646dc1e
|
Allow GET /room/:room_id/messages without 'limit' parameter to default to 10
|
2014-12-02 18:01:16 +00:00 |
David Baker
|
7642d95d5e
|
Merge branch 'develop' into pushers
|
2014-12-02 13:50:05 +00:00 |
Erik Johnston
|
9d53228158
|
Change DomainSpecificString so that it doesn't use a HomeServer object
|
2014-12-02 10:42:28 +00:00 |
Kegan Dougal
|
3536fd7d60
|
Don't double url-decode state event types.
|
2014-11-25 11:02:19 +00:00 |
David Baker
|
58f82e2e54
|
Merge branch 'develop' into pushers
|
2014-11-20 18:25:31 +00:00 |
David Baker
|
23465a30b6
|
Merge branch 'develop' into pushers
|
2014-11-20 18:17:46 +00:00 |
Mark Haines
|
610c2ea131
|
Fix pep8 and pyflakes warnings
|
2014-11-20 18:00:10 +00:00 |
David Baker
|
f1c7f8e813
|
Merge branch 'develop' into http_client_refactor
|
2014-11-20 17:49:48 +00:00 |
David Baker
|
e377d33652
|
Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
|
2014-11-20 17:41:56 +00:00 |
Mark Haines
|
db9ce032a4
|
Fix pep8 codestyle warnings
|
2014-11-20 17:26:36 +00:00 |
Mark Haines
|
32090aee16
|
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
|
2014-11-20 16:24:00 +00:00 |
David Baker
|
74c3879760
|
Start creating a module to do generic notifications (just prints them to stdout currently!)
|
2014-11-19 18:20:59 +00:00 |
Paul "LeoNerd" Evans
|
572a1ca42a
|
Remember also to UTF-8 decode bytes in room alias names in directory server URLs
|
2014-11-18 18:06:35 +00:00 |
Paul "LeoNerd" Evans
|
3bfc3dd45b
|
Remember to URL decode the room_id in room initialSync
|
2014-11-18 17:44:55 +00:00 |
Paul "LeoNerd" Evans
|
88dfa7baa6
|
Ensure to parse a real pagination config object out of room initialSync request and pass it on
|
2014-11-18 16:34:43 +00:00 |
Paul "LeoNerd" Evans
|
75e95c45a2
|
Rename message handler's new snapshot_room to room_initial_sync() as that better suits its purpose
|
2014-11-18 16:02:44 +00:00 |
Paul "LeoNerd" Evans
|
e9f587ecba
|
Merge remote-tracking branch 'origin/develop' into room-initial-sync
|
2014-11-18 15:48:30 +00:00 |
Mark Haines
|
a5b88c489e
|
Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room
|
2014-11-18 15:03:13 +00:00 |
Paul "LeoNerd" Evans
|
31a049eb69
|
Merge branch 'develop' into room-initial-sync
Conflicts:
synapse/handlers/message.py
|
2014-11-17 16:59:24 +00:00 |
Paul "LeoNerd" Evans
|
269f80bf8e
|
Have room initialSync return the room's room_id
|
2014-11-10 19:02:19 +00:00 |
Erik Johnston
|
a8e565eca8
|
Add an EventValidator. Fix bugs in auth ++ storage
|
2014-11-10 18:25:42 +00:00 |
Erik Johnston
|
3cb678f84c
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
|
2014-11-07 10:55:28 +00:00 |
Erik Johnston
|
4317c8e583
|
Implement new replace_state and changed prev_state
`prev_state` is now a list of previous state ids, similiar to
prev_events. `replace_state` now points to what we think was replaced.
|
2014-11-06 15:10:55 +00:00 |
Kegan Dougal
|
d3a02ec038
|
Fix url decoding bugs with /redact and /send APIs.
|
2014-11-05 12:05:11 +00:00 |
Kegan Dougal
|
9f6d1b10ad
|
Be sure to urlencode/decode event types correctly in both the web client and HS.
|
2014-11-05 11:21:55 +00:00 |
Erik Johnston
|
ef9c4476a0
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
|
2014-10-30 11:18:28 +00:00 |
Mark Haines
|
7d709542ca
|
Fix pep8 warnings
|
2014-10-30 11:10:17 +00:00 |
Erik Johnston
|
ad9226eeec
|
Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
synapse/storage/__init__.py
|
2014-10-27 11:58:32 +00:00 |
Mark Haines
|
d56e389a95
|
Fix pyflakes warnings
|
2014-10-27 10:33:17 +00:00 |
Erik Johnston
|
bb4a20174c
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
synapse/federation/transport.py
synapse/handlers/message.py
|
2014-10-27 10:20:44 +00:00 |
David Baker
|
51edfeb3d0
|
Coturn's timestamps are in seconds, not milliseconds
|
2014-10-21 18:57:13 +01:00 |
Erik Johnston
|
5ffe5ab43f
|
Use state groups to get current state. Make join dance actually work.
|
2014-10-17 18:56:42 +01:00 |
Paul "LeoNerd" Evans
|
13b560971e
|
Make sure to return an empty JSON object ({}) from presence PUT/POST requests rather than an empty string ("") because most deserialisers won't like the latter
|
2014-10-14 16:48:15 +01:00 |
Erik Johnston
|
e06adc6d7e
|
SYN-2: Allow server admins to delete room aliases
|
2014-09-30 11:31:42 +01:00 |
Erik Johnston
|
1132663cc7
|
SYN-48: Fix typo. Get the whois for requested user rather tahan the requester
|
2014-09-29 15:04:04 +01:00 |
Erik Johnston
|
3ccb17ce59
|
SYN-48: Implement WHOIS rest servlet
|
2014-09-29 14:59:52 +01:00 |
Erik Johnston
|
0fdf308874
|
Track the IP users connect with. Add an admin column to users table.
|
2014-09-26 16:36:24 +01:00 |
Erik Johnston
|
37bfe44046
|
Merge branch 'deletions' of github.com:matrix-org/synapse into develop
|
2014-09-25 17:02:53 +01:00 |
David Baker
|
c58eb0d5a3
|
Merge branch 'turn' into develop
|
2014-09-25 13:09:56 +01:00 |
David Baker
|
a31bf77776
|
Make turn server endpoint return an empty object if no turn servers to
match the normal response. Don't break if the turn_uris option isn't
present.
|
2014-09-25 11:24:49 +02:00 |
David Baker
|
7dc7c53029
|
The REST API spec only alows for returning a single server so name the
endpoint appropriately.
|
2014-09-24 17:28:47 +02:00 |
David Baker
|
4553651138
|
Oops
|
2014-09-24 17:04:33 +02:00 |
David Baker
|
5383ba5587
|
rename endpoint to better reflect what it is and allow specifying multiple uris
|
2014-09-24 16:01:36 +01:00 |
Erik Johnston
|
70899d3ab2
|
Rename deletions to redactions
|
2014-09-24 15:27:59 +01:00 |
David Baker
|
b42b0d3fe5
|
Use standard base64 encoding with padding to get the same result as
coturn.
|
2014-09-24 15:29:24 +02:00 |
Paul "LeoNerd" Evans
|
a7d53227de
|
Bugfix for older Pythons that lack hmac.compare_digest()
|
2014-09-23 19:07:16 +01:00 |
David Baker
|
c96ab4fcbb
|
The config is not hierarchical
|
2014-09-23 19:17:24 +02:00 |
David Baker
|
14ed6799d7
|
Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)
|
2014-09-23 17:16:13 +01:00 |
Paul "LeoNerd" Evans
|
c0673c50e6
|
Merge branch 'jira/SYN-60' into develop
|
2014-09-23 16:15:54 +01:00 |
Paul "LeoNerd" Evans
|
c03176af59
|
Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather than simply the secret itself, so it's useless if that HMAC leaks
|
2014-09-23 15:58:44 +01:00 |
Kegan Dougal
|
0c4ae63ad5
|
Implemented /rooms/$roomid/state API.
|
2014-09-23 15:35:58 +01:00 |
Erik Johnston
|
78af6bbb98
|
Add m.room.deletion. If an event is deleted it will be returned to clients 'pruned', i.e. all client specified keys will be removed.
|
2014-09-23 15:28:32 +01:00 |
Paul "LeoNerd" Evans
|
537c7e1137
|
Config values are almost never 'None', but they might be empty string. Detect their presence by truth
|
2014-09-23 15:18:59 +01:00 |
Paul "LeoNerd" Evans
|
5f16439752
|
Make sure the config actually /has/ a captcha_bypass_secret set before trying to compare it
|
2014-09-23 15:16:47 +01:00 |
Paul "LeoNerd" Evans
|
3a8a94448a
|
Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared secret to allow bots to bypass the ReCAPTCHA test (SYN-60)
|
2014-09-23 14:29:08 +01:00 |
Kegan Dougal
|
c099b36af3
|
Comment out password reset for now, until the mechanism is fully discussed (IS token auth vs HS auth)
|
2014-09-16 13:32:33 +01:00 |
Kegan Dougal
|
5f30a69a9e
|
Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to send email.
|
2014-09-16 11:22:40 +01:00 |
Kegan Dougal
|
34d7896b06
|
More helpful 400 error messages.
|
2014-09-15 16:05:51 +01:00 |
Kegan Dougal
|
2c00e1ecd9
|
Be consistent when associating keys with login types for registration/login.
|
2014-09-15 15:38:29 +01:00 |
Kegan Dougal
|
14bc4ed59f
|
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.
|
2014-09-15 15:27:58 +01:00 |
Kegan Dougal
|
04fbda46dd
|
Make captcha work again with the new registration logic.
|
2014-09-15 14:52:39 +01:00 |
Erik Johnston
|
5bd9369a62
|
Correctly handle the 'age' key in events and pdus
|
2014-09-15 13:26:11 +01:00 |
Kegan Dougal
|
285ecaacd0
|
Split out password/captcha/email logic.
|
2014-09-15 12:42:36 +01:00 |
Kegan Dougal
|
34878bc26a
|
Added LoginType constants. Created general structure for processing registrations.
|
2014-09-15 10:23:20 +01:00 |
Kegan Dougal
|
1a298aad9c
|
Added captcha support on both the HS and web client.
Merge branch 'captcha' of github.com:matrix-org/synapse into develop
|
2014-09-05 23:32:51 -07:00 |
Kegan Dougal
|
3ea6f01b4e
|
80 chars please
|
2014-09-05 22:55:29 -07:00 |
Kegan Dougal
|
37e53513b6
|
Add config opion for XFF headers when performing ReCaptcha auth.
|
2014-09-05 22:51:11 -07:00 |
Kegan Dougal
|
1829b55bb0
|
Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.
|
2014-09-05 19:18:23 -07:00 |
Kegan Dougal
|
0b9e1e7b56
|
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
|
2014-09-05 17:58:06 -07:00 |
Erik Johnston
|
9dd4570b68
|
Generate m.room.aliases event when the HS creates a room alias
|
2014-09-05 21:35:56 +01:00 |
Erik Johnston
|
982604fbf2
|
Empty string is not a valid JSON object, so don't return them in HTTP responses.
|
2014-09-05 17:13:26 +01:00 |
David Baker
|
d72ce4da64
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
synapse/http/client.py
|
2014-09-03 18:25:17 +01:00 |
David Baker
|
d6ecbbdf0a
|
Add support for registering with a threepid to the HS (get credentials from the client and check them against an ID server).
|
2014-09-03 18:22:27 +01:00 |
Erik Johnston
|
1b491e50c9
|
Implement a kick api
|
2014-09-03 17:46:52 +01:00 |
Matthew Hodgson
|
8a7c1d6a00
|
fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
|
2014-09-03 17:31:57 +01:00 |
Kegan Dougal
|
beaf50f5c6
|
Bubble up SynapseErrors so expected failures aren't masked.
|
2014-09-03 16:31:01 +01:00 |
Kegan Dougal
|
581c54bebe
|
Add exception handling to directory servlet, so we don't 500. Mark directory API as volatile in the api docs.
|
2014-09-03 16:27:01 +01:00 |
Erik Johnston
|
30bcbc433a
|
Fix up directory server to not require uploading room hosts. Update the room hosts table with the current room hosts (if we have them) on GET.
|
2014-09-03 16:04:27 +01:00 |
Paul "LeoNerd" Evans
|
cda31fb755
|
Kill the state
... key from all the Presence messages
|
2014-09-03 15:37:10 +01:00 |
Kegan Dougal
|
dfea1730dc
|
apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in invite/drop arrays.
|
2014-09-03 12:09:20 +01:00 |
Kegan Dougal
|
10afd895c4
|
Edited /presence REST servlet to raise SynapseErrors to return a standard error response, rather than a string.
|
2014-09-03 11:56:47 +01:00 |
Kegan Dougal
|
acfabfff9c
|
Fixed /presence APIs to urldecode user IDs.
|
2014-09-03 11:31:48 +01:00 |
Kegan Dougal
|
2385d396c3
|
URL decode user IDs for /profile REST path segments.
|
2014-09-03 11:05:29 +01:00 |
Kegan Dougal
|
c77add6d21
|
Add ban support: /rooms/$roomid/ban with { user_id : foo }
|
2014-09-03 09:43:32 +01:00 |
Paul "LeoNerd" Evans
|
aa337f588c
|
Order matters when adding REST servlets
|
2014-09-02 12:53:36 +01:00 |
David Baker
|
5c778f2f15
|
Add rest endpoint for the whole user profile
|
2014-09-02 11:49:17 +01:00 |
Paul "LeoNerd" Evans
|
02f4e3b3ff
|
Rename 'state' presence key to the much more obvious 'presence'; maintain a legacy 'state' copy for now
|
2014-09-01 14:45:41 +01:00 |
Kegan Dougal
|
8d7d251c35
|
Support multiple login flows when deciding how to login. Updated cmdclient and spec. Webclient doesn't need updating for this.
|
2014-08-28 14:56:55 +01:00 |
Erik Johnston
|
7c89d5e97a
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
|
2014-08-27 17:05:48 +01:00 |
Kegan Dougal
|
f64887e15c
|
Added RestServlet for /rooms/$roomid/initialSync
|
2014-08-27 16:49:01 +01:00 |
Kegan Dougal
|
4e8d19ee2b
|
Added RestServlet for /rooms/$roomid/state
|
2014-08-27 16:42:33 +01:00 |
Erik Johnston
|
08881d808d
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
|
2014-08-27 15:34:01 +01:00 |
Kegan Dougal
|
c585c87c4b
|
Renamed /ds to /directory
|
2014-08-27 14:54:29 +01:00 |
Kegan Dougal
|
1d9d287c7c
|
Renamed /public/rooms to /publicRooms
|
2014-08-27 14:52:07 +01:00 |
Erik Johnston
|
47519cd8c2
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Conflicts:
synapse/handlers/events.py
synapse/rest/events.py
synapse/rest/room.py
|
2014-08-27 14:13:06 +01:00 |
Kegan Dougal
|
135a1aa229
|
Final url modifications: renamed /presence_list to /presence/list to keep the top-level namespace clean. Updated tests.
|
2014-08-27 11:37:53 +01:00 |
Kegan Dougal
|
dd661769e1
|
Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and removed tests which tested that. Updated cmdclient and webclient.
|
2014-08-27 11:33:56 +01:00 |
Kegan Dougal
|
c65885e166
|
Added support for GET /events/$eventid with auth checks.
|
2014-08-27 10:33:01 +01:00 |
Kegan Dougal
|
dfa0cd1d90
|
Modified /join/$identifier to support $identifier being a room ID in addition to a room alias.
|
2014-08-27 09:43:42 +01:00 |
Erik Johnston
|
93cff1668c
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
|
2014-08-26 18:57:55 +01:00 |
Erik Johnston
|
3a2a5b959c
|
WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.
|
2014-08-26 18:57:46 +01:00 |
Kegan Dougal
|
f84ddc75cb
|
Pepper UT TODOs
|
2014-08-26 17:54:18 +01:00 |
Kegan Dougal
|
5a3df1d029
|
Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expanded the feedback constants to fully explain what type of feedback they are.
|
2014-08-26 17:49:46 +01:00 |
Kegan Dougal
|
5a93bfe1f0
|
Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmdclient, tests and webclient. All appears to work.
|
2014-08-26 17:21:48 +01:00 |
Kegan Dougal
|
ad6d5ac06c
|
Added RoomSendEventRestServlet to send generic non-state events. It even appears to work..!
|
2014-08-26 17:00:24 +01:00 |
Kegan Dougal
|
2e70de09b9
|
Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient.
|
2014-08-26 16:19:17 +01:00 |
Mark Haines
|
ac21dfff6d
|
Fix pyflakes errors
|
2014-08-26 16:02:59 +01:00 |
Kegan Dougal
|
5c0be8fde3
|
Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids)
|
2014-08-26 14:49:44 +01:00 |
Kegan Dougal
|
732d954f89
|
Added basic in-memory REST transaction storage. Only the latest transaction for a given path/access_token combo is stored in order to prevent storing ALL request/response pairs.
|
2014-08-26 14:13:32 +01:00 |
Kegan Dougal
|
7d79021c42
|
Added servlet for /rooms/$roomid/[invite|join|leave]
|
2014-08-26 12:54:43 +01:00 |
Kegan Dougal
|
5796232cb1
|
Adjusted webclient to use new state paths. Updated membership msg template to actually show the person invited. Factored out common membership functions in matrix service.
|
2014-08-26 10:24:47 +01:00 |
Kegan Dougal
|
47c3a089c5
|
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
|
2014-08-26 09:26:33 +01:00 |
Kegan Dougal
|
cab3095803
|
Removed member list servlet: now using generic state paths.
|
2014-08-26 09:26:07 +01:00 |
Erik Johnston
|
a9a5329a11
|
Encode unicode from json as utf-8. This was required to allow people to register on my laptop
|
2014-08-24 11:29:29 +01:00 |
Kegan Dougal
|
f690b7b827
|
Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet to RoomStateEventRestServlet. Support generic state event sending.
|
2014-08-22 15:59:15 +01:00 |
Paul "LeoNerd" Evans
|
9c0e570496
|
Kill the "_homeserver_" injected messages for room membership changes
|
2014-08-20 16:06:47 +01:00 |
Erik Johnston
|
347242a5c4
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
tests/rest/test_presence.py
tests/rest/test_rooms.py
tests/utils.py
|
2014-08-19 14:48:19 +01:00 |
Erik Johnston
|
75b6d982a0
|
Add a 'backfill room' button
|
2014-08-19 14:20:03 +01:00 |
Kegan Dougal
|
caef65d819
|
More unquotes. Also, don't return the room_id on membership state changes, they already know it.
|
2014-08-19 12:30:28 +01:00 |
Kegan Dougal
|
ece7a6d995
|
Unquote sender IDs.
|
2014-08-19 11:50:57 +01:00 |
Erik Johnston
|
b4a1f2ccb5
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
|
2014-08-18 15:53:40 +01:00 |
Kegan Dougal
|
b37ced8f63
|
Update the default longpoll timeout time.
|
2014-08-18 14:30:07 +01:00 |
Paul "LeoNerd" Evans
|
7d324612ec
|
Precent lack of presence visiblity from causing room /members/list to fail
|
2014-08-18 13:17:35 +01:00 |
Erik Johnston
|
2f91d16033
|
We don't need to do a json.loads here
|
2014-08-18 11:00:22 +01:00 |
Erik Johnston
|
40c020ad13
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
|
2014-08-15 16:48:16 +01:00 |
Paul "LeoNerd" Evans
|
ec1fd20e59
|
Also include users' presence when responding to /rooms/:room_id/members/list
|
2014-08-15 16:47:50 +01:00 |
Erik Johnston
|
d72f897f07
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
synapse/storage/stream.py
|
2014-08-15 11:50:14 +01:00 |
Erik Johnston
|
661c711765
|
Start fixing places that use the data store.
|
2014-08-14 17:34:37 +01:00 |
Kegan Dougal
|
fef3183461
|
Pass back the user_id in the response to /login in case it has changed. Store and use that on the webclient rather than the input field.
|
2014-08-14 16:40:15 +01:00 |
Kegan Dougal
|
c75add6ec8
|
Added a urls module for keeping client and federation prefixes.
|
2014-08-14 11:52:56 +01:00 |
Kegan Dougal
|
29aa13f0d4
|
Make federation use resource_for_federation as well.
|
2014-08-14 10:05:06 +01:00 |
Kegan Dougal
|
9f863d3466
|
Start phasing out HttpServer: we should be using Resources instead. Added resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
|
2014-08-14 09:55:16 +01:00 |
Paul "LeoNerd" Evans
|
3a1cfe18cf
|
Implement directory service federation by Federation Queries; avoid local_only hack; add unit tests
|
2014-08-13 18:03:41 +01:00 |
Paul "LeoNerd" Evans
|
7fb93f2a47
|
Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..., hs=hs) - similar to parse_userid()
|
2014-08-13 18:03:41 +01:00 |
Paul "LeoNerd" Evans
|
80c056c148
|
Now that HS->HS Profile lookups use Federation Queries, we don't need the 'local_only' antirecursion hack
|
2014-08-13 17:23:49 +01:00 |
Kegan Dougal
|
7f40fa1d46
|
Added a -w flag which will host the web client if specified. Currently this just delegates to the webclient RestServlet.
|
2014-08-13 13:50:01 +01:00 |
Matthew Hodgson
|
f98e6380f1
|
add in whitespace after copyright statements to improve legibility
|
2014-08-13 03:14:34 +01:00 |
Matthew Hodgson
|
514df1f648
|
actually register the login servlet (uncommitted code thinko?)
|
2014-08-13 02:33:04 +01:00 |
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |