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 |